diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 10 | ||||
| -rw-r--r-- | svx/source/form/databaselocationinput.cxx | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 5a32430ab271..c1b7a2d65895 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -171,7 +171,6 @@ class FontPrevWin_Impl bool mbSelection : 1; bool mbGetSelection : 1; - bool mbUseResText : 1; bool mbTwoLines : 1; bool mbUseFontNameAsText : 1; bool mbTextInited : 1; @@ -190,7 +189,6 @@ public: mnFontWidthScale(100), mbSelection(false), mbGetSelection(false), - mbUseResText(false), mbTwoLines(false), mbUseFontNameAsText(false), mbTextInited(false) @@ -595,9 +593,7 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::R } else { - if (pImpl->mbUseResText) - pImpl->maText = GetText(); - else if (!pImpl->mbSelection && !pImpl->mbTextInited) + if (!pImpl->mbSelection && !pImpl->mbTextInited) { using namespace css::i18n::ScriptType; @@ -958,9 +954,7 @@ void FontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rect } else { - if (pImpl->mbUseResText) - pImpl->maText = OUString(); - else if (!pImpl->mbSelection && !pImpl->mbTextInited) + if (!pImpl->mbSelection && !pImpl->mbTextInited) { using namespace css::i18n::ScriptType; diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index ab13de1444a2..6d49c7dd2eff 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -74,7 +74,6 @@ namespace svx private: const Reference<XComponentContext> m_xContext; URLBox& m_rLocationInput; - weld::Button& m_rBrowseButton; weld::Window& m_rDialog; Sequence< OUString > m_aFilterExtensions; OUString m_sFilterUIName; @@ -85,7 +84,6 @@ namespace svx URLBox& _rLocationInput, weld::Button& _rBrowseButton, weld::Window& _rDialog) :m_xContext( _rContext ) ,m_rLocationInput( _rLocationInput ) - ,m_rBrowseButton( _rBrowseButton ) ,m_rDialog( _rDialog ) ,m_aFilterExtensions() ,m_sFilterUIName() @@ -101,7 +99,7 @@ namespace svx aExtensionList.append( ';' ); } m_rLocationInput.SetFilter( aExtensionList.makeStringAndClear() ); - m_rBrowseButton.connect_clicked(LINK(this, DatabaseLocationInputController_Impl, OnButtonAction)); + _rBrowseButton.connect_clicked(LINK(this, DatabaseLocationInputController_Impl, OnButtonAction)); } bool DatabaseLocationInputController_Impl::prepareCommit() |