David Tardon
11 years ago
parent
5c972357f8
commit
f3e201d7d7
@ -1,40 +0,0 @@
|
||||
From 4128c63d655869e0ab7befde2c46761d8e1b273f Mon Sep 17 00:00:00 2001
|
||||
From: Thorsten Behrens <thb@documentfoundation.org>
|
||||
Date: Thu, 10 Apr 2014 19:40:54 +0200
|
||||
Subject: [PATCH] Fix fdo#71423 - crash while editing Impress tables.
|
||||
|
||||
Band-aid fix for this nasty crasher, seems sometimes the
|
||||
family item is not found.
|
||||
|
||||
Change-Id: I7f78d59cbf2c9595ad512fa7a78370629924cd06
|
||||
(cherry picked from commit 058cfa72dcdd91df302be45f7fc59b0d961a420b)
|
||||
Signed-off-by: Andras Timar <andras.timar@collabora.com>
|
||||
---
|
||||
sfx2/source/dialog/templdlg.cxx | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
|
||||
index ecc4d41..cbd856f 100644
|
||||
--- a/sfx2/source/dialog/templdlg.cxx
|
||||
+++ b/sfx2/source/dialog/templdlg.cxx
|
||||
@@ -1245,6 +1245,8 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
|
||||
if(pStyleSheetPool && nActFamily != 0xffff)
|
||||
{
|
||||
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
|
||||
+ if(!pItem)
|
||||
+ return;
|
||||
pStyleSheetPool->SetSearchMask(pItem->GetFamily(), SFXSTYLEBIT_ALL_VISIBLE);
|
||||
StyleTreeArr_Impl aArr;
|
||||
SfxStyleSheetBase *pStyle = pStyleSheetPool->First();
|
||||
@@ -1589,7 +1591,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
|
||||
// other filters for automatic
|
||||
CheckItem( nActFamily, sal_True );
|
||||
const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl();
|
||||
- if ( 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags
|
||||
+ if ( pStyleItem && 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags
|
||||
&& nAppFilter != pItem->GetValue())
|
||||
{
|
||||
nAppFilter = pItem->GetValue();
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
From b2e9afcdfb0d9cd4d5c1b1073ad325403a13ef32 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Fri, 18 Apr 2014 09:45:38 +0100
|
||||
Subject: [PATCH] Related: rhbz#1088625 PresenterPaintManager seen as NULL
|
||||
|
||||
Change-Id: I3b7ba51d48ebc5f9304f6125de0595d41d50ad4d
|
||||
---
|
||||
sdext/source/presenter/PresenterToolBar.cxx | 16 +++++++++++++---
|
||||
1 file changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
|
||||
index dd0ca91..4c825ed 100644
|
||||
--- a/sdext/source/presenter/PresenterToolBar.cxx
|
||||
+++ b/sdext/source/presenter/PresenterToolBar.cxx
|
||||
@@ -457,7 +457,10 @@ void PresenterToolBar::InvalidateArea (
|
||||
const awt::Rectangle& rRepaintBox,
|
||||
const bool bSynchronous)
|
||||
{
|
||||
- mpPresenterController->GetPaintManager()->Invalidate(
|
||||
+ ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
|
||||
+ if (!xManager)
|
||||
+ return;
|
||||
+ xManager->Invalidate(
|
||||
mxWindow,
|
||||
rRepaintBox,
|
||||
bSynchronous);
|
||||
@@ -467,7 +470,11 @@ void PresenterToolBar::RequestLayout (void)
|
||||
{
|
||||
mbIsLayoutPending = true;
|
||||
|
||||
- mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
|
||||
+ ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
|
||||
+ if (!xManager)
|
||||
+ return;
|
||||
+
|
||||
+ xManager->Invalidate(mxWindow);
|
||||
}
|
||||
|
||||
geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
|
||||
@@ -822,7 +829,10 @@ void PresenterToolBar::Layout (
|
||||
}
|
||||
|
||||
// The whole window has to be repainted.
|
||||
- mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
|
||||
+ ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
|
||||
+ if (!xManager)
|
||||
+ return;
|
||||
+ xManager->Invalidate(mxWindow);
|
||||
}
|
||||
|
||||
geometry::RealSize2D PresenterToolBar::CalculatePartSize (
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
From 20934180ab2c5978a613668bf8df49a60ba7a686 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Thu, 24 Apr 2014 17:10:12 +0100
|
||||
Subject: [PATCH] Resolves: fdo#60040 crash after undoing master page
|
||||
application
|
||||
|
||||
regression since 839cb94a2bd9dfadb6a7e11a97f0540a78f79b6b
|
||||
|
||||
Change-Id: Ie7068ecd1655ecae169948dc1e08330dc4200bf9
|
||||
---
|
||||
sd/source/core/drawdoc3.cxx | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
|
||||
index 9986219..ea0b6e0 100644
|
||||
--- a/sd/source/core/drawdoc3.cxx
|
||||
+++ b/sd/source/core/drawdoc3.cxx
|
||||
@@ -1367,7 +1367,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
|
||||
SdPage& rOldNotesMaster = (SdPage&)pNotes->TRG_GetMasterPage();
|
||||
SdPage* pMaster = NULL;
|
||||
SdPage* pNotesMaster = NULL;
|
||||
- SdPage* pPage = NULL;
|
||||
OUString aOldPageLayoutName(pSelectedPage->GetLayoutName());
|
||||
OUString aOldLayoutName(aOldPageLayoutName);
|
||||
sal_Int32 nIndex = aOldLayoutName.indexOf( SD_LT_SEPARATOR );
|
||||
@@ -1664,7 +1663,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
|
||||
{
|
||||
for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++)
|
||||
{
|
||||
- pPage = (SdPage*) GetPage(nPage);
|
||||
+ SdPage* pPage = (SdPage*) GetPage(nPage);
|
||||
OUString aTest = pPage->GetLayoutName();
|
||||
if (aTest == aOldPageLayoutName)
|
||||
{
|
||||
@@ -1681,20 +1680,21 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
|
||||
|
||||
for (std::vector<SdPage*>::iterator pIter = aPageList.begin(); pIter != aPageList.end(); ++pIter)
|
||||
{
|
||||
- AutoLayout eAutoLayout = (*pIter)->GetAutoLayout();
|
||||
+ SdPage* pPage = *pIter;
|
||||
+ AutoLayout eAutoLayout = pPage->GetAutoLayout();
|
||||
|
||||
if( bUndo )
|
||||
{
|
||||
SdPresentationLayoutUndoAction * pPLUndoAction =
|
||||
new SdPresentationLayoutUndoAction
|
||||
(this,
|
||||
- ( pPage && pPage->IsMasterPage() ) ? aLayoutName : aOldLayoutName,
|
||||
+ pPage ? aLayoutName : aOldLayoutName,
|
||||
aLayoutName,
|
||||
- eAutoLayout, eAutoLayout, sal_False, *pIter);
|
||||
+ eAutoLayout, eAutoLayout, sal_False, pPage);
|
||||
pUndoMgr->AddUndoAction(pPLUndoAction);
|
||||
}
|
||||
- (*pIter)->SetPresentationLayout(aLayoutName);
|
||||
- (*pIter)->SetAutoLayout(eAutoLayout);
|
||||
+ pPage->SetPresentationLayout(aLayoutName);
|
||||
+ pPage->SetAutoLayout(eAutoLayout);
|
||||
}
|
||||
|
||||
// Adapt new master pages
|
||||
@@ -1797,7 +1797,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
|
||||
{
|
||||
for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++)
|
||||
{
|
||||
- pPage = (SdPage*) GetPage(nPage);
|
||||
+ SdPage* pPage = (SdPage*) GetPage(nPage);
|
||||
if (pPage->GetLayoutName() == aOldPageLayoutName)
|
||||
{
|
||||
aPageList.push_back(pPage);
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 29b969d29225400e9f8ace12ea2c1276541f9ead Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Thu, 24 Apr 2014 13:51:27 +0100
|
||||
Subject: [PATCH] crash in selecting text in comments midway in para
|
||||
|
||||
(cherry picked from commit 7dca5341d799d59a81e6dac84586fa2daa02a550)
|
||||
|
||||
Conflicts:
|
||||
sw/source/core/uibase/shells/langhelper.cxx
|
||||
|
||||
Change-Id: Iaab71e201fae6a03936ccc6aac040027a183209c
|
||||
---
|
||||
sw/source/ui/shells/langhelper.cxx | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx
|
||||
index d3055a2..52ca770 100644
|
||||
--- a/sw/source/ui/shells/langhelper.cxx
|
||||
+++ b/sw/source/ui/shells/langhelper.cxx
|
||||
@@ -573,7 +573,8 @@ namespace SwLangHelper
|
||||
// string for guessing language
|
||||
OUString aText;
|
||||
|
||||
- aText = rEditEngine->GetText(aDocSelection);
|
||||
+ // get the full text of the paragraph that the end of selection is in
|
||||
+ aText = rEditEngine->GetText(aDocSelection.nEndPos);
|
||||
if (!aText.isEmpty())
|
||||
{
|
||||
xub_StrLen nStt = 0;
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -1,120 +0,0 @@
|
||||
From 2dae70268e8f53b11301c4c8490efea57b0cc51c Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Thu, 9 Jan 2014 23:09:12 +0100
|
||||
Subject: [PATCH] every even numbered print job is reported as failed
|
||||
|
||||
because of.
|
||||
bool bSuccess;
|
||||
...
|
||||
bSuccess &= ...endSpool(...);
|
||||
|
||||
in PspSalPrinter::StartJob
|
||||
|
||||
was...
|
||||
|
||||
endSpool return value is effectively success flag, not job ID
|
||||
|
||||
(cherry picked from commit e6323214830895d1c76ec44ee53990bf577fbda2)
|
||||
|
||||
Change-Id: I5b96eeff80ca29f0f8f24ee6da7a2ca76cbb05ce
|
||||
---
|
||||
include/vcl/printerinfomanager.hxx | 4 ++--
|
||||
vcl/generic/print/printerjob.cxx | 2 +-
|
||||
vcl/inc/cupsmgr.hxx | 2 +-
|
||||
vcl/null/printerinfomanager.cxx | 2 +-
|
||||
vcl/unx/generic/printer/cupsmgr.cxx | 4 ++--
|
||||
vcl/unx/generic/printer/printerinfomanager.cxx | 2 +-
|
||||
6 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
|
||||
index 96e7846..7e3ccd6 100644
|
||||
--- a/include/vcl/printerinfomanager.hxx
|
||||
+++ b/include/vcl/printerinfomanager.hxx
|
||||
@@ -211,8 +211,8 @@ public:
|
||||
// close the FILE* returned by startSpool and does the actual spooling
|
||||
// set bBanner to "false" will attempt to suppress banner printing
|
||||
// set bBanner to "true" will rely on the system default
|
||||
- // returns a numerical job id
|
||||
- virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
|
||||
+ // returns true on success
|
||||
+ virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
|
||||
|
||||
// for spadmin: whether adding or removing a printer is possible
|
||||
virtual bool addOrRemovePossible() const;
|
||||
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
|
||||
index 7c1b359..f611c26 100644
|
||||
--- a/vcl/generic/print/printerjob.cxx
|
||||
+++ b/vcl/generic/print/printerjob.cxx
|
||||
@@ -530,7 +530,7 @@ PrinterJob::EndJob ()
|
||||
else
|
||||
{
|
||||
PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get();
|
||||
- if (0 == rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName,
|
||||
+ if (!rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName,
|
||||
maJobTitle, pDestFILE, m_aDocumentJobData, true ))
|
||||
{
|
||||
bSuccess = sal_False;
|
||||
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
|
||||
index 8c659fe..a8c06bb 100644
|
||||
--- a/vcl/inc/cupsmgr.hxx
|
||||
+++ b/vcl/inc/cupsmgr.hxx
|
||||
@@ -78,7 +78,7 @@ public:
|
||||
const char* authenticateUser( const char* );
|
||||
|
||||
virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand );
|
||||
- virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
|
||||
+ virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
|
||||
virtual void setupJobContextData( JobData& rData );
|
||||
|
||||
/// changes the info about a named printer
|
||||
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
|
||||
index a480856..4845ec3 100644
|
||||
--- a/vcl/null/printerinfomanager.cxx
|
||||
+++ b/vcl/null/printerinfomanager.cxx
|
||||
@@ -147,7 +147,7 @@ FILE* PrinterInfoManager::startSpool( const OUString& /* rPrintername */, bool /
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-int PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* /* pFile */, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ )
|
||||
+bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* /* pFile */, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
|
||||
index 069df7d..ecf44e7 100644
|
||||
--- a/vcl/unx/generic/printer/cupsmgr.cxx
|
||||
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
|
||||
@@ -640,7 +640,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner
|
||||
}
|
||||
}
|
||||
|
||||
-int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner )
|
||||
+bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner )
|
||||
{
|
||||
OSL_TRACE( "endSpool: %s, %s, copy count = %d",
|
||||
OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
|
||||
@@ -699,7 +699,7 @@ int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTit
|
||||
cupsFreeOptions( nNumOptions, pOptions );
|
||||
}
|
||||
|
||||
- return nJobID;
|
||||
+ return nJobID != 0;
|
||||
}
|
||||
|
||||
|
||||
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
|
||||
index 4f8f56e..45b9f62 100644
|
||||
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
|
||||
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
|
||||
@@ -1117,7 +1117,7 @@ FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickC
|
||||
return popen (aShellCommand.getStr(), "w");
|
||||
}
|
||||
|
||||
-int PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* pFile, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ )
|
||||
+bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* pFile, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ )
|
||||
{
|
||||
return (0 == pclose( pFile ));
|
||||
}
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
From bbcfb0a054efbe3aa106bff62938e218fea91d29 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Tue, 22 Apr 2014 12:05:48 +0100
|
||||
Subject: [PATCH] table not resizing when rows/columns added to it
|
||||
|
||||
I happened across a presentation whose table didn't resize when extra rows and
|
||||
columns were added to it. It worked on a higher resolution machine, but not on
|
||||
a 1024x768 one
|
||||
|
||||
Change-Id: I98a7a04bee0b0175174e6376e9ebc046b9eff2dc
|
||||
(cherry picked from commit 88c3b4bbf005299203370efecbc09dd9d9d26a72)
|
||||
---
|
||||
svx/source/table/svdotable.cxx | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
|
||||
index d59c166..45c6a30 100644
|
||||
--- a/svx/source/table/svdotable.cxx
|
||||
+++ b/svx/source/table/svdotable.cxx
|
||||
@@ -248,6 +248,8 @@ private:
|
||||
static bool lastLayoutFitWidth;
|
||||
static bool lastLayoutFitHeight;
|
||||
static WritingMode lastLayoutMode;
|
||||
+ static sal_Int32 lastRowCount;
|
||||
+ static sal_Int32 lastColCount;
|
||||
};
|
||||
|
||||
SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL;
|
||||
@@ -255,6 +257,8 @@ Rectangle SdrTableObjImpl::lastLayoutRectangle;
|
||||
bool SdrTableObjImpl::lastLayoutFitWidth;
|
||||
bool SdrTableObjImpl::lastLayoutFitHeight;
|
||||
WritingMode SdrTableObjImpl::lastLayoutMode;
|
||||
+sal_Int32 SdrTableObjImpl::lastRowCount;
|
||||
+sal_Int32 SdrTableObjImpl::lastColCount;
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
@@ -696,13 +700,17 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
|
||||
WritingMode writingMode = mpTableObj->GetWritingMode();
|
||||
if( lastLayoutTable != this || lastLayoutRectangle != rArea
|
||||
|| lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight != bFitHeight
|
||||
- || lastLayoutMode != writingMode )
|
||||
+ || lastLayoutMode != writingMode
|
||||
+ || lastRowCount != getRowCount()
|
||||
+ || lastColCount != getColumnCount() )
|
||||
{
|
||||
lastLayoutTable = this;
|
||||
lastLayoutRectangle = rArea;
|
||||
lastLayoutFitWidth = bFitWidth;
|
||||
lastLayoutFitHeight = bFitHeight;
|
||||
lastLayoutMode = writingMode;
|
||||
+ lastRowCount = getRowCount();
|
||||
+ lastColCount = getColumnCount();
|
||||
TableModelNotifyGuard aGuard( mxTable.get() );
|
||||
mpLayouter->LayoutTable( rArea, bFitWidth, bFitHeight );
|
||||
}
|
||||
--
|
||||
1.9.0
|
||||
|
||||
Loading…
Reference in new issue