diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:53 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:53 +0100 |
commit | e8216218859b2a01a4e9b7f6ff07d79c06d8f444 (patch) | |
tree | 8bad69041e6324593f25224f01bcb15aea0876e4 /cui/source | |
parent | 227745b536e12358db1d92369ca5321ac53f44ef (diff) | |
parent | 7f9327e90e1e04325ad091f1e20995da4cb2e929 (diff) |
Merge commit 'ooo/DEV300_m103'
Conflicts:
package/source/zippackage/ZipPackageFolder.cxx
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 11 | ||||
-rwxr-xr-x[-rw-r--r--] | cui/source/tabpages/page.cxx | 7 |
2 files changed, 14 insertions, 4 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 1f912e608ba9..4789d4a668f6 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -528,6 +528,9 @@ IMPL_LINK(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) { SvxNumberFormat aFmt(pActNum->GetLevel(i)); aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL ); + // #i93908# clear suffix for bullet lists + aFmt.SetPrefix(::rtl::OUString()); + aFmt.SetSuffix(::rtl::OUString()); aFmt.SetBulletFont(&rActBulletFont); aFmt.SetBulletChar(cChar ); aFmt.SetCharFmtName(sBulletCharFmtName); @@ -738,6 +741,9 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) sal_uInt16 nUpperLevelOrChar = (sal_uInt16)pLevelSettings->nParentNumbering; if(aFmt.GetNumberingType() == SVX_NUM_CHAR_SPECIAL) { + // #i93908# clear suffix for bullet lists + aFmt.SetPrefix(::rtl::OUString()); + aFmt.SetSuffix(::rtl::OUString()); if( pLevelSettings->sBulletFont.getLength() && pLevelSettings->sBulletFont.compareTo( rActBulletFont.GetName())) @@ -787,9 +793,10 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) aFmt.SetCharFmtName(sNumCharFmtName); // #62069# // #92724# aFmt.SetBulletRelSize(100); + // #i93908# + aFmt.SetPrefix(pLevelSettings->sPrefix); + aFmt.SetSuffix(pLevelSettings->sSuffix); } - aFmt.SetPrefix(pLevelSettings->sPrefix); - aFmt.SetSuffix(pLevelSettings->sSuffix); pActNum->SetLevel(i, aFmt); } } diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index aa5d75239b65..ef1fff0de271 100644..100755 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -602,6 +602,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) ResStringArray aPaperAry( CUI_RES( nAryId ) ); sal_uInt32 nCnt = aPaperAry.Count(); + sal_uInt16 nUserPos = LISTBOX_ENTRY_NOTFOUND; for ( sal_uInt32 i = 0; i < nCnt; ++i ) { String aStr = aPaperAry.GetString(i); @@ -611,9 +612,11 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) if ( eSize == ePaper ) nActPos = nPos; + if( eSize == PAPER_USER ) + nUserPos = nPos; } - // aktuelles Papierformat selektieren - aPaperSizeBox.SelectEntryPos( nActPos ); + // preselect current paper format - #115915#: ePaper might not be in aPaperSizeBox so use PAPER_USER instead + aPaperSizeBox.SelectEntryPos( nActPos != LISTBOX_ENTRY_NOTFOUND ? nActPos : nUserPos ); // Applikationsspezifisch |