diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-17 22:56:46 +0900 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-18 11:22:49 +0900 |
commit | b4bbb5e5d7b31caad2fbcc00382ad27df3c81001 (patch) | |
tree | 8ac345712ff92a9b33a7d54651ed27ad88f1ec67 /sc | |
parent | 2ca7795a6a723c701f295323fcc3f6c52ad37976 (diff) |
refactor how font, fg. and bg. are applied in widgets/controls
- Move vcl::RenderContext to outdev.
- Change some methods on vcl::Window to accept RenderContext
as parameter.
- Add ApplySettings to vcl::Window - This method is called before
painting. Refactor existing classes that use InitSettings to
have ApplySettings or mark the classes to be refactored later.
- Add RenderSettings for adding defered settings to rendering.
This is similar to ApplySettings but for more ad-hoc calls.
Change-Id: I4ea58461f3b6b08ccfa3e0ddd1a4a3e04f8c4f45
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/inc/content.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/navipi/content.cxx | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index a801a97f9d16..004b5384501d 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -152,9 +152,9 @@ public: const OUString& GetHiddenTitle() const { return aHiddenTitle; } /** Applies the navigator settings to the listbox. */ - void ApplySettings(); + void ApplyNavigatorSettings(); /** Stores the current listbox state in the navigator settings. */ - void StoreSettings() const; + void StoreNavigatorSettings() const; static bool IsInDrag() { return bIsInDrag; } }; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 3b583113706b..e6f607a97767 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -425,7 +425,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl) void ScContentTree::MouseButtonDown( const MouseEvent& rMEvt ) { SvTreeListBox::MouseButtonDown( rMEvt ); - StoreSettings(); + StoreNavigatorSettings(); } void ScContentTree::KeyInput( const KeyEvent& rKEvt ) @@ -531,13 +531,13 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) { if(aCode.GetCode() == KEY_F5 ) { - StoreSettings(); + StoreNavigatorSettings(); SvTreeListBox::KeyInput(rKEvt); } else { SvTreeListBox::KeyInput(rKEvt); - StoreSettings(); + StoreNavigatorSettings(); } } } @@ -739,7 +739,7 @@ void ScContentTree::ObjectFresh( sal_uInt16 nType, SvTreeListEntry* pEntry ) ClearType( nType ); GetDrawNames( nType/*, nId*/ ); if( !pEntry ) - ApplySettings(); + ApplyNavigatorSettings(); SetUpdateMode(true); if( pEntry ) { @@ -808,7 +808,7 @@ void ScContentTree::Refresh( sal_uInt16 nType ) if ( !nType || nType == SC_CONTENT_AREALINK ) GetLinkNames(); - ApplySettings(); + ApplyNavigatorSettings(); SetUpdateMode(true); } @@ -1622,7 +1622,7 @@ void ScContentTree::SelectDoc(const OUString& rName) // rName wie im Menue/ } } -void ScContentTree::ApplySettings() +void ScContentTree::ApplyNavigatorSettings() { const ScNavigatorSettings* pSettings = ScNavigatorDlg::GetNavigatorSettings(); if( pSettings ) @@ -1657,7 +1657,7 @@ void ScContentTree::ApplySettings() } } -void ScContentTree::StoreSettings() const +void ScContentTree::StoreNavigatorSettings() const { ScNavigatorSettings* pSettings = ScNavigatorDlg::GetNavigatorSettings(); if( pSettings ) |