[Libreoffice-commits] .: 8 commits - cui/source extensions/source lingucomponent/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri May 20 08:36:49 PDT 2011
cui/source/dialogs/cuigaldlg.cxx | 12 -
cui/source/options/opthtml.cxx | 74 +++++-----
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/autocdlg.cxx | 58 +++----
extensions/source/propctrlr/standardcontrol.cxx | 4
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 16 --
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 19 +-
7 files changed, 90 insertions(+), 95 deletions(-)
New commits:
commit c9dd83a38f6027b9d9e7725644a682846a997edd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri May 20 08:53:26 2011 +0100
adjust for return by ref instead of pointer
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index a5d046b..ac63bd9 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -124,66 +124,66 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
{
- SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get();
+ SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
if(aSize1NF.GetSavedValue() != aSize1NF.GetText())
- pHtmlOpt->SetFontSize(0, (sal_uInt16)aSize1NF.GetValue());
+ rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF.GetValue());
if(aSize2NF.GetSavedValue() != aSize2NF.GetText())
- pHtmlOpt->SetFontSize(1, (sal_uInt16)aSize2NF.GetValue());
+ rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF.GetValue());
if(aSize3NF.GetSavedValue() != aSize3NF.GetText())
- pHtmlOpt->SetFontSize(2, (sal_uInt16)aSize3NF.GetValue());
+ rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF.GetValue());
if(aSize4NF.GetSavedValue() != aSize4NF.GetText())
- pHtmlOpt->SetFontSize(3, (sal_uInt16)aSize4NF.GetValue());
+ rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF.GetValue());
if(aSize5NF.GetSavedValue() != aSize5NF.GetText())
- pHtmlOpt->SetFontSize(4, (sal_uInt16)aSize5NF.GetValue());
+ rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF.GetValue());
if(aSize6NF.GetSavedValue() != aSize6NF.GetText())
- pHtmlOpt->SetFontSize(5, (sal_uInt16)aSize6NF.GetValue());
+ rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF.GetValue());
if(aSize7NF.GetSavedValue() != aSize7NF.GetText())
- pHtmlOpt->SetFontSize(6, (sal_uInt16)aSize7NF.GetValue());
+ rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF.GetValue());
if(aNumbersEnglishUSCB.IsChecked() != aNumbersEnglishUSCB.GetSavedValue())
- pHtmlOpt->SetNumbersEnglishUS(aNumbersEnglishUSCB.IsChecked());
+ rHtmlOpt.SetNumbersEnglishUS(aNumbersEnglishUSCB.IsChecked());
if(aUnknownTagCB.IsChecked() != aUnknownTagCB.GetSavedValue())
- pHtmlOpt->SetImportUnknown(aUnknownTagCB.IsChecked());
+ rHtmlOpt.SetImportUnknown(aUnknownTagCB.IsChecked());
if(aIgnoreFontNamesCB.IsChecked() != aIgnoreFontNamesCB.GetSavedValue())
- pHtmlOpt->SetIgnoreFontFamily(aIgnoreFontNamesCB.IsChecked());
+ rHtmlOpt.SetIgnoreFontFamily(aIgnoreFontNamesCB.IsChecked());
if(aExportLB.GetSelectEntryPos() != aExportLB.GetSavedValue())
- pHtmlOpt->SetExportMode(aPosToExportArr[aExportLB.GetSelectEntryPos()]);
+ rHtmlOpt.SetExportMode(aPosToExportArr[aExportLB.GetSelectEntryPos()]);
if(aStarBasicCB.IsChecked() != aStarBasicCB.GetSavedValue())
- pHtmlOpt->SetStarBasic(aStarBasicCB.IsChecked());
+ rHtmlOpt.SetStarBasic(aStarBasicCB.IsChecked());
if(aStarBasicWarningCB.IsChecked() != aStarBasicWarningCB.GetSavedValue())
- pHtmlOpt->SetStarBasicWarning(aStarBasicWarningCB.IsChecked());
+ rHtmlOpt.SetStarBasicWarning(aStarBasicWarningCB.IsChecked());
if(aSaveGrfLocalCB.IsChecked() != aSaveGrfLocalCB.GetSavedValue())
- pHtmlOpt->SetSaveGraphicsLocal(aSaveGrfLocalCB.IsChecked());
+ rHtmlOpt.SetSaveGraphicsLocal(aSaveGrfLocalCB.IsChecked());
if(aPrintExtensionCB.IsChecked() != aPrintExtensionCB.GetSavedValue())
- pHtmlOpt->SetPrintLayoutExtension(aPrintExtensionCB.IsChecked());
+ rHtmlOpt.SetPrintLayoutExtension(aPrintExtensionCB.IsChecked());
- if( aCharSetLB.GetSelectTextEncoding() != pHtmlOpt->GetTextEncoding() )
- pHtmlOpt->SetTextEncoding( aCharSetLB.GetSelectTextEncoding() );
+ if( aCharSetLB.GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() )
+ rHtmlOpt.SetTextEncoding( aCharSetLB.GetSelectTextEncoding() );
return sal_False;
}
void OfaHtmlTabPage::Reset( const SfxItemSet& )
{
- SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get();
- aSize1NF.SetValue(pHtmlOpt->GetFontSize(0));
- aSize2NF.SetValue(pHtmlOpt->GetFontSize(1));
- aSize3NF.SetValue(pHtmlOpt->GetFontSize(2));
- aSize4NF.SetValue(pHtmlOpt->GetFontSize(3));
- aSize5NF.SetValue(pHtmlOpt->GetFontSize(4));
- aSize6NF.SetValue(pHtmlOpt->GetFontSize(5));
- aSize7NF.SetValue(pHtmlOpt->GetFontSize(6));
- aNumbersEnglishUSCB.Check(pHtmlOpt->IsNumbersEnglishUS());
- aUnknownTagCB.Check(pHtmlOpt->IsImportUnknown());
- aIgnoreFontNamesCB.Check(pHtmlOpt->IsIgnoreFontFamily());
- sal_uInt16 nExport = pHtmlOpt->GetExportMode();
+ SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
+ aSize1NF.SetValue(rHtmlOpt.GetFontSize(0));
+ aSize2NF.SetValue(rHtmlOpt.GetFontSize(1));
+ aSize3NF.SetValue(rHtmlOpt.GetFontSize(2));
+ aSize4NF.SetValue(rHtmlOpt.GetFontSize(3));
+ aSize5NF.SetValue(rHtmlOpt.GetFontSize(4));
+ aSize6NF.SetValue(rHtmlOpt.GetFontSize(5));
+ aSize7NF.SetValue(rHtmlOpt.GetFontSize(6));
+ aNumbersEnglishUSCB.Check(rHtmlOpt.IsNumbersEnglishUS());
+ aUnknownTagCB.Check(rHtmlOpt.IsImportUnknown());
+ aIgnoreFontNamesCB.Check(rHtmlOpt.IsIgnoreFontFamily());
+ sal_uInt16 nExport = rHtmlOpt.GetExportMode();
if( nExport >= SAL_N_ELEMENTS( aExportToPosArr ) )
nExport = 4; // default for bad config entry is NS 4.0
sal_uInt16 nPosArr = aExportToPosArr[ nExport ];
@@ -194,11 +194,11 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& )
ExportHdl_Impl(&aExportLB);
- aStarBasicCB .Check(pHtmlOpt->IsStarBasic());
- aStarBasicWarningCB .Check(pHtmlOpt->IsStarBasicWarning());
+ aStarBasicCB .Check(rHtmlOpt.IsStarBasic());
+ aStarBasicWarningCB .Check(rHtmlOpt.IsStarBasicWarning());
aStarBasicWarningCB.Enable(!aStarBasicCB.IsChecked());
- aSaveGrfLocalCB.Check(pHtmlOpt->IsSaveGraphicsLocal());
- aPrintExtensionCB.Check(pHtmlOpt->IsPrintLayoutExtension());
+ aSaveGrfLocalCB.Check(rHtmlOpt.IsSaveGraphicsLocal());
+ aPrintExtensionCB.Check(rHtmlOpt.IsPrintLayoutExtension());
aPrintExtensionCB.SaveValue();
aStarBasicCB .SaveValue();
@@ -215,9 +215,9 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& )
aUnknownTagCB.SaveValue();
aIgnoreFontNamesCB.SaveValue();
- if( !pHtmlOpt->IsDefaultTextEncoding() &&
- aCharSetLB.GetSelectTextEncoding() != pHtmlOpt->GetTextEncoding() )
- aCharSetLB.SelectTextEncoding( pHtmlOpt->GetTextEncoding() );
+ if( !rHtmlOpt.IsDefaultTextEncoding() &&
+ aCharSetLB.GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() )
+ aCharSetLB.SelectTextEncoding( rHtmlOpt.GetTextEncoding() );
}
IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox)
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 886fc94..6eefeae 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -117,7 +117,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
else
{
// remove smart tag tab page if no extensions are installed
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
if ( !pOpt || !pOpt->pSmartTagMgr || 0 == pOpt->pSmartTagMgr->NumberOfRecognizers() )
RemoveTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS);
@@ -230,7 +230,7 @@ SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent,
sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
long nFlags = pAutoCorrect->GetFlags();
sal_uInt16 nPos = 0;
@@ -246,9 +246,9 @@ sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
sal_Bool bReturn = nFlags != pAutoCorrect->GetFlags();
if(bReturn )
{
- SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get();
- pCfg->SetModified();
- pCfg->Commit();
+ SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
+ rCfg.SetModified();
+ rCfg.Commit();
}
return bReturn;
}
@@ -260,7 +260,7 @@ void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& )
void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
const long nFlags = pAutoCorrect->GetFlags();
aCheckLB.SetUpdateMode(sal_False);
@@ -545,7 +545,7 @@ SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent,
sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& )
{
sal_Bool bModified = sal_False;
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
long nFlags = pAutoCorrect->GetFlags();
@@ -650,9 +650,9 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& )
if(bModified || nFlags != pAutoCorrect->GetFlags())
{
- SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get();
- pCfg->SetModified();
- pCfg->Commit();
+ SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
+ rCfg.SetModified();
+ rCfg.Commit();
}
return sal_True;
@@ -670,7 +670,7 @@ void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
const long nFlags = pAutoCorrect->GetFlags();
@@ -1022,7 +1022,7 @@ int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* )
sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
DoubleStringArrayPtr pDoubleStringArray = aDoubleStringTable.Last();
while(pDoubleStringArray)
{
@@ -1221,7 +1221,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset,
}
else
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxAutocorrWordList* pWordList = pAutoCorrect->LoadAutocorrWordList(eLang);
for(sal_uInt16 i = 0; i < pWordList->Count(); i++)
@@ -1571,7 +1571,7 @@ int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* )
sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
StringsArraysPtr pArrays = aStringsTable.Last();
while(pArrays)
{
@@ -1752,7 +1752,7 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset,
}
else
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
const SvStringsISortDtor* pCplList = pAutoCorrect->GetCplSttExceptList(eLang);
const SvStringsISortDtor* pWrdList = pAutoCorrect->GetWrdSttExceptList(eLang);
sal_uInt16 i;
@@ -1769,7 +1769,7 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset,
void OfaAutocorrExceptPage::Reset( const SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
RefillReplaceBoxes(sal_True, eLang, eLang);
aAutoAbbrevCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst ));
aAutoCapsCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst ));
@@ -2002,7 +2002,7 @@ SfxTabPage* OfaQuoteTabPage::Create( Window* pParent,
sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
long nFlags = pAutoCorrect->GetFlags();
@@ -2061,9 +2061,9 @@ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& )
if( bModified || bReturn )
{
- SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get();
- pCfg->SetModified();
- pCfg->Commit();
+ SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
+ rCfg.SetModified();
+ rCfg.Commit();
}
return bReturn;
}
@@ -2075,7 +2075,7 @@ void OfaQuoteTabPage::ActivatePage( const SfxItemSet& )
void OfaQuoteTabPage::Reset( const SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
const long nFlags = pAutoCorrect->GetFlags();
// Initialize the Sw options
@@ -2151,7 +2151,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 ));
pMap->SetText(nMode < SGL_END ? sStartQuoteDlg : sEndQuoteDlg );
sal_UCS4 cDlg;
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
LanguageType eLang = Application::GetSettings().GetLanguage();
switch( nMode )
{
@@ -2317,7 +2317,7 @@ SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent,
sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& )
{
sal_Bool bModified = sal_False, bCheck;
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
sal_uInt16 nVal;
@@ -2360,16 +2360,16 @@ sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& )
}
if( bModified )
{
- SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get();
- pCfg->SetModified();
- pCfg->Commit();
+ SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
+ rCfg.SetModified();
+ rCfg.Commit();
}
return sal_True;
}
void OfaAutoCompleteTabPage::Reset( const SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
aCBActiv.Check( 0 != pOpt->bAutoCompleteWords );
@@ -2674,7 +2674,7 @@ IMPL_LINK(OfaSmartTagOptionsTabPage, SelectHdl, SvxCheckListBox*, EMPTYARG)
*/
sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
@@ -2717,7 +2717,7 @@ sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& )
*/
void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet& )
{
- SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
const SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
commit 592a429cc16e6df2f2e65bbcf927f96ffe008b17
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 19 22:30:55 2011 +0100
adapt for singleton api change
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 0891799..2212837 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -861,7 +861,7 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet&
void TPGalleryThemeProperties::FillFilterList()
{
- GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter();
+ GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
String aExt;
String aName;
FilterEntry* pFilterEntry;
@@ -870,10 +870,10 @@ void TPGalleryThemeProperties::FillFilterList()
sal_Bool bInList;
// graphic filters
- for( i = 0, nKeyCount = pFilter->GetImportFormatCount(); i < nKeyCount; i++ )
+ for( i = 0, nKeyCount = rFilter.GetImportFormatCount(); i < nKeyCount; i++ )
{
- aExt = pFilter->GetImportFormatShortName( i );
- aName = pFilter->GetImportFormatName( i );
+ aExt = rFilter.GetImportFormatShortName( i );
+ aName = rFilter.GetImportFormatName( i );
pTestEntry = (FilterEntry*) aFilterEntryList.First();
bInList = sal_False;
@@ -882,7 +882,7 @@ void TPGalleryThemeProperties::FillFilterList()
String sWildcard;
while( sal_True )
{
- sWildcard = pFilter->GetImportWildcard( i, j++ );
+ sWildcard = rFilter.GetImportWildcard( i, j++ );
if ( !sWildcard.Len() )
break;
if ( aExtensions.Search( sWildcard ) == STRING_NOTFOUND )
@@ -943,7 +943,7 @@ void TPGalleryThemeProperties::FillFilterList()
String sWildcard;
while( sal_True )
{
- sWildcard = pFilter->GetImportWildcard( i, j++ );
+ sWildcard = rFilter.GetImportWildcard( i, j++ );
if ( !sWildcard.Len() )
break;
if ( aExtensions.Search( sWildcard ) == STRING_NOTFOUND )
commit 26e5383bc1fdc3deafdcc90ad645b0199a396240
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 18 22:52:26 2011 +0100
free hyphenators in dtor
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 8694cd5..0c12830 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -103,7 +103,11 @@ Hyphenator::~Hyphenator()
if (numdict && aDicts)
{
for (int i=0; i < numdict; ++i)
+ {
delete aDicts[i].apCC;
+ if (aDicts[i].aPtr)
+ hnj_hyphen_free(aDicts[i].aPtr);
+ }
}
delete[] aDicts;
commit 25c454ebfb528a12d22fc04b40ec415f8dbc284a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 18 22:49:15 2011 +0100
remove redundant checks
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 95282ac..8694cd5 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -95,25 +95,19 @@ Hyphenator::Hyphenator() :
numdict = 0;
}
-
Hyphenator::~Hyphenator()
{
if (pPropHelper)
pPropHelper->RemoveAsPropListener();
- if ((numdict) && (aDicts))
+ if (numdict && aDicts)
{
- for (int i=0; i < numdict; i++)
- {
- if (aDicts[i].apCC) delete aDicts[i].apCC;
- aDicts[i].apCC = NULL;
- }
+ for (int i=0; i < numdict; ++i)
+ delete aDicts[i].apCC;
}
- if (aDicts) delete[] aDicts;
- aDicts = NULL;
- numdict = 0;
-}
+ delete[] aDicts;
+}
PropertyHelper_Hyphen & Hyphenator::GetPropHelper_Impl()
{
commit 469660d450a310740abb696806c6410a17733fad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 17 11:13:55 2011 +0100
guard final release better post possible clear
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 82de2a9..3a9854b 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -76,8 +76,8 @@ using ::rtl::OString;
///////////////////////////////////////////////////////////////////////////
-SpellChecker::SpellChecker() :
- aEvtListeners ( GetLinguMutex() )
+SpellChecker::SpellChecker()
+ : aEvtListeners(GetLinguMutex())
{
aDicts = NULL;
aDEncs = NULL;
@@ -88,31 +88,29 @@ SpellChecker::SpellChecker() :
numdict = 0;
}
-
SpellChecker::~SpellChecker()
{
if (aDicts)
{
- for (int i = 0; i < numdict; i++)
+ for (int i = 0; i < numdict; ++i)
{
- if (aDicts[i]) delete aDicts[i];
+ delete aDicts[i];
aDicts[i] = NULL;
}
delete[] aDicts;
}
aDicts = NULL;
numdict = 0;
- if (aDEncs) delete[] aDEncs;
+ delete[] aDEncs;
aDEncs = NULL;
- if (aDLocs) delete[] aDLocs;
+ delete[] aDLocs;
aDLocs = NULL;
- if (aDNames) delete[] aDNames;
+ delete[] aDNames;
aDNames = NULL;
- if (pPropHelper)
+ if (xPropHelper.is())
pPropHelper->RemoveAsPropListener();
}
-
PropertyHelper_Spell & SpellChecker::GetPropHelper_Impl()
{
if (!pPropHelper)
commit b66fb0e06cd33270801dd6f02052f1f7f11a986e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 17 10:02:36 2011 +0100
adjust for modified singleton
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index e84eedb..410d229 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1168,7 +1168,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
if ( SfxViewFrame::Current() && SfxViewFrame::Current()->GetDispatcher() )
pPtr = (const OfaPtrItem*)SfxViewFrame::Current()->
GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON );
- pColorTab = pPtr ? (XColorTable*)pPtr->GetValue() : XColorTable::GetStdColorTable();
+ pColorTab = pPtr ? (XColorTable*)pPtr->GetValue() : &XColorTable::GetStdColorTable();
rColPage.SetColorTable( pColorTab );
rColPage.SetPageType( &nUnknownType );
commit 96add1acfdbf7e1fc41bd9365df1e32b6c68af28
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 17 09:43:38 2011 +0100
adjust for modified singleton
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 9f729c0..bb3cf6f 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -693,9 +693,7 @@ namespace pcr
}
if ( !pColorTable )
- {
- pColorTable = XColorTable::GetStdColorTable();
- }
+ pColorTable = &XColorTable::GetStdColorTable();
DBG_ASSERT(pColorTable, "OColorControl::OColorControl: no color table!");
commit 1f87ad5de2897bd2874ecb541f9a124024c1cda5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 16 20:54:56 2011 +0100
valgrind: leak. Break circular dependency
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index dd073bb..82de2a9 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -605,6 +605,7 @@ void SAL_CALL SpellChecker::dispose()
bDisposing = sal_True;
EventObject aEvtObj( (XSpellChecker *) this );
aEvtListeners.disposeAndClear( aEvtObj );
+ xPropHelper.clear();
}
}
More information about the Libreoffice-commits
mailing list