summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compilerplugins/clang/singlevalfields.could-be-bool.results2
-rw-r--r--compilerplugins/clang/singlevalfields.results85
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx42
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.hxx3
-rw-r--r--include/svx/langbox.hxx1
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx17
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx1
-rw-r--r--svx/source/dialog/langbox.cxx7
-rw-r--r--vcl/inc/toolbox.h1
-rw-r--r--vcl/source/window/toolbox.cxx27
-rw-r--r--vcl/source/window/toolbox2.cxx1
11 files changed, 42 insertions, 145 deletions
diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results b/compilerplugins/clang/singlevalfields.could-be-bool.results
index 46cfc143d82e..1392169172b5 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -4,7 +4,7 @@ chart2/source/view/inc/PlottingPositionHelper.hxx:206
connectivity/source/inc/dbase/dindexnode.hxx:125
connectivity::dbase::ONDXPage bNoDelete
unsigned int
-cui/source/inc/cfg.hxx:249
+cui/source/inc/cfg.hxx:244
SvxConfigEntry nId
sal_uInt16
desktop/source/app/main.c:29
diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results
index 22b63aaa8a77..596df914cf76 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -112,13 +112,16 @@ connectivity/source/inc/writer/WTable.hxx:65
cui/source/inc/acccfg.hxx:120
SfxAcceleratorConfigPage m_aUpdateDataTimer
UpdateDataTimer
+cui/source/inc/cfg.hxx:375
+ SvxConfigPage m_aUpdateDataTimer
+ UpdateDataTimer
cui/source/inc/linkdlg.hxx:46
SvBaseLinksDlg aUpdateIdle
cui SvBaseLinksDlg UpdateIdle
cui/source/inc/thesdlg.hxx:38
LookUpComboBox m_aModifyIdle
cui LookUpComboBox Modify
-cui/source/options/optgdlg.cxx:1103
+cui/source/options/optgdlg.cxx:1086
LanguageConfig_Impl aLanguageOptions
0
cui/source/options/optjava.hxx:78
@@ -133,28 +136,31 @@ desktop/source/app/app.cxx:507
desktop/source/app/cmdlineargs.hxx:137
desktop::CommandLineArgs m_quickstart
0
-drawinglayer/source/primitive2d/sceneprimitive2d.cxx:368
+desktop/source/deployment/gui/dp_gui_updatedialog.hxx:155
+ dp_gui::UpdateDialog m_bModified
+ 0
+drawinglayer/source/primitive2d/sceneprimitive2d.cxx:369
drawinglayer::primitive2d::ScenePrimitive2D::create2DDecomposition bMultithreadAllowed
1
-drawinglayer/source/primitive2d/sceneprimitive2d.cxx:472
+drawinglayer/source/primitive2d/sceneprimitive2d.cxx:473
drawinglayer::primitive2d::ScenePrimitive2D::create2DDecomposition bAddOutlineToCreated3DSceneRepresentation
0
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx:332
drawinglayer::impBufferDevice::paint bDoSaveForVisualControl
0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:925
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:926
drawinglayer::processor2d::VclMetafileProcessor2D::processGraphicPrimitive2D bSuppressPDFExtOutDevDataSupport
0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1250
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1251
drawinglayer::processor2d::VclMetafileProcessor2D::processTextHierarchyParagraphPrimitive2D bSuppressPDFExtOutDevDataSupport
0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1998
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2007
drawinglayer::processor2d::VclMetafileProcessor2D::processUnifiedTransparencePrimitive2D bForceToMetafile
0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2092
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2101
drawinglayer::processor2d::VclMetafileProcessor2D::processTransparencePrimitive2D bForceToBigTransparentVDev
0
-drawinglayer/source/tools/converters.cxx:90
+drawinglayer/source/tools/converters.cxx:91
drawinglayer::convertToBitmapEx bDoSaveForVisualControl
0
editeng/source/editeng/impedit.hxx:474
@@ -172,7 +178,7 @@ extensions/source/propctrlr/browserline.hxx:60
extensions/source/propctrlr/browserline.hxx:61
pcr::OBrowserLine m_pAdditionalBrowseButton
0
-filter/source/msfilter/msdffimp.cxx:2622
+filter/source/msfilter/msdffimp.cxx:2635
DffPropertyReader::ApplyAttributes bCheckShadow
0
filter/source/msfilter/viscache.hxx:31
@@ -328,6 +334,9 @@ include/svx/fontwork.hxx:102
include/svx/graphctl.hxx:54
GraphCtrl aUpdateIdle
svx GraphCtrl Update
+include/svx/langbox.hxx:82
+ SvxLanguageBoxBase m_bLangNoneIsLangAll
+ 0
include/svx/numvset.hxx:131
SvxBmpNumValueSet aFormatIdle
SvxBmpNumValueSet FormatIdle
@@ -346,10 +355,10 @@ include/svx/svdmark.hxx:145
include/svx/svdmrkv.hxx:110
SdrMarkView mnFrameHandlesLimit
50
-include/vcl/ITiledRenderable.hxx:89
+include/vcl/ITiledRenderable.hxx:40
vcl::ITiledRenderable mnTilePixelWidth
256
-include/vcl/ITiledRenderable.hxx:89
+include/vcl/ITiledRenderable.hxx:40
vcl::ITiledRenderable mnTilePixelHeight
256
include/vcl/opengl/OpenGLContext.hxx:51
@@ -541,7 +550,7 @@ sc/source/ui/inc/checklistmenu.hxx:157
sc/source/ui/inc/conflictsdlg.hxx:134
ScConflictsDlg maSelectionIdle
ScConflictsDlg SelectionIdle
-sc/source/ui/inc/retypepassdlg.hxx:91
+sc/source/ui/inc/retypepassdlg.hxx:86
ScRetypePassDlg mpDocItem
0
sc/source/ui/inc/viewdata.hxx:289
@@ -571,6 +580,9 @@ sd/source/ui/inc/DrawController.hxx:290
sd/source/ui/inc/pubdlg.hxx:151
SdPublishingDlg aAssistentFunc
6
+sd/source/ui/inc/sdtreelb.hxx:302
+ SdPageObjsTLV m_pOwnMedium
+ 0
sd/source/ui/inc/View.hxx:240
sd::View maDropErrorIdle
sd View DropError
@@ -697,15 +709,6 @@ svx/source/dialog/contimp.hxx:52
svx/source/dialog/contimp.hxx:53
SvxSuperContourDlg aCreateIdle
SvxSuperContourDlg CreateIdle
-svx/source/inc/docrecovery.hxx:412
- svx::DocRecovery::RecoveryDialog m_aGreenCheckImg
- svx/res/nu01.png
-svx/source/inc/docrecovery.hxx:413
- svx::DocRecovery::RecoveryDialog m_aYellowCheckImg
- svx/res/nu04.png
-svx/source/inc/docrecovery.hxx:414
- svx::DocRecovery::RecoveryDialog m_aRedCrossImg
- svx/res/nu02.png
svx/source/sdr/contact/viewcontactofsdrpage.cxx:104
sdr::contact::ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence bUseOldPageShadow
0
@@ -760,10 +763,10 @@ sw/inc/view.hxx:189
sw/inc/view.hxx:190
SwView m_pVScrollbar
0
-sw/inc/view.hxx:698
+sw/inc/view.hxx:694
/media/noel/disk2/libo4/sw/source/uibase/uiview/view.cxx bDocSzUpdated
1
-sw/inc/view.hxx:698
+sw/inc/view.hxx:694
/media/noel/disk2/libo4/sw/source/uibase/uiview/viewport.cxx bDocSzUpdated
0
sw/inc/viewopt.hxx:187
@@ -781,19 +784,19 @@ sw/source/core/docnode/threadmanager.hxx:125
sw/source/core/inc/blink.hxx:89
/media/noel/disk2/libo4/sw/source/core/text/blink.cxx pBlink
0
-sw/source/core/inc/DocumentTimerManager.hxx:77
+sw/source/core/inc/DocumentTimerManager.hxx:76
sw::DocumentTimerManager m_aFireIdleJobsTimer
sw::DocumentTimerManager m_aFireIdleJobsTimer
-sw/source/core/inc/fntcache.hxx:59
+sw/source/core/inc/fntcache.hxx:57
/media/noel/disk2/libo4/sw/source/core/txtnode/fntcache.cxx pFntCache
0
-sw/source/core/inc/fntcache.hxx:60
+sw/source/core/inc/fntcache.hxx:58
/media/noel/disk2/libo4/sw/source/core/txtnode/fntcache.cxx pLastFont
0
-sw/source/core/inc/frmtool.hxx:141
+sw/source/core/inc/frmtool.hxx:142
/media/noel/disk2/libo4/sw/source/core/layout/frmtool.cxx bDontCreateObjects
0
-sw/source/core/inc/frmtool.hxx:144
+sw/source/core/inc/frmtool.hxx:145
/media/noel/disk2/libo4/sw/source/core/layout/frmtool.cxx bSetCompletePaintOnInvalidate
0
sw/source/core/inc/noteurl.hxx:28
@@ -808,10 +811,7 @@ sw/source/core/inc/txtfly.hxx:45
sw/source/core/inc/UndoSort.hxx:38
SwSortUndoElement::(anonymous union)::(anonymous) nID
4294967295
-sw/source/core/inc/UndoTable.hxx:183
- SwUndoTableNdsChg m_nSetColType
- 15
-sw/source/core/layout/flylay.cxx:304
+sw/source/core/layout/flylay.cxx:305
SwFlyFreeFrame::supportsAutoContour bOverrideHandleContourToAlwaysOff
1
sw/source/core/ole/ndole.cxx:1058
@@ -1255,9 +1255,6 @@ sw/source/filter/html/css1kywd.hxx:244
sw/source/filter/inc/rtf.hxx:30
RTFSurround::(anonymous union)::(anonymous) nJunk
0
-sw/source/filter/ww8/docxattributeoutput.hxx:915
- DocxAttributeOutput m_bBtLr
- 0
sw/source/filter/ww8/ww8par3.cxx:335
WW8LST bSimpleList
1
@@ -1375,9 +1372,6 @@ sw/source/filter/ww8/ww8struc.hxx:893
sw/source/ui/envelp/labfmt.hxx:67
SwLabFormatPage aPreviewIdle
SwLabFormatPage Preview
-sw/source/uibase/inc/dbtree.hxx:69
- DBTreeList bShowColumns
- 0
sw/source/uibase/inc/edtdd.hxx:15
/media/noel/disk2/libo4/sw/source/uibase/docvw/edtwin.cxx g_bExecuteDrag
0
@@ -1426,12 +1420,15 @@ vcl/inc/salprn.hxx:44
vcl/inc/salwtype.hxx:154
SalWheelMouseEvent mbDeltaIsPixel
0
-vcl/inc/svdata.hxx:281
+vcl/inc/svdata.hxx:285
ImplSVNWFData mbMenuBarDockingAreaCommonBG
0
-vcl/inc/svdata.hxx:303
+vcl/inc/svdata.hxx:307
ImplSVNWFData mbRolloverMenubar
0
+vcl/inc/toolbox.h:150
+ ImplToolBoxPrivateData mbPageScroll
+ 0
vcl/source/bitmap/BitmapTools.cxx:1056
vcl::bitmap::get_unpremultiply_table inited
1
@@ -1510,7 +1507,7 @@ vcl/source/window/layout.cxx:225
vcl/source/window/layout.cxx:226
VclContainer::Command bAddScreenshotButtonToMenu
1
-vcl/unx/gtk3/gtk3gtkinst.cxx:8303
+vcl/unx/gtk3/gtk3gtkinst.cxx:8741
(anonymous namespace)::ensure_intercept_drawing_area_accessibility bDone
1
vcl/unx/gtk/a11y/atkutil.cxx:746
@@ -1519,12 +1516,6 @@ vcl/unx/gtk/a11y/atkutil.cxx:746
workdir/LexTarget/l10ntools/source/xrmlex.cxx:715
/media/noel/disk2/libo4/workdir/LexTarget/l10ntools/source/xrmlex.cxx bText
0
-writerfilter/source/dmapper/DomainMapperTableManager.hxx:65
- writerfilter::dmapper::DomainMapperTableManager m_bRowSizeTypeInserted
- 0
-writerfilter/source/dmapper/DomainMapperTableManager.hxx:67
- writerfilter::dmapper::DomainMapperTableManager m_bHasBtlrCell
- 0
writerfilter/source/dmapper/SettingsTable.cxx:255
writerfilter::dmapper::SettingsTable_Impl m_pThemeFontLangProps
3
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index fe8517de628d..c4b3cebb3fe0 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -480,7 +480,6 @@ UpdateDialog::UpdateDialog(
, m_ignoredUpdate(DpResId(RID_DLG_UPDATE_IGNORED_UPDATE))
, m_updateData(*updateData)
, m_thread(new UpdateDialog::Thread(context, *this, vExtensionList))
- , m_bModified( false )
, m_xChecking(m_xBuilder->weld_label("UPDATE_CHECKING"))
, m_xThrobber(m_xBuilder->weld_spinner("THROBBER"))
, m_xUpdate(m_xBuilder->weld_label("UPDATE_LABEL"))
@@ -533,7 +532,6 @@ UpdateDialog::UpdateDialog(
UpdateDialog::~UpdateDialog()
{
- storeIgnoredUpdates();
}
short UpdateDialog::run() {
@@ -756,7 +754,6 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly )
}
}
- storeIgnoredUpdates();
createNotifyJob( bPrepareOnly, aItemList );
}
@@ -858,45 +855,6 @@ void UpdateDialog::getIgnoredUpdates()
}
-void UpdateDialog::storeIgnoredUpdates()
-{
- if ( m_bModified && ( !m_ignoredUpdates.empty() ) )
- {
- uno::Reference< lang::XMultiServiceFactory > xConfig(
- configuration::theDefaultProvider::get(m_context));
- beans::NamedValue aValue( "nodepath", uno::Any( IGNORED_UPDATES ) );
- uno::Sequence< uno::Any > args(1);
- args[0] <<= aValue;
-
- uno::Reference< container::XNameContainer > xNameContainer( xConfig->createInstanceWithArguments(
- "com.sun.star.configuration.ConfigurationUpdateAccess", args ), uno::UNO_QUERY_THROW );
-
- for (auto const& ignoredUpdate : m_ignoredUpdates)
- {
- if ( xNameContainer->hasByName( ignoredUpdate->sExtensionID ) )
- {
- if ( ignoredUpdate->bRemoved )
- xNameContainer->removeByName( ignoredUpdate->sExtensionID );
- else
- uno::Reference< beans::XPropertySet >( xNameContainer->getByName( ignoredUpdate->sExtensionID ), uno::UNO_QUERY_THROW )->setPropertyValue( PROPERTY_VERSION, uno::Any( ignoredUpdate->sVersion ) );
- }
- else if ( ! ignoredUpdate->bRemoved )
- {
- uno::Reference< beans::XPropertySet > elem( uno::Reference< lang::XSingleServiceFactory >( xNameContainer, uno::UNO_QUERY_THROW )->createInstance(), uno::UNO_QUERY_THROW );
- elem->setPropertyValue( PROPERTY_VERSION, uno::Any( ignoredUpdate->sVersion ) );
- xNameContainer->insertByName( ignoredUpdate->sExtensionID, uno::Any( elem ) );
- }
- }
-
- uno::Reference< util::XChangesBatch > xChangesBatch( xNameContainer, uno::UNO_QUERY );
- if ( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
- xChangesBatch->commitChanges();
- }
-
- m_bModified = false;
-}
-
-
bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index )
{
bool bIsIgnored = false;
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 106abf3dafff..d5b4f841c48c 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -112,7 +112,6 @@ private:
void enableOk();
void getIgnoredUpdates();
- void storeIgnoredUpdates();
void initDescription();
void clearDescription();
@@ -152,8 +151,6 @@ private:
rtl::Reference< UpdateDialog::Thread > m_thread;
css::uno::Reference< css::deployment::XExtensionManager > m_xExtensionManager;
- bool m_bModified;
-
std::unique_ptr<weld::Label> m_xChecking;
std::unique_ptr<weld::Spinner> m_xThrobber;
std::unique_ptr<weld::Label> m_xUpdate;
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index e20c35a96adf..9c480eddc1d3 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -79,7 +79,6 @@ protected:
std::unique_ptr<css::uno::Sequence< sal_Int16 >>
m_pSpellUsedLang;
bool m_bHasLangNone;
- bool m_bLangNoneIsLangAll;
bool m_bWithCheckmark;
SVX_DLLPRIVATE void ImplLanguageBoxBaseInit();
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 32586303799f..cfac921eeda0 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1407,7 +1407,6 @@ SdPageObjsTLV::SdPageObjsTLV(std::unique_ptr<weld::TreeView> xTreeView)
, m_pDoc(nullptr)
, m_pBookmarkDoc(nullptr)
, m_pMedium(nullptr)
- , m_pOwnMedium(nullptr)
, m_bLinkableSelected(false)
, m_bShowAllPages(false)
{
@@ -1465,12 +1464,6 @@ SdDrawDocument* SdPageObjsTLV::GetBookmarkDoc()
{
if (!m_pBookmarkDoc)
{
- // create a new BookmarkDoc if now one exists or if a new Medium is provided
- if (m_pOwnMedium != nullptr)
- {
- CloseBookmarkDoc();
- }
-
DBG_ASSERT( m_pMedium, "No SfxMedium provided!" );
if ( m_pMedium )
@@ -1585,13 +1578,9 @@ void SdPageObjsTLV::CloseBookmarkDoc()
{
m_xBookmarkDocShRef->DoClose();
m_xBookmarkDocShRef.clear();
-
- // Medium is owned by document, so it's destroyed already
- m_pOwnMedium = nullptr;
}
else if (m_pBookmarkDoc)
{
- DBG_ASSERT(!m_pOwnMedium, "SfxMedium confusion!");
if (m_pDoc)
{
// The document owns the Medium, so the Medium will be invalid after closing the document
@@ -1599,12 +1588,6 @@ void SdPageObjsTLV::CloseBookmarkDoc()
m_pMedium = nullptr;
}
}
- else
- {
- // perhaps mpOwnMedium provided, but no successful creation of BookmarkDoc
- delete m_pOwnMedium;
- m_pOwnMedium = nullptr;
- }
m_pBookmarkDoc = nullptr;
}
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index e08674568bd2..8d404ebf5b7c 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -299,7 +299,6 @@ private:
const SdDrawDocument* m_pDoc;
SdDrawDocument* m_pBookmarkDoc;
SfxMedium* m_pMedium;
- SfxMedium* m_pOwnMedium;
bool m_bLinkableSelected;
/** This flag controls whether to show all pages.
*/
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index bd4d32e2ab9e..bf5e38251d89 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -133,7 +133,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageComboBox(VclPtr<vcl::Window>
SvxLanguageBoxBase::SvxLanguageBoxBase()
: m_bHasLangNone(false)
- , m_bLangNoneIsLangAll(false)
, m_bWithCheckmark(false)
{
}
@@ -144,7 +143,6 @@ void SvxLanguageBoxBase::ImplLanguageBoxBaseInit()
m_aCheckedImage = Image(StockImage::Yes, RID_SVXBMP_CHECKED);
m_aAllString = SvxResId( RID_SVXSTR_LANGUAGE_ALL );
m_bHasLangNone = false;
- m_bLangNoneIsLangAll = false;
if ( m_bWithCheckmark )
{
@@ -221,7 +219,6 @@ void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList,
ImplClear();
m_bHasLangNone = bHasLangNone;
- m_bLangNoneIsLangAll = false;
m_bWithCheckmark = bCheckSpellAvail;
if ( SvxLanguageListFlags::EMPTY == nLangList )
@@ -326,8 +323,6 @@ sal_Int32 SvxLanguageBoxBase::ImplInsertLanguage( const LanguageType nLangType,
}
OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang );
- if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
- aStrEntry = m_aAllString;
LanguageType nRealLang = nLang;
if (nRealLang == LANGUAGE_SYSTEM)
@@ -394,8 +389,6 @@ void SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType,
}
OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang );
- if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
- aStrEntry = m_aAllString;
sal_Int32 nAt = ImplInsertImgEntry( aStrEntry, LISTBOX_APPEND, bCheckEntry );
ImplSetEntryData( nAt, reinterpret_cast<void*>(static_cast<sal_uInt16>(nLang)) );
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 17c5585ef490..4540cb0c109c 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -147,7 +147,6 @@ struct ImplToolBoxPrivateData
mbKeyInputDisabled:1, // no KEY input if all items disabled, closing/docking will be allowed though
mbIsPaintLocked:1, // don't allow paints
mbMenubuttonSelected:1, // menu button is highlighted
- mbPageScroll:1, // determines if we scroll a page at a time
mbNativeButtons:1, // system supports native toolbar buttons
mbWillUsePopupMode:1, // this toolbox will be opened in popup mode
mbDropDownByKeyboard:1; // tells whether a dropdown was started by key input
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 671814e2c646..c7bc19f089c1 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2988,33 +2988,12 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow )
void ToolBox::ShowLine( bool bNext )
{
-
mbFormat = true;
- if ( mpData->mbPageScroll )
- {
- ImplToolItems::size_type delta = mnVisLines;
- if ( bNext )
- {
- mnCurLine = mnCurLine + delta;
- if ( mnCurLine+mnVisLines-1 > mnCurLines )
- mnCurLine = mnCurLines - mnVisLines+1;
- }
- else
- {
- if( mnCurLine >= delta+1 )
- mnCurLine = mnCurLine - delta;
- else
- mnCurLine = 1;
- }
- }
+ if ( bNext )
+ mnCurLine++;
else
- {
- if ( bNext )
- mnCurLine++;
- else
- mnCurLine--;
- }
+ mnCurLine--;
ImplFormat();
}
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 2fab40a8f120..3d7b0de98ea9 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -62,7 +62,6 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData()
mbAssumeFloating = false;
mbKeyInputDisabled = false;
mbMenubuttonSelected = false;
- mbPageScroll = false;
mbWillUsePopupMode = false;
mbDropDownByKeyboard = false;
}
generated by cgit (git 2.34.1) at 2025-02-09 04:54:10 +0000