diff options
| author | Tobias Lippert <drtl@fastmail.fm> | 2014-01-02 23:52:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-20 16:22:17 +0000 |
| commit | a18a1a454505193b922e1d5dc3215526f01f5efd (patch) | |
| tree | 5a7ed351f2bdd8aab7b62a57fb2f22916b51f229 /cui/source/options/optgdlg.cxx | |
| parent | DOCX export: handle wp14:sizeRelH/V relativeFrom=margin for shapes (diff) | |
| download | core-a18a1a454505193b922e1d5dc3215526f01f5efd.tar.gz core-a18a1a454505193b922e1d5dc3215526f01f5efd.zip | |
Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxx
Added vcl/settings.hxx to all cxx files which require it.
This helps to speed up compilation after changes to the settings.
Conflicts:
sc/source/ui/dbgui/pvlaydlg.cxx
Change-Id: I211a0735c47f72d6879f6f15339355abfe0e3cf4
Reviewed-on: https://gerrit.libreoffice.org/7933
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/options/optgdlg.cxx')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 682469f5fab9..e2544a61f11a 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -84,6 +84,7 @@ #include <com/sun/star/office/Quickstart.hpp> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "optgdlg.hxx" #include <svx/ofaitem.hxx> @@ -537,6 +538,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", rSet) , nSizeLB_InitialSelection(0) , nStyleLB_InitialSelection(0) + , aIconStyleItemId(STYLE_SYMBOLS_THEMES_MAX, 0) , pAppearanceCfg(new SvtTabAppearanceCfg) , pCanvasSettings(new CanvasSettings) , mpDrawinglayerOpt(new SvtOptionsDrawinglayer) @@ -625,10 +627,10 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) // prefer the icon style set by the desktop native widgets modules sal_uLong nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle(); // fallback to the statically defined values - if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] ) + if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId.at(nAutoStyle) ) nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); - if ( aIconStyleItemId[nAutoStyle] ) - aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] ); + if ( aIconStyleItemId.at(nAutoStyle) ) + aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId.at(nAutoStyle) ); m_pIconStyleLB->RemoveEntry( 0 ); m_pIconStyleLB->InsertEntry( aAutoStr += ")", 0 ); @@ -879,7 +881,7 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) m_pIconSizeLB->SaveValue(); if( aMiscOptions.GetSymbolsStyle() != STYLE_SYMBOLS_AUTO ) - nStyleLB_InitialSelection = aIconStyleItemId[aMiscOptions.GetCurrentSymbolsStyle()]; + nStyleLB_InitialSelection = aIconStyleItemId.at(aMiscOptions.GetCurrentSymbolsStyle()); m_pIconStyleLB->SelectEntryPos( nStyleLB_InitialSelection ); m_pIconStyleLB->SaveValue(); |