[Libreoffice-commits] core.git: 4 commits - include/svx include/vcl svx/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk unusedcode.easy vcl/source
Caolán McNamara
caolanm at redhat.com
Thu Jul 4 00:55:11 PDT 2013
include/svx/galtheme.hxx | 1
include/vcl/unohelp.hxx | 2
svx/source/gallery2/galtheme.cxx | 1
sw/UIConfig_swriter.mk | 1
sw/inc/globals.hrc | 2
sw/inc/helpid.h | 1
sw/source/ui/config/optload.cxx | 209 ++++++---------
sw/source/ui/config/optload.hrc | 21 -
sw/source/ui/config/optload.src | 139 ----------
sw/source/ui/dialog/swdlgfact.cxx | 1
sw/source/ui/inc/optload.hxx | 49 +--
sw/uiconfig/swriter/ui/optgeneralpage.ui | 426 +++++++++++++++++++++++++++++++
unusedcode.easy | 2
vcl/source/control/ilstbox.cxx | 11
vcl/source/window/builder.cxx | 3
15 files changed, 543 insertions(+), 326 deletions(-)
New commits:
commit 0581c61c8b61041692befac101466190767e6597
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 3 18:30:07 2013 +0100
Resolves: fdo#66407 convert writer general options tab to .ui
Change-Id: I315c12b94663c0047150eed7ecbd6366f7e57bc4
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 109dfef..dd533a7 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/numberingnamedialog \
sw/uiconfig/swriter/ui/optcomparison \
sw/uiconfig/swriter/ui/optformataidspage \
+ sw/uiconfig/swriter/ui/optgeneralpage \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index f380db9..8411ebf 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -186,7 +186,7 @@
#define TP_OPTCAPTION_PAGE (RC_GLOBALS_BEGIN + 78)
#define DLG_SVXTEST_NUM_BULLET (RC_GLOBALS_BEGIN + 79)
-#define TP_OPTLOAD_PAGE (RC_GLOBALS_BEGIN + 80)
+
#define TP_INSERT_SECTION (RC_GLOBALS_BEGIN + 85)
#define DLG_INSERT_SECTION (RC_GLOBALS_BEGIN + 86)
#define DLG_SECTION_PROPERTIES (RC_GLOBALS_BEGIN + 87)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index ee1ae83..1bd27a4 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -173,7 +173,6 @@
#define HID_EDIT_FLD_REF "SW_HID_EDIT_FLD_REF"
#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL"
#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE"
-#define HID_OPTLOAD_PAGE "SW_HID_OPTLOAD_PAGE"
#define HID_INSERT_SECTION_PAGE "SW_HID_INSERT_SECTION_PAGE"
#define HID_INSERT_SECTION_DLG "SW_HID_INSERT_SECTION_DLG"
#define HID_SECTION_PROPERTIES_DLG "SW_HID_SECTION_PROPERTIES_DLG"
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 0bc1b8b..500438c 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -61,38 +61,24 @@ using namespace ::com::sun::star;
#include <svl/eitem.hxx>
-SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) :
-
- SfxTabPage( pParent, SW_RES( TP_OPTLOAD_PAGE ), rSet ),
-
- aUpdateFL ( this, SW_RES( FL_UPDATE ) ),
- aLinkFT ( this, SW_RES( FT_LINK ) ),
- aAlwaysRB ( this, SW_RES( RB_ALWAYS ) ),
- aRequestRB ( this, SW_RES( RB_REQUEST ) ),
- aNeverRB ( this, SW_RES( RB_NEVER ) ),
-
- aFieldFT ( this, SW_RES( FT_FIELD ) ),
- aAutoUpdateFields ( this, SW_RES( CB_AUTO_UPDATE_FIELDS ) ),
- aAutoUpdateCharts ( this, SW_RES( CB_AUTO_UPDATE_CHARTS ) ),
-
- aSettingsFL ( this, SW_RES( FL_SETTINGS ) ),
- aMetricFT ( this, SW_RES( FT_METRIC ) ),
- aMetricLB ( this, SW_RES( LB_METRIC ) ),
- aTabFT ( this, SW_RES( FT_TAB ) ),
- aTabMF ( this, SW_RES( MF_TAB ) ),
- aUseSquaredPageMode ( this, SW_RES( CB_USE_SQUARE_PAGE_MODE ) ),
- aUseCharUnit ( this , SW_RES( CB_USE_CHAR_UNIT ) ),
- aWordCountFL ( this , SW_RES( FL_WORDCOUNT ) ),
- aWordCountFT ( this , SW_RES( FT_WORDCOUNT ) ),
- aWordCountED ( this , SW_RES( ED_WORDCOUNT ) ),
-
- pWrtShell ( NULL ),
- bHTMLMode ( sal_False ),
- nLastTab ( 0 ),
- nOldLinkMode( MANUAL )
-
+SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "OptGeneralPage",
+ "modules/swriter/ui/optgeneralpage.ui", rSet)
+ , m_pWrtShell(NULL)
+ , m_nLastTab(0)
+ , m_nOldLinkMode(MANUAL)
{
- FreeResource();
+ get(m_pAlwaysRB, "always");
+ get(m_pRequestRB, "onrequest");
+ get(m_pNeverRB, "never");
+ get(m_pAutoUpdateFields, "updatefields");
+ get(m_pAutoUpdateCharts, "updatecharts");
+ get(m_pMetricLB, "metric");
+ get(m_pTabFT, "tablabel");
+ get(m_pTabMF, "tab");
+ get(m_pUseSquaredPageMode, "squaremode");
+ get(m_pUseCharUnit, "usecharunit");
+ get(m_pWordCountED, "wordcount");
SvxStringArray aMetricArr( SW_RES( STR_ARR_METRIC ) );
for ( sal_uInt16 i = 0; i < aMetricArr.Count(); ++i )
@@ -109,34 +95,30 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) :
case FUNIT_INCH:
{
// use only these metrics
- sal_uInt16 nPos = aMetricLB.InsertEntry( sMetric );
- aMetricLB.SetEntryData( nPos, (void*)(sal_IntPtr)eFUnit );
+ sal_uInt16 nPos = m_pMetricLB->InsertEntry( sMetric );
+ m_pMetricLB->SetEntryData( nPos, (void*)(sal_IntPtr)eFUnit );
}
default:; //prevent warning
}
}
- aMetricLB.SetSelectHdl(LINK(this, SwLoadOptPage, MetricHdl));
+ m_pMetricLB->SetSelectHdl(LINK(this, SwLoadOptPage, MetricHdl));
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem )
&& ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)
{
- aTabFT.Hide();
- aTabMF.Hide();
+ m_pTabFT->Hide();
+ m_pTabMF->Hide();
}
SvtCJKOptions aCJKOptions;
if(!aCJKOptions.IsAsianTypographyEnabled())
{
- aUseSquaredPageMode.Hide();
- aUseCharUnit.Hide();
+ m_pUseSquaredPageMode->Hide();
+ m_pUseCharUnit->Hide();
}
}
-SwLoadOptPage::~SwLoadOptPage()
-{
-}
-
SfxTabPage* SwLoadOptPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
@@ -149,80 +131,80 @@ sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
SwModule* pMod = SW_MOD();
sal_uInt16 nNewLinkMode = AUTOMATIC;
- if (aNeverRB.IsChecked())
+ if (m_pNeverRB->IsChecked())
nNewLinkMode = NEVER;
- else if (aRequestRB.IsChecked())
+ else if (m_pRequestRB->IsChecked())
nNewLinkMode = MANUAL;
- SwFldUpdateFlags eFldFlags = aAutoUpdateFields.IsChecked() ?
- aAutoUpdateCharts.IsChecked() ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : AUTOUPD_OFF;
+ SwFldUpdateFlags eFldFlags = m_pAutoUpdateFields->IsChecked() ?
+ m_pAutoUpdateCharts->IsChecked() ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : AUTOUPD_OFF;
- if(aAutoUpdateFields.IsChecked() != aAutoUpdateFields.GetSavedValue() ||
- aAutoUpdateCharts.IsChecked() != aAutoUpdateCharts.GetSavedValue())
+ if(m_pAutoUpdateFields->IsChecked() != m_pAutoUpdateFields->GetSavedValue() ||
+ m_pAutoUpdateCharts->IsChecked() != m_pAutoUpdateCharts->GetSavedValue())
{
pMod->ApplyFldUpdateFlags(eFldFlags);
- if(pWrtShell)
+ if(m_pWrtShell)
{
- pWrtShell->SetFldUpdateFlags(eFldFlags);
- pWrtShell->SetModified();
+ m_pWrtShell->SetFldUpdateFlags(eFldFlags);
+ m_pWrtShell->SetModified();
}
}
- if (nNewLinkMode != nOldLinkMode)
+ if (nNewLinkMode != m_nOldLinkMode)
{
pMod->ApplyLinkMode(nNewLinkMode);
- if (pWrtShell)
+ if (m_pWrtShell)
{
- pWrtShell->SetLinkUpdMode( nNewLinkMode );
- pWrtShell->SetModified();
+ m_pWrtShell->SetLinkUpdMode( nNewLinkMode );
+ m_pWrtShell->SetModified();
}
bRet = sal_True;
}
- const sal_uInt16 nMPos = aMetricLB.GetSelectEntryPos();
- if ( nMPos != aMetricLB.GetSavedValue() )
+ const sal_uInt16 nMPos = m_pMetricLB->GetSelectEntryPos();
+ if ( nMPos != m_pMetricLB->GetSavedValue() )
{
// Double-Cast for VA3.0
- sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)aMetricLB.GetEntryData( nMPos );
+ sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos );
rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nFieldUnit ) );
bRet = sal_True;
}
- if(aTabMF.IsVisible() && aTabMF.GetText() != aTabMF.GetSavedValue())
+ if(m_pTabMF->IsVisible() && m_pTabMF->GetText() != m_pTabMF->GetSavedValue())
{
rSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP,
- (sal_uInt16)aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP))));
+ (sal_uInt16)m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP))));
bRet = sal_True;
}
- sal_Bool bIsUseCharUnitFlag = aUseCharUnit.IsChecked();
+ sal_Bool bIsUseCharUnitFlag = m_pUseCharUnit->IsChecked();
SvtCJKOptions aCJKOptions;
bIsUseCharUnitFlag = bIsUseCharUnitFlag && aCJKOptions.IsAsianTypographyEnabled();
- if( bIsUseCharUnitFlag != aUseCharUnit.GetSavedValue())
+ if( bIsUseCharUnitFlag != m_pUseCharUnit->GetSavedValue())
{
rSet.Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag ));
bRet = sal_True;
}
- if (aWordCountED.GetText() != aWordCountED.GetSavedValue())
+ if (m_pWordCountED->GetText() != m_pWordCountED->GetSavedValue())
{
boost::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
- officecfg::Office::Writer::WordCount::AdditionalSeparators::set(aWordCountED.GetText(), batch);
+ officecfg::Office::Writer::WordCount::AdditionalSeparators::set(m_pWordCountED->GetText(), batch);
batch->commit();
bRet = sal_True;
}
- sal_Bool bIsSquaredPageModeFlag = aUseSquaredPageMode.IsChecked();
- if ( bIsSquaredPageModeFlag != aUseSquaredPageMode.GetSavedValue() )
+ sal_Bool bIsSquaredPageModeFlag = m_pUseSquaredPageMode->IsChecked();
+ if ( bIsSquaredPageModeFlag != m_pUseSquaredPageMode->GetSavedValue() )
{
pMod->ApplyDefaultPageMode( bIsSquaredPageModeFlag );
- if ( pWrtShell )
+ if ( m_pWrtShell )
{
- SwDoc* pDoc = pWrtShell->GetDoc();
+ SwDoc* pDoc = m_pWrtShell->GetDoc();
pDoc->SetDefaultPageMode( bIsSquaredPageModeFlag );
- pWrtShell->SetModified();
+ m_pWrtShell->SetModified();
}
bRet = sal_True;
}
@@ -236,99 +218,94 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet)
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_WRTSHELL, sal_False, &pItem))
- pWrtShell = (SwWrtShell*)((const SwPtrItem*)pItem)->GetValue();
+ m_pWrtShell = (SwWrtShell*)((const SwPtrItem*)pItem)->GetValue();
SwFldUpdateFlags eFldFlags = AUTOUPD_GLOBALSETTING;
- nOldLinkMode = GLOBALSETTING;
- if (pWrtShell)
+ m_nOldLinkMode = GLOBALSETTING;
+ if (m_pWrtShell)
{
- eFldFlags = pWrtShell->GetFldUpdateFlags(sal_True);
- nOldLinkMode = pWrtShell->GetLinkUpdMode(sal_True);
+ eFldFlags = m_pWrtShell->GetFldUpdateFlags(sal_True);
+ m_nOldLinkMode = m_pWrtShell->GetLinkUpdMode(sal_True);
}
- if(GLOBALSETTING == nOldLinkMode)
- nOldLinkMode = pUsrPref->GetUpdateLinkMode();
+ if(GLOBALSETTING == m_nOldLinkMode)
+ m_nOldLinkMode = pUsrPref->GetUpdateLinkMode();
if(AUTOUPD_GLOBALSETTING == eFldFlags)
eFldFlags = pUsrPref->GetFldUpdateFlags();
- aAutoUpdateFields.Check(eFldFlags != AUTOUPD_OFF);
- aAutoUpdateCharts.Check(eFldFlags == AUTOUPD_FIELD_AND_CHARTS);
+ m_pAutoUpdateFields->Check(eFldFlags != AUTOUPD_OFF);
+ m_pAutoUpdateCharts->Check(eFldFlags == AUTOUPD_FIELD_AND_CHARTS);
- switch (nOldLinkMode)
+ switch (m_nOldLinkMode)
{
- case NEVER: aNeverRB.Check(); break;
- case MANUAL: aRequestRB.Check(); break;
- case AUTOMATIC: aAlwaysRB.Check(); break;
+ case NEVER: m_pNeverRB->Check(); break;
+ case MANUAL: m_pRequestRB->Check(); break;
+ case AUTOMATIC: m_pAlwaysRB->Check(); break;
}
- aAutoUpdateFields.SaveValue();
- aAutoUpdateCharts.SaveValue();
- aMetricLB.SetNoSelection();
+ m_pAutoUpdateFields->SaveValue();
+ m_pAutoUpdateCharts->SaveValue();
+ m_pMetricLB->SetNoSelection();
if ( rSet.GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE )
{
const SfxUInt16Item& rItem = (SfxUInt16Item&)rSet.Get( SID_ATTR_METRIC );
FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
- for ( sal_uInt16 i = 0; i < aMetricLB.GetEntryCount(); ++i )
+ for ( sal_uInt16 i = 0; i < m_pMetricLB->GetEntryCount(); ++i )
{
- if ( (int)(sal_IntPtr)aMetricLB.GetEntryData( i ) == (int)eFieldUnit )
+ if ( (int)(sal_IntPtr)m_pMetricLB->GetEntryData( i ) == (int)eFieldUnit )
{
- aMetricLB.SelectEntryPos( i );
+ m_pMetricLB->SelectEntryPos( i );
break;
}
}
- ::SetFieldUnit(aTabMF, eFieldUnit);
+ ::SetFieldUnit(*m_pTabMF, eFieldUnit);
}
- aMetricLB.SaveValue();
+ m_pMetricLB->SaveValue();
if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False, &pItem))
{
- nLastTab = ((SfxUInt16Item*)pItem)->GetValue();
- aTabMF.SetValue(aTabMF.Normalize(nLastTab), FUNIT_TWIP);
- }
- aTabMF.SaveValue();
-
- if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem))
- {
- bHTMLMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON);
+ m_nLastTab = ((SfxUInt16Item*)pItem)->GetValue();
+ m_pTabMF->SetValue(m_pTabMF->Normalize(m_nLastTab), FUNIT_TWIP);
}
+ m_pTabMF->SaveValue();
//default page mode loading
- if(pWrtShell)
+ if(m_pWrtShell)
{
- sal_Bool bSquaredPageMode = pWrtShell->GetDoc()->IsSquaredPageMode();
- aUseSquaredPageMode.Check( bSquaredPageMode );
- aUseSquaredPageMode.SaveValue();
+ bool bSquaredPageMode = m_pWrtShell->GetDoc()->IsSquaredPageMode();
+ m_pUseSquaredPageMode->Check( bSquaredPageMode );
+ m_pUseSquaredPageMode->SaveValue();
}
if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_APPLYCHARUNIT, sal_False, &pItem))
{
- sal_Bool bUseCharUnit = ((const SfxBoolItem*)pItem)->GetValue();
- aUseCharUnit.Check(bUseCharUnit);
+ bool bUseCharUnit = ((const SfxBoolItem*)pItem)->GetValue();
+ m_pUseCharUnit->Check(bUseCharUnit);
}
else
{
- aUseCharUnit.Check(pUsrPref->IsApplyCharUnit());
+ m_pUseCharUnit->Check(pUsrPref->IsApplyCharUnit());
}
- aUseCharUnit.SaveValue();
+ m_pUseCharUnit->SaveValue();
- aWordCountED.SetText(officecfg::Office::Writer::WordCount::AdditionalSeparators::get());
- aWordCountED.SaveValue();
+ m_pWordCountED->SetText(officecfg::Office::Writer::WordCount::AdditionalSeparators::get());
+ m_pWordCountED->SaveValue();
}
IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl)
{
- const sal_uInt16 nMPos = aMetricLB.GetSelectEntryPos();
+ const sal_uInt16 nMPos = m_pMetricLB->GetSelectEntryPos();
if(nMPos != USHRT_MAX)
{
// Double-Cast for VA3.0
- FieldUnit eFieldUnit = (FieldUnit)(sal_IntPtr)aMetricLB.GetEntryData( nMPos );
- sal_Bool bModified = aTabMF.IsModified();
+ FieldUnit eFieldUnit = (FieldUnit)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos );
+ sal_Bool bModified = m_pTabMF->IsModified();
long nVal = bModified ?
- sal::static_int_cast<sal_Int32, sal_Int64 >( aTabMF.Denormalize( aTabMF.GetValue( FUNIT_TWIP ) )) :
- nLastTab;
- ::SetFieldUnit( aTabMF, eFieldUnit );
- aTabMF.SetValue( aTabMF.Normalize( nVal ), FUNIT_TWIP );
+ sal::static_int_cast<sal_Int32, sal_Int64 >( m_pTabMF->Denormalize( m_pTabMF->GetValue( FUNIT_TWIP ) )) :
+ m_nLastTab;
+ ::SetFieldUnit( *m_pTabMF, eFieldUnit );
+ m_pTabMF->SetValue( m_pTabMF->Normalize( nVal ), FUNIT_TWIP );
if(!bModified)
- aTabMF.ClearModifyFlag();
+ m_pTabMF->ClearModifyFlag();
}
return 0;
diff --git a/sw/source/ui/config/optload.hrc b/sw/source/ui/config/optload.hrc
index 22ce1dd..4a39191 100644
--- a/sw/source/ui/config/optload.hrc
+++ b/sw/source/ui/config/optload.hrc
@@ -17,27 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-// SwLoadOptPage --------------------------------
-
-#define FL_UPDATE 10
-#define FT_LINK 11
-#define RB_ALWAYS 12
-#define RB_REQUEST 13
-#define RB_NEVER 14
-#define FT_FIELD 15
-#define CB_AUTO_UPDATE_FIELDS 16
-#define CB_AUTO_UPDATE_CHARTS 17
-#define FL_SETTINGS 18
-#define LB_METRIC 19
-#define FT_METRIC 20
-#define FT_TAB 21
-#define MF_TAB 22
-#define CB_USE_SQUARE_PAGE_MODE 23
-#define CB_USE_CHAR_UNIT 24
-#define FL_WORDCOUNT 25
-#define FT_WORDCOUNT 26
-#define ED_WORDCOUNT 27
-
// SwCaptionOptPage -----------------------------
#define FT_OBJECTS 10
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index b3b22ed..d3de153 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -22,145 +22,6 @@
#include "helpid.h"
#include "config.hrc"
-TabPage TP_OPTLOAD_PAGE
-{
- HelpID = HID_OPTLOAD_PAGE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedLine FL_UPDATE
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Update";
- };
- FixedText FT_LINK
- {
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 115 , 8 ) ;
- Text [ en-US ] = "Update links when loading";
- };
- RadioButton RB_ALWAYS
- {
- HelpID = "sw:RadioButton:TP_OPTLOAD_PAGE:RB_ALWAYS";
- Pos = MAP_APPFONT ( 18 , 26 ) ;
- Size = MAP_APPFONT ( 75 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Always";
- };
- RadioButton RB_REQUEST
- {
- HelpID = "sw:RadioButton:TP_OPTLOAD_PAGE:RB_REQUEST";
- Pos = MAP_APPFONT ( 18 , 39 ) ;
- Size = MAP_APPFONT ( 75 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~On request";
- };
- RadioButton RB_NEVER
- {
- HelpID = "sw:RadioButton:TP_OPTLOAD_PAGE:RB_NEVER";
- Pos = MAP_APPFONT ( 18 , 52 ) ;
- Size = MAP_APPFONT ( 75 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Never";
- };
- FixedText FT_FIELD
- {
- Pos = MAP_APPFONT ( 130 , 14 ) ;
- Size = MAP_APPFONT ( 124 , 8 ) ;
- Text [ en-US ] = "Automatically";
- };
- CheckBox CB_AUTO_UPDATE_FIELDS
- {
- HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS";
- Pos = MAP_APPFONT ( 136 , 26) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~Fields";
- };
- CheckBox CB_AUTO_UPDATE_CHARTS
- {
- HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS";
- Pos = MAP_APPFONT ( 136 , 39) ;
- Size = MAP_APPFONT ( 109 , 10 ) ;
- Text [ en-US ] = "~Charts";
- };
- FixedLine FL_SETTINGS
- {
- Pos = MAP_APPFONT ( 6 , 66 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Settings";
- };
- FixedText FT_METRIC
- {
- Pos = MAP_APPFONT ( 12 , 79 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "Measurement unit";
- };
- ListBox LB_METRIC
- {
- HelpID = "sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC";
- Pos = MAP_APPFONT ( 130, 77 ) ;
- Size = MAP_APPFONT ( 50 , 50 ) ;
- Border = TRUE ;
- DropDown = TRUE ;
- };
- FixedText FT_TAB
- {
- Pos = MAP_APPFONT ( 12 , 95 ) ;
- Size = MAP_APPFONT ( 73 , 8 ) ;
- Text [ en-US ] = "Tab stops";
- Group = TRUE ;
- };
- MetricField MF_TAB
- {
- HelpID = "sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 130 , 93 ) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- SpinSize = 10 ;
- Minimum = 50 ;
- Maximum = 9999 ;
- First = 50 ;
- Last = 9999 ;
- };
- CheckBox CB_USE_SQUARE_PAGE_MODE
- {
- HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_SQUARE_PAGE_MODE";
- Pos = MAP_APPFONT ( 12 , 130) ;
- Size = MAP_APPFONT ( 248 , 10 ) ;
- Text [ en-US ] = "Use square page mode for text grid";
- };
- CheckBox CB_USE_CHAR_UNIT
- {
- HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_CHAR_UNIT";
- Pos = MAP_APPFONT ( 12 , 111) ;
- Size = MAP_APPFONT ( 109 , 10 ) ;
- Text [ en-US ] = "Enable char unit";
- };
- FixedLine FL_WORDCOUNT
- {
- Pos = MAP_APPFONT ( 6 , 144 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Word Count";
- };
- FixedText FT_WORDCOUNT
- {
- Pos = MAP_APPFONT ( 12 , 157 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
- Text [ en-US ] = "Additional separators";
- };
- Edit ED_WORDCOUNT
- {
- Pos = MAP_APPFONT ( 95 , 155 ) ;
- Size = MAP_APPFONT ( 159 , 12 ) ;
- Border = TRUE ;
- };
-};
-
TabPage TP_OPTCAPTION_PAGE
{
HelpID = HID_OPTCAPTION_PAGE ;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 1f949a3..db7514d 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1284,7 +1284,6 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
case RID_SW_TP_OPTCOMPATIBILITY_PAGE :
pRet = SwCompatibilityOptPage::Create;
break;
- case TP_OPTLOAD_PAGE :
case RID_SW_TP_OPTLOAD_PAGE :
pRet = SwLoadOptPage::Create;
break;
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 9e27d5a..293f357 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -38,42 +38,33 @@ class SwWrtShell;
class SwLoadOptPage : public SfxTabPage
{
private:
- FixedLine aUpdateFL;
- FixedText aLinkFT;
- RadioButton aAlwaysRB;
- RadioButton aRequestRB;
- RadioButton aNeverRB;
-
- FixedText aFieldFT;
- CheckBox aAutoUpdateFields;
- CheckBox aAutoUpdateCharts;
-
- FixedLine aSettingsFL;
- FixedText aMetricFT;
- ListBox aMetricLB;
- FixedText aTabFT;
- MetricField aTabMF;
- CheckBox aUseSquaredPageMode;
- CheckBox aUseCharUnit;
- FixedLine aWordCountFL;
- FixedText aWordCountFT;
- Edit aWordCountED;
-
- SwWrtShell* pWrtShell;
- sal_Bool bHTMLMode;
- sal_uInt16 nLastTab;
- sal_Int32 nOldLinkMode;
+ RadioButton* m_pAlwaysRB;
+ RadioButton* m_pRequestRB;
+ RadioButton* m_pNeverRB;
+
+ CheckBox* m_pAutoUpdateFields;
+ CheckBox* m_pAutoUpdateCharts;
+
+ ListBox* m_pMetricLB;
+ FixedText* m_pTabFT;
+ MetricField* m_pTabMF;
+ CheckBox* m_pUseSquaredPageMode;
+ CheckBox* m_pUseCharUnit;
+ Edit* m_pWordCountED;
+
+ SwWrtShell* m_pWrtShell;
+ sal_uInt16 m_nLastTab;
+ sal_Int32 m_nOldLinkMode;
DECL_LINK(MetricHdl, void *);
public:
- SwLoadOptPage( Window* pParent, const SfxItemSet& rSet );
- ~SwLoadOptPage();
+ SwLoadOptPage(Window* pParent, const SfxItemSet& rSet);
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
@@ -161,7 +152,7 @@ private:
String sNone;
SwFldMgr *pMgr;
- sal_Bool bHTMLMode;
+ bool bHTMLMode;
DECL_LINK(SelectHdl, void *);
DECL_LINK(ModifyHdl, void * = 0);
diff --git a/sw/uiconfig/swriter/ui/optgeneralpage.ui b/sw/uiconfig/swriter/ui/optgeneralpage.ui
new file mode 100644
index 0000000..2515189
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/optgeneralpage.ui
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">0.5</property>
+ <property name="upper">99.989999999999995</property>
+ <property name="value">1.25</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="OptGeneralPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">18</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="always">
+ <property name="label" translatable="yes">_Always</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">onrequest</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="onrequest">
+ <property name="label" translatable="yes">_On request</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">never</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="never">
+ <property name="label" translatable="yes">_Never</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">always</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Update links when loading</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="updatefields">
+ <property name="label" translatable="yes">_Fields</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="updatecharts">
+ <property name="label" translatable="yes">_Charts</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Automatically Update</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Measurement unit</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">metric</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="metric">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="tablabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Tab stops</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">tab:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="tab:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="usecharunit">
+ <property name="label" translatable="yes">_Enable char unit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="squaremode">
+ <property name="label" translatable="yes">_Use square page mode for text grid</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Settings</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Additional separators</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">wordcount</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="wordcount">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Word Count</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+</interface>
commit 0b43d4abf1e41f6f2c5a56f6411ca85672c428e1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 3 18:24:04 2013 +0100
forgot to connect Adjustment to MetricFormatter
Change-Id: I5c8283c1bec454960ea4083dbd6dd4bdcbb12e1f
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c5fd105..0993af9 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1162,7 +1162,8 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
if (!sPattern.isEmpty())
{
- extractAdjustment(rMap);
+ OString sAdjustment = extractAdjustment(rMap);
+ connectNumericFormatterAdjustment(id, sAdjustment);
OString sUnit = extractUnit(sPattern);
FieldUnit eUnit = detectMetricUnit(sUnit);
SAL_WARN("vcl.layout", "making metric box for " << name.getStr() << " " << sUnit.getStr()
commit c938ef4be50f166ff5f45ef6d73ede07f3025f60
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 3 18:21:12 2013 +0100
drop unused GalleryTheme::GetStrURL
Change-Id: I9bef5ee5c40c39b9e4c926db287a53e7942eaa6a
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 25f939a..83899db 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -155,7 +155,6 @@ public:
const INetURLObject& GetThmURL() const;
SVX_DLLPUBLIC const INetURLObject& GetSdgURL() const;
const INetURLObject& GetSdvURL() const;
- const INetURLObject& GetStrURL() const;
SVX_DLLPUBLIC sal_uInt32 GetId() const;
void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index ac342d3..b44df02 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1602,7 +1602,6 @@ void GalleryTheme::ImplSetModified( sal_Bool bModified )
const OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); }
const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); }
const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); }
-const INetURLObject& GalleryTheme::GetStrURL() const { return pThm->GetStrURL(); }
const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); }
sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); }
void GalleryTheme::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
diff --git a/unusedcode.easy b/unusedcode.easy
index 887641c..89479d2 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -9,7 +9,6 @@ BitmapWriteAccess::DrawPolygon(Polygon const&)
DbgRegisterNamedUserChannel(rtl::OUString const&, void (*)(char const*))
EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&)
FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace const&, Size const&, float, int, bool)
-GalleryTheme::GetStrURL() const
ImplRegionBand::IsInside(long, long)
ImplRegionBand::IsOver(long, long)
LanguageTag::reset(_rtl_Locale const&)
commit b14d791fc0b1e7087cd4131d93ebb12729cc728d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 3 15:19:28 2013 +0100
drop unused vcl::unohelper::getNaturalStringSorterForAppLocale
Change-Id: Ie85005ceba32ce2de3296f91e4688467b06dee2d
diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index 9116843..3119799 100644
--- a/include/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
@@ -52,8 +52,6 @@ namespace unohelper
{
VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > CreateBreakIterator();
VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification> CreateCharacterClassification();
-//Get access to singleton Natural String Sorter collating for Application::GetLocale
-VCL_DLLPUBLIC const comphelper::string::NaturalStringSorter& getNaturalStringSorterForAppLocale();
VCL_DLLPUBLIC OUString CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD );
VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject );
}} // namespace vcl::unohelper
diff --git a/unusedcode.easy b/unusedcode.easy
index 2c163f9..887641c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -221,5 +221,4 @@ svx::sidebar::TextCharacterSpacingControl::ToGetFocus()
unoidl::UnoidlProvider::getConstant(unsigned int) const
utl::ConfigItem::getUniqueSetElementName(rtl::OUString const&, rtl::OUString&)
utl::toISO8601(com::sun::star::util::Time const&)
-vcl::unohelper::getNaturalStringSorterForAppLocale()
vclmain::createApplication()
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 7684ca8..ac76319 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -151,17 +151,6 @@ namespace
};
}
-namespace vcl
-{
- namespace unohelper
- {
- const comphelper::string::NaturalStringSorter& getNaturalStringSorterForAppLocale()
- {
- return theSorter::get();
- }
- }
-}
-
sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry, sal_Bool bSort )
{
if ( !!pNewEntry->maImage )
More information about the Libreoffice-commits
mailing list