[Libreoffice-commits] core.git: 11 commits - accessibility/source drawinglayer/source editeng/source framework/inc framework/Library_fwe.mk framework/source include/drawinglayer include/editeng include/framework include/linguistic include/sfx2 include/svtools include/svx include/ucbhelper linguistic/source sfx2/source svtools/source svx/source ucbhelper/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Sep 18 11:53:41 UTC 2017
accessibility/source/extended/accessiblelistboxentry.cxx | 4 -
drawinglayer/source/processor3d/shadow3dextractor.cxx | 5 -
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 20 -----
editeng/source/items/numitem.cxx | 6 +
framework/Library_fwe.mk | 1
framework/inc/uielement/menubarmanager.hxx | 1
framework/source/fwe/classes/menuextensionsupplier.cxx | 47 ------------
framework/source/uielement/menubarmanager.cxx | 32 --------
include/drawinglayer/processor3d/shadow3dextractor.hxx | 5 -
include/editeng/AccessibleEditableTextPara.hxx | 2
include/editeng/numitem.hxx | 1
include/framework/menuextensionsupplier.hxx | 43 ----------
include/linguistic/lngprophelp.hxx | 3
include/sfx2/sidebar/ControllerItem.hxx | 3
include/svtools/accessibleruler.hxx | 5 -
include/svtools/editbrowsebox.hxx | 1
include/svtools/treelistbox.hxx | 3
include/svx/dlgctrl.hxx | 1
include/ucbhelper/resultsetmetadata.hxx | 18 ----
linguistic/source/lngprophelp.cxx | 5 -
sfx2/source/sidebar/ControllerItem.cxx | 14 ---
svtools/source/brwbox/ebbcontrols.cxx | 4 -
svtools/source/contnr/treelistbox.cxx | 37 ---------
svtools/source/control/accessibleruler.cxx | 3
svx/source/dialog/dlgctrl.cxx | 2
ucbhelper/source/provider/resultsetmetadata.cxx | 44 ++---------
26 files changed, 31 insertions(+), 279 deletions(-)
New commits:
commit 1f38a0fe112c6293d04357ad2082255aaaf7e7b3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 13:43:47 2017 +0200
unused nResMaxNumberOfSuggestions in PropertyHelper_Spell
since
commit a111044babf3ee929baf548b7ad29df0a419293b
Date: Wed Jul 15 10:49:17 2015 +0200
loplugin:unusedmethods linguistic
Change-Id: I329c53b739395e9332b767562a138b52ce2fe588
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 6a52633f681b..f8613deb454e 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -175,7 +175,6 @@ class LNG_DLLPUBLIC PropertyHelper_Spell :
bool bIsSpellCapitalization;
// return values, will be set to default value or current temporary value
- sal_Int16 nResMaxNumberOfSuggestions; // special value that is not part of the property set and thus needs to be handled differently
bool bResIsSpellUpperCase;
bool bResIsSpellWithDigits;
bool bResIsSpellCapitalization;
@@ -202,8 +201,6 @@ public:
virtual void SAL_CALL
propertyChange( const css::beans::PropertyChangeEvent& rEvt ) override;
- static sal_Int16 GetDefaultNumberOfSuggestions() { return 16; }
-
bool IsSpellUpperCase() const { return bResIsSpellUpperCase; }
bool IsSpellWithDigits() const { return bResIsSpellWithDigits; }
bool IsSpellCapitalization() const { return bResIsSpellCapitalization; }
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 0bf1a52db3fc..475b9c505525 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -342,8 +342,6 @@ PropertyHelper_Spell::PropertyHelper_Spell(
AddPropNames( aSP, SAL_N_ELEMENTS(aSP) );
SetDefaultValues();
GetCurrentValues();
-
- nResMaxNumberOfSuggestions = GetDefaultNumberOfSuggestions();
}
@@ -474,7 +472,6 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
// return value is default value unless there is an explicitly supplied
// temporary value
- nResMaxNumberOfSuggestions = GetDefaultNumberOfSuggestions();
bResIsSpellWithDigits = bIsSpellWithDigits;
bResIsSpellCapitalization = bIsSpellCapitalization;
bResIsSpellUpperCase = bIsSpellUpperCase;
@@ -487,7 +484,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
{
if ( pVal[i].Name == UPN_MAX_NUMBER_OF_SUGGESTIONS )
{
- pVal[i].Value >>= nResMaxNumberOfSuggestions;
+ // special value that is not part of the property set and thus needs to be handled differently
}
else
{
commit feddb8cb73db799e89b84ea8fd8c2057fdebca91
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 13:38:17 2017 +0200
maPrimitiveColor in Shadow3DExtractingProcessor unused
since
commit 9927e1ca23c8353c880a3ae0a196caabdf747c4b
Date: Wed Aug 9 16:00:16 2006 +0000
#i39532#
Change-Id: I1db3db2c4860d6ad71085cc3cfdeb202eec7e24a
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index d325257f45e3..0544406ed59b 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -156,7 +156,7 @@ namespace drawinglayer
mpPrimitive2DSequence->push_back(
new primitive2d::PolygonHairlinePrimitive2D(
a2DHairline,
- maPrimitiveColor));
+ basegfx::BColor()));
}
}
break;
@@ -187,7 +187,7 @@ namespace drawinglayer
mpPrimitive2DSequence->push_back(
new primitive2d::PolyPolygonColorPrimitive2D(
a2DFill,
- maPrimitiveColor));
+ basegfx::BColor()));
}
}
break;
@@ -217,7 +217,6 @@ namespace drawinglayer
maShadowPlaneNormal(),
maPlanePoint(),
mfLightPlaneScalar(0.0),
- maPrimitiveColor(),
mbShadowProjectionIsValid(false),
mbConvert(false),
mbUseProjection(false)
diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx
index cf813f7b383e..f3714d0fe54b 100644
--- a/include/drawinglayer/processor3d/shadow3dextractor.hxx
+++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx
@@ -62,11 +62,6 @@ namespace drawinglayer
basegfx::B3DPoint maPlanePoint;
double mfLightPlaneScalar;
- /* the shadow color used for sub-primitives. Can stay at black since
- the encapsulating 2d shadow primitive will contain the color
- */
- basegfx::BColor maPrimitiveColor;
-
/// flag if shadow plane projection preparation leaded to valid results
bool mbShadowProjectionIsValid : 1;
commit 2b5cb7c6b17a15ee0da77df397553f0c80fbaac8
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 13:30:37 2017 +0200
unused m_xAccInfo in AccessibleEditableTextPara
since
commit c23ab5eaed57cc3fb5860e26c591c73c5b22687b
Date: Tue Nov 26 14:25:22 2013 +0000
Integrate branch of IAccessible2
Change-Id: Id068fb0a49f5a1e79ca17fe66885cda558abe275
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 7357d0681f5a..c35a2dc05343 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1481,15 +1481,7 @@ namespace accessibility
sal_uInt32 crChar = static_cast<sal_uInt32>( reinterpret_cast<sal_uIntPtr>(anyChar.pReserved));
if (COL_AUTO == crChar )
{
- uno::Reference< css::accessibility::XAccessibleComponent > xComponent;
- if (mxParent.is())
- {
- xComponent.set(mxParent,uno::UNO_QUERY);
- }
- else
- {
- xComponent.set(m_xAccInfo,uno::UNO_QUERY);
- }
+ uno::Reference< css::accessibility::XAccessibleComponent > xComponent(mxParent,uno::UNO_QUERY);
if (xComponent.is())
{
uno::Reference< css::accessibility::XAccessibleContext > xContext(xComponent,uno::UNO_QUERY);
@@ -1520,15 +1512,7 @@ namespace accessibility
sal_uInt32 crCharUnderLine = static_cast<sal_uInt32>( reinterpret_cast<sal_uIntPtr>( anyCharUnderLine.pReserved));
if (COL_AUTO == crCharUnderLine )
{
- uno::Reference< css::accessibility::XAccessibleComponent > xComponent;
- if (mxParent.is())
- {
- xComponent.set(mxParent,uno::UNO_QUERY);
- }
- else
- {
- xComponent.set(m_xAccInfo,uno::UNO_QUERY);
- }
+ uno::Reference< css::accessibility::XAccessibleComponent > xComponent(mxParent,uno::UNO_QUERY);
if (xComponent.is())
{
uno::Reference< css::accessibility::XAccessibleContext > xContext(xComponent,uno::UNO_QUERY);
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 142634783b2f..d55872e0b634 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -367,8 +367,6 @@ namespace accessibility
/// Our listeners (guarded by maMutex)
int mnNotifierClientId;
private:
- css::uno::Reference< css::accessibility::XAccessible > m_xAccInfo;
-
// Text paragraphs should provide FLOWS_TO and FLOWS_FROM relations (#i27138#)
// the paragraph manager, which created this instance - is NULL, if
// instance isn't created by AccessibleParaManager.
commit b3c77e46e54872ed69e24a7f459b97f8334fcd9c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 13:04:59 2017 +0200
remove unused aLocale from SvxNumRule
and fix usage site, regression from
commit 41956321ceefb5836feb2c119b66de7bb557740f
Date: Sat Nov 24 18:54:09 2012 +0100
get rid of Svx...Locale...() double conversion nonsense
Change-Id: Ic70abf5f52dce1db9cffd9c819e57f1a6c2a3df3
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 2b6a62f1c9a5..24a612f93d4c 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -604,7 +604,6 @@ SvxNumRule::SvxNumRule( SvxNumRuleFlags nFeatures,
SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
{
++nRefCount;
- aLocale = rCopy.aLocale;
nLevelCount = rCopy.nLevelCount ;
nFeatureFlags = rCopy.nFeatureFlags ;
bContinuousNumbering = rCopy.bContinuousNumbering;
@@ -853,7 +852,10 @@ OUString SvxNumRule::MakeNumString( const SvxNodeNum& rNum ) const
if( rNum.GetLevelVal()[ i ] )
{
if(SVX_NUM_BITMAP != rNFmt.GetNumberingType())
- aStr += rNFmt.GetNumStr( rNum.GetLevelVal()[ i ], aLocale );
+ {
+ const LanguageTag& rLang = Application::GetSettings().GetLanguageTag();
+ aStr += rNFmt.GetNumStr( rNum.GetLevelVal()[ i ], rLang.getLocale() );
+ }
else
bDot = false;
}
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 522ebc01eb34..c898e3dc8045 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -248,7 +248,6 @@ class EDITENG_DLLPUBLIC SvxNumRule final
bool aFmtsSet[SVX_MAX_NUM]; // Flags indicating valid levels
static sal_Int32 nRefCount;
- css::lang::Locale aLocale;
public:
SvxNumRule( SvxNumRuleFlags nFeatures,
sal_uInt16 nLevels,
commit fe7032a3da3ec6e2bffd4fbab0810290ac0c8204
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 12:59:01 2017 +0200
unused menu extension supplier stuff
since
commit 5298b1b32d90002be8d09fe82955550c18eae8bc
Date: Mon Aug 8 11:48:55 2011 +0100
callcatcher: ditch some more methods
Change-Id: I123081cbe7fe351ce6613a5e7491b11e133d1d29
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 52d53fcc79fd..5f70d38eb004 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
framework/source/fwe/classes/framelistanalyzer \
framework/source/fwe/classes/fwkresid \
framework/source/fwe/classes/imagewrapper \
- framework/source/fwe/classes/menuextensionsupplier \
framework/source/fwe/classes/rootactiontriggercontainer \
framework/source/fwe/classes/sfxhelperfunctions \
framework/source/fwe/dispatch/interaction \
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index bc782dbeda95..e90e94d2b9c4 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -171,7 +171,6 @@ class MenuBarManager:
};
void RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuShortCuts );
- void CheckAndAddMenuExtension( Menu* pMenu );
static void UpdateSpecialWindowMenu( Menu* pMenu, const css::uno::Reference< css::uno::XComponentContext >& xContext );
static void FillMenuImages( css::uno::Reference< css::frame::XFrame > const & xFrame, Menu* _pMenu, bool bShowMenuImages );
static void impl_RetrieveShortcutsFromConfiguration( const css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg,
diff --git a/framework/source/fwe/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx
deleted file mode 100644
index 438696106e60..000000000000
--- a/framework/source/fwe/classes/menuextensionsupplier.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <framework/menuextensionsupplier.hxx>
-#include <osl/mutex.hxx>
-
-static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = nullptr;
-
-namespace framework
-{
-
-MenuExtensionItem SAL_CALL GetMenuExtension()
-{
- MenuExtensionItem aItem;
-
- pfunc_setMenuExtensionSupplier pLocalMenuExtensionSupplierFunc( nullptr );
-
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- pLocalMenuExtensionSupplierFunc = pMenuExtensionSupplierFunc;
- }
-
- if ( pLocalMenuExtensionSupplierFunc )
- return (*pLocalMenuExtensionSupplierFunc)();
- else
- return aItem;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index a9341aa85c4e..e47217a8faf1 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -24,7 +24,6 @@
#include <framework/addonsoptions.hxx>
#include <classes/fwkresid.hxx>
#include <helper/mischelper.hxx>
-#include <framework/menuextensionsupplier.hxx>
#include <strings.hrc>
#include <services.h>
@@ -585,35 +584,6 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source )
m_xModuleImageManager.clear();
}
-void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
-{
-
- // retrieve menu extension item
- MenuExtensionItem aMenuItem( GetMenuExtension() );
- if (( !aMenuItem.aURL.isEmpty() ) &&
- ( !aMenuItem.aLabel.isEmpty() ))
- {
- // remove all old window list entries from menu
- sal_uInt16 nNewItemId( 0 );
- sal_uInt16 nInsertPos( MENU_APPEND );
- sal_uInt16 nBeforePos( MENU_APPEND );
- for ( sal_uInt16 n = 0; n < pMenu->GetItemCount(); n++ )
- {
- sal_uInt16 nItemId = pMenu->GetItemId( n );
- nNewItemId = std::max( nItemId, nNewItemId );
- if ( pMenu->GetItemCommand( nItemId ) == ".uno:About" )
- nBeforePos = n;
- }
- ++nNewItemId;
-
- if ( nBeforePos != MENU_APPEND )
- nInsertPos = nBeforePos;
-
- pMenu->InsertItem(nNewItemId, aMenuItem.aLabel, MenuItemBits::NONE, OString(), nInsertPos);
- pMenu->SetItemCommand( nNewItemId, aMenuItem.aURL );
- }
-}
-
static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId)
{
if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
@@ -1170,8 +1140,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
// Check if this is the help menu. Add menu item if needed
if ( aItemCommand == aCmdHelpMenu )
{
- // Check if this is the help menu. Add menu item if needed
- CheckAndAddMenuExtension( pPopup );
}
else if ( aItemCommand == aCmdToolsMenu && AddonMenuManager::HasAddonMenuElements() )
{
diff --git a/include/framework/menuextensionsupplier.hxx b/include/framework/menuextensionsupplier.hxx
deleted file mode 100644
index 303de1353ea6..000000000000
--- a/include/framework/menuextensionsupplier.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_MENUEXTENSIONSUPPLIER_HXX
-#define INCLUDED_FRAMEWORK_MENUEXTENSIONSUPPLIER_HXX
-
-#include <rtl/ustring.hxx>
-#include <framework/fwedllapi.h>
-
-struct FWE_DLLPUBLIC MenuExtensionItem
-{
- OUString aLabel;
- OUString aURL;
-};
-
-typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)();
-
-namespace framework
-{
-
-FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension();
-
-}
-
-#endif // INCLUDED_FRAMEWORK_MENUEXTENSIONSUPPLIER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit fc48a4cf465a1ab74e279c2573c7ca68ad3f6fc7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 12:02:12 2017 +0200
msCommandName in ControllerItem is unused
ever since
commit 1c5cae479bebd2d325182adc2c9821fd948fd1bd
Date: Thu Apr 20 08:44:33 2017 +0200
loplugin:unusedmethods
Change-Id: I7c02e8bf0ef377303dedf4e6690fd937f52a3605
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 183a6f900d78..23a94487706e 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -67,7 +67,7 @@ public:
Changes of this state are notified via the
ItemUpdateReceiverInterface::NotifyContextChang() method.
*/
- bool IsEnabled (const SfxItemState eState) const;
+ static bool IsEnabled (const SfxItemState eState);
/** Force the controller item to call its NotifyItemUpdate
callback with up-to-date data.
@@ -81,7 +81,6 @@ protected:
private:
ItemUpdateReceiverInterface& mrItemUpdateReceiver;
css::uno::Reference<css::lang::XComponent> mxFrameActionListener;
- const ::rtl::OUString msCommandName;
};
} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 8e5a90953283..b7925ac2d13c 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -41,8 +41,7 @@ ControllerItem::ControllerItem (
ItemUpdateReceiverInterface& rItemUpdateReceiver)
: SfxControllerItem(nSlotId, rBindings),
mrItemUpdateReceiver(rItemUpdateReceiver),
- mxFrameActionListener(),
- msCommandName()
+ mxFrameActionListener()
{
}
@@ -68,7 +67,7 @@ void ControllerItem::StateChanged (
mrItemUpdateReceiver.NotifyItemUpdate(nSID, eState, pState, IsEnabled(eState));
}
-bool ControllerItem::IsEnabled (SfxItemState eState) const
+bool ControllerItem::IsEnabled (SfxItemState eState)
{
if (eState == SfxItemState::DISABLED)
return false;
@@ -77,19 +76,12 @@ bool ControllerItem::IsEnabled (SfxItemState eState) const
// There are no disabled commands.
return true;
}
- else if (msCommandName.getLength() == 0)
+ else
{
// We were not given a command name at construction and can
// not check the state now. Assume the best and return true.
return true;
}
- else if (SvtCommandOptions().Lookup(SvtCommandOptions::CMDOPTION_DISABLED, msCommandName))
- {
- // The command is part of a list of disabled commands.
- return false;
- }
- else
- return true;
}
void ControllerItem::RequestUpdate()
commit 3c695c5ba0741cd3b1d748f27a4f119d4fa7366c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 10:26:46 2017 +0200
msDescription in SvtRulerAccessible is unused
ever since
commit 2b12a5b87b1de9ae95d9562ba21201890b1100c5
Date: Mon Feb 10 09:29:34 2014 +0000
the return of callcatcher
Change-Id: I62021793e5ca90cba9d2e6998f5ac30da33764f7
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index e8ad0d7f4b42..709a133cb61b 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -182,11 +182,6 @@ protected:
void ThrowExceptionIfNotAlive();
private:
- /** Description of this object. This is not a constant because it can
- be set from the outside.
- */
- ::rtl::OUString msDescription;
-
/** Name of this object.
*/
::rtl::OUString msName;
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index d41128d48fdb..d6ac5437246f 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -181,8 +181,7 @@ sal_Int16 SAL_CALL SvtRulerAccessible::getAccessibleRole()
OUString SAL_CALL SvtRulerAccessible::getAccessibleDescription()
{
- ::osl::MutexGuard aGuard( m_aMutex );
- return msDescription;
+ return OUString();
}
OUString SAL_CALL SvtRulerAccessible::getAccessibleName()
commit e6e619b380880cb0ccba993cedcfb294d7d4527e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 10:24:47 2017 +0200
aFocusRect in CheckBoxControl is unused
ever since
commit ff09f8d6ef2c613037f039dbcafcad6b76243a48
Date: Thu Mar 27 13:40:07 2003 +0000
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Change-Id: I71905a95a86757be59abeee6140ef57516176a6a
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 2e6ca0d7e71e..0e033382bfb4 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -279,7 +279,6 @@ namespace svt
class SVT_DLLPUBLIC CheckBoxControl : public Control
{
VclPtr<CheckBox> pBox;
- tools::Rectangle aFocusRect;
Link<VclPtr<CheckBox>,void> m_aClickLink;
Link<LinkParamNone*,void> m_aModifyLink;
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 41d5d0896145..1f0083646498 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -298,7 +298,7 @@ namespace svt
{
Control::Paint(rRenderContext, rClientRect);
if (HasFocus())
- ShowFocus(aFocusRect);
+ ShowFocus(tools::Rectangle());
}
@@ -307,7 +307,7 @@ namespace svt
switch (rEvt.GetType())
{
case MouseNotifyEvent::GETFOCUS:
- ShowFocus(aFocusRect);
+ ShowFocus(tools::Rectangle());
break;
case MouseNotifyEvent::LOSEFOCUS:
HideFocus();
commit cb315646e2cecd9bc31806064ee285403ba5c46e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 10:22:29 2017 +0200
headString in SvTreeListBox is unused
ever since being added in
commit b755fb8c0f6b1282f62c12f378c0a5ecac64d490
Date: Mon Nov 25 16:15:58 2013 +0000
Integrate branch of IAccessible2
Change-Id: Iebb8d30d53cc08e7cc35d610f04db8ed6c853b70
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index bd996fded674..e9d579ee4b79 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -194,7 +194,7 @@ namespace accessibility
OUString sRet;
SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
- sRet = getListBox()->SearchEntryTextWithHeadTitle( pEntry );
+ sRet = SvTreeListBox::SearchEntryTextWithHeadTitle( pEntry );
return sRet;
}
@@ -459,7 +459,7 @@ namespace accessibility
}
else
{
- return getListBox()->SearchEntryTextWithHeadTitle( pEntry );
+ return SvTreeListBox::SearchEntryTextWithHeadTitle( pEntry );
}
}
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 987a7c85ae19..d9e4feb76cf0 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -515,8 +515,7 @@ public:
SvTreeFlags GetTreeFlags() const {return nTreeFlags;}
- OUString headString;
- OUString SearchEntryTextWithHeadTitle(SvTreeListEntry* pEntry);
+ static OUString SearchEntryTextWithHeadTitle(SvTreeListEntry* pEntry);
virtual OUString GetEntryAltText(SvTreeListEntry* pEntry) const;
virtual OUString GetEntryLongDescription(SvTreeListEntry* pEntry) const;
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 894fa12ef6f4..4c2b8806e47c 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1335,48 +1335,13 @@ OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry )
sal_uInt16 nCount = pEntry->ItemCount();
sal_uInt16 nCur = 0;
- sal_uInt16 nHeaderCur = 0;
while( nCur < nCount )
{
SvLBoxItem& rItem = pEntry->GetItem( nCur );
if ( (rItem.GetType() == SvLBoxItemType::String) &&
!static_cast<SvLBoxString&>( rItem ).GetText().isEmpty() )
{
- //want the column header
- if (!headString.isEmpty())
- {
- sal_Int32 nEnd = headString.indexOf('\t');
- if( nEnd == -1 )
- {
- if (!sRet.isEmpty())
- {
- sRet += ",";
- }
- if (!headString.isEmpty())
- {
- sRet += headString + ":";
- }
- }
- else
- {
- OUString aString=headString.getToken(nHeaderCur, '\t');
- if (!sRet.isEmpty())
- {
- sRet += ",";
- }
- if (!aString.isEmpty())
- {
- sRet += aString + ":";
- }
- nHeaderCur++;
- }
- sRet += static_cast<SvLBoxString&>( rItem ).GetText();
- }
- else
- {
- sRet += static_cast<SvLBoxString&>( rItem ).GetText() + ",";
- }
- //end want to the column header
+ sRet += static_cast<SvLBoxString&>( rItem ).GetText() + ",";
}
nCur++;
}
commit fba231b21b3d2403679e626f7a1b30aefde6879e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 10:17:33 2017 +0200
loplugin:unusedfields in SvxPixelCtl
aLineColor is unused since
commit fa1807ad5457d10f8fa073c209a27547e8922c8c
Date: Thu Aug 27 21:18:58 2015 +0300
tdf#93558 Hardcode black text on white background
Change-Id: Idadfa926808568195256c7ea7ac92d71533fe9a9
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 612548934266..0f2bc33f0e18 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -153,7 +153,6 @@ protected:
sal_uInt16 nLines, nSquares;
Color aPixelColor;
Color aBackgroundColor;
- Color aLineColor;
Size aRectSize;
sal_uInt16* pPixel;
bool bPaintable;
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 8dfad90aaae1..e031b940a0b8 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -806,7 +806,7 @@ void SvxPixelCtl::Paint( vcl::RenderContext& rRenderContext, const tools::Rectan
if (bPaintable)
{
// Draw lines
- rRenderContext.SetLineColor(aLineColor);
+ rRenderContext.SetLineColor(Color());
for (i = 1; i < nLines; i++)
{
// horizontal
commit f1dda661333727591d7e616700e829b5e3aa6339
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 18 10:15:02 2017 +0200
loplugin:unusedfields in ResultSetColumnData
ever since introduction in
commit 24f26145eb03b2fe8e0099309d7e6fa1a0061ef4
Date: Thu Jan 18 08:03:55 2001 +0000
"#82177# - Added support for additional column data ( case-
sensitivity, ... )"
Change-Id: I593f7e2a3be7b6445c7975ff385b6ba0d35183b9
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 8474cf100433..e6f55d70c750 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -57,24 +57,6 @@ struct ResultSetColumnData
/** @see ResultSetMetaData::getColumnDisplaySize */
sal_Int32 columnDisplaySize;
- /** @see ResultSetMetaData::getColumnLabel */
- OUString columnLabel;
-
- /** @see ResultSetMetaData::getSchemaName */
- OUString schemaName;
-
- /** @see ResultSetMetaData::getTableName */
- OUString tableName;
-
- /** @see ResultSetMetaData::getCatalogName */
- OUString catalogName;
-
- /** @see ResultSetMetaData::getColumnTypeName */
- OUString columnTypeName;
-
- /** @see ResultSetMetaData::getColumnServiceName */
- OUString columnServiceName;
-
inline ResultSetColumnData();
};
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 1c572a1fe7c8..a118a8e6f768 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -219,10 +219,6 @@ OUString SAL_CALL ResultSetMetaData::getColumnLabel( sal_Int32 column )
if ( ( column < 1 ) || ( column > m_aProps.getLength() ) )
return OUString();
- OUString aLabel = m_pImpl->m_aColumnData[ column - 1 ].columnLabel;
- if ( !aLabel.isEmpty() )
- return aLabel;
-
return m_aProps.getConstArray()[ column - 1 ].Name;
}
@@ -242,7 +238,7 @@ OUString SAL_CALL ResultSetMetaData::getColumnName( sal_Int32 column )
// virtual
-OUString SAL_CALL ResultSetMetaData::getSchemaName( sal_Int32 column )
+OUString SAL_CALL ResultSetMetaData::getSchemaName( sal_Int32 /*column*/ )
{
/*
Gets the schema name for the table from which column of this
@@ -250,11 +246,7 @@ OUString SAL_CALL ResultSetMetaData::getSchemaName( sal_Int32 column )
Because this feature is not widely supported, the return value
for many DBMSs will be an empty string.
*/
-
- if ( ( column < 1 ) || ( column > m_aProps.getLength() ) )
- return OUString();
-
- return m_pImpl->m_aColumnData[ column - 1 ].schemaName;
+ return OUString();
}
@@ -273,7 +265,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getScale( sal_Int32 /*column*/ )
// virtual
-OUString SAL_CALL ResultSetMetaData::getTableName( sal_Int32 column )
+OUString SAL_CALL ResultSetMetaData::getTableName( sal_Int32 /*column*/ )
{
/*
Gets the name of the table from which column of this result set
@@ -281,16 +273,12 @@ OUString SAL_CALL ResultSetMetaData::getTableName( sal_Int32 column )
Because this feature is not widely supported, the return value
for many DBMSs will be an empty string.
*/
-
- if ( ( column < 1 ) || ( column > m_aProps.getLength() ) )
- return OUString();
-
- return m_pImpl->m_aColumnData[ column - 1 ].tableName;
+ return OUString();
}
// virtual
-OUString SAL_CALL ResultSetMetaData::getCatalogName( sal_Int32 column )
+OUString SAL_CALL ResultSetMetaData::getCatalogName( sal_Int32 /*column*/ )
{
/*
Gets the catalog name for the table from which column of this
@@ -298,11 +286,7 @@ OUString SAL_CALL ResultSetMetaData::getCatalogName( sal_Int32 column )
Because this feature is not widely supported, the return value
for many DBMSs will be an empty string.
*/
-
- if ( ( column < 1 ) || ( column > m_aProps.getLength() ) )
- return OUString();
-
- return m_pImpl->m_aColumnData[ column - 1 ].catalogName;
+ return OUString();
}
@@ -414,7 +398,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
// virtual
-OUString SAL_CALL ResultSetMetaData::getColumnTypeName( sal_Int32 column )
+OUString SAL_CALL ResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ )
{
/*
Gets the type name used by this particular data source for the
@@ -422,11 +406,7 @@ OUString SAL_CALL ResultSetMetaData::getColumnTypeName( sal_Int32 column )
stored in column is STRUCT, DISTINCT or JAVA_OBJECT, this method
returns a fully-qualified SQL type name.
*/
-
- if ( ( column < 1 ) || ( column > m_aProps.getLength() ) )
- return OUString();
-
- return m_pImpl->m_aColumnData[ column - 1 ].columnTypeName;
+ return OUString();
}
@@ -452,18 +432,14 @@ sal_Bool SAL_CALL ResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/
// virtual
-OUString SAL_CALL ResultSetMetaData::getColumnServiceName( sal_Int32 column )
+OUString SAL_CALL ResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ )
{
/*
Returns the fully-qualified name of the service whose instances
are manufactured if XResultSet::getObject is called to retrieve
a value from the column.
*/
-
- if ( ( column < 1 ) || ( column > m_aProps.getLength() ) )
- return OUString();
-
- return m_pImpl->m_aColumnData[ column - 1 ].columnServiceName;
+ return OUString();
}
} // namespace ucbhelper
More information about the Libreoffice-commits
mailing list