[Libreoffice-commits] core.git: 2 commits - cui/source include/svtools odk/GeneratedPackage_odk_javadoc.mk odk/Module_odk.mk odk/Package_javadoc.mk svtools/source sw/source
Stephan Bergmann
sbergman at redhat.com
Tue Feb 25 06:51:46 PST 2014
cui/source/inc/cfgutil.hxx | 1
cui/source/inc/selector.hxx | 1
include/svtools/treelist.hxx | 18 ++--
include/svtools/treelistbox.hxx | 3
odk/GeneratedPackage_odk_javadoc.mk | 16 +++
odk/Module_odk.mk | 2
odk/Package_javadoc.mk | 146 ----------------------------------
svtools/source/contnr/treelistbox.cxx | 10 +-
sw/source/ui/inc/conttree.hxx | 3
9 files changed, 31 insertions(+), 169 deletions(-)
New commits:
commit 199705b37b129c7e215ea9a5288f9cefbb55a81a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Feb 25 15:48:53 2014 +0100
Clean up confusing name clashes of non-virtual SvListView member functions
...Expand/Collapse/Select with virtual functions of the same names in derived
classes.
Change-Id: Id2c7e434cc972ac8a789c60ceaf54dc76246be12
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 2325aaa..7dd355e 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -161,7 +161,6 @@ class SfxConfigGroupListBox : public SvTreeListBox
protected:
virtual void RequestingChildren( SvTreeListEntry *pEntry);
- using SvListView::Expand;
virtual sal_Bool Expand( SvTreeListEntry* pParent );
public:
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index fc10f54..5c1c604 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -158,7 +158,6 @@ private:
protected:
virtual void RequestingChildren( SvTreeListEntry *pEntry);
virtual sal_Bool Expand( SvTreeListEntry* pParent );
- using SvListView::Expand;
public:
SvxConfigGroupListBox(Window* pParent, WinBits nStyle);
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 4d0264f..049224d 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -254,6 +254,15 @@ class SVT_DLLPUBLIC SvListView
protected:
SvTreeList* pModel;
+ void ExpandListEntry( SvTreeListEntry* pParent )
+ { pModel->Expand((SvListView*)this,pParent); }
+
+ void CollapseListEntry( SvTreeListEntry* pParent )
+ { pModel->Collapse((SvListView*)this,pParent); }
+
+ sal_Bool SelectListEntry( SvTreeListEntry* pEntry, sal_Bool bSelect )
+ { return pModel->Select((SvListView*)this,pEntry,bSelect); }
+
public:
SvListView(); // Sets the Model to 0
virtual ~SvListView();
@@ -319,15 +328,6 @@ public:
sal_uLong GetChildSelectionCount( SvTreeListEntry* pParent ) const
{ return pModel->GetChildSelectionCount((SvListView*)this,pParent); }
- void Expand( SvTreeListEntry* pParent )
- { pModel->Expand((SvListView*)this,pParent); }
-
- void Collapse( SvTreeListEntry* pParent )
- { pModel->Collapse((SvListView*)this,pParent); }
-
- sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True )
- { return pModel->Select((SvListView*)this,pEntry,bSelect); }
-
// Does not call the Select Handler
virtual void SelectAll( sal_Bool bSelect, sal_Bool )
{ pModel->SelectAll((SvListView*)this, bSelect); }
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index cc0d827..a5877d0 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -524,9 +524,6 @@ public:
virtual bool set_property(const OString &rKey, const OString &rValue);
protected:
- using SvListView::Expand;
- using SvListView::Collapse;
- using SvListView::Select;
using SvListView::SelectAll;
SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize);
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 9408012..d194ebe 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2499,7 +2499,7 @@ sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent )
if( ExpandingHdl() )
{
bExpanded = sal_True;
- SvListView::Expand( pParent );
+ ExpandListEntry( pParent );
pImp->EntryExpanded( pParent );
pHdlEntry = pParent;
ExpandedHdl();
@@ -2537,7 +2537,7 @@ sal_Bool SvTreeListBox::Collapse( SvTreeListEntry* pParent )
{
bCollapsed = sal_True;
pImp->CollapsingEntry( pParent );
- SvListView::Collapse( pParent );
+ CollapseListEntry( pParent );
pImp->EntryCollapsed( pParent );
pHdlEntry = pParent;
ExpandedHdl();
@@ -2556,7 +2556,7 @@ sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"Select: Null-Ptr");
- sal_Bool bRetVal = SvListView::Select( pEntry, bSelect );
+ sal_Bool bRetVal = SelectListEntry( pEntry, bSelect );
DBG_ASSERT(IsSelected(pEntry)==bSelect,"Select failed");
if( bRetVal )
{
@@ -2819,9 +2819,9 @@ void SvTreeListBox::EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem,
if( IsSelected( pEntry ))
{
pImp->ShowCursor( false );
- SvListView::Select( pEntry, sal_False );
+ SelectListEntry( pEntry, sal_False );
PaintEntry( pEntry );
- SvListView::Select( pEntry, sal_True );
+ SelectListEntry( pEntry, sal_True );
pImp->ShowCursor( true );
}
pEdEntry = pEntry;
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index 3029f69..254f13c 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -98,9 +98,6 @@ class SwContentTree : public SvTreeListBox
using SvTreeListBox::ExecuteDrop;
using SvTreeListBox::EditEntry;
- using SvListView::Expand;
- using SvListView::Collapse;
- using SvListView::Select;
protected:
virtual void RequestHelp( const HelpEvent& rHEvt );
commit a59e5ecd611ddd41cec6d9c78773f55887df67e6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Feb 25 15:44:16 2014 +0100
Change SDK javaodc from static Package to dynamic GeneratedPackage
...as e.g. the list of resrouces/*.gif apparently varies per javadoc version.
Change-Id: Idcf95229295c1c5cd16e565bcd168c1a0e7d4f0c
diff --git a/odk/GeneratedPackage_odk_javadoc.mk b/odk/GeneratedPackage_odk_javadoc.mk
new file mode 100644
index 0000000..569377b
--- /dev/null
+++ b/odk/GeneratedPackage_odk_javadoc.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_javadoc,$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)))
+
+$(eval $(call gb_GeneratedPackage_add_dir,odk_javadoc,$(INSTDIR)/$(SDKDIRNAME)/docs/java/ref,.))
+
+$(eval $(call gb_GeneratedPackage_use_customtarget,odk_javadoc,odk/docs/java/ref))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 9ddc400..32bdfc1 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -44,9 +44,9 @@ $(eval $(call gb_Module_add_targets,odk,\
$(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
CustomTarget_classes \
CustomTarget_javadoc \
+ GeneratedPackage_odk_javadoc \
GeneratedPackage_uno_loader_classes \
$(if $(filter WNT,$(OS)),Library_unowinreg) \
- Package_javadoc \
Package_unowinreg \
))
endif
diff --git a/odk/Package_javadoc.mk b/odk/Package_javadoc.mk
deleted file mode 100644
index 5f0ea44..0000000
--- a/odk/Package_javadoc.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Package_Package,odk_javadoc,$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)))
-
-$(eval $(call gb_Package_set_outdir,odk_javadoc,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(SDKDIRNAME)/docs/java/ref,\
- allclasses-frame.html \
- allclasses-noframe.html \
- com/sun/star/comp/helper/Bootstrap.html \
- com/sun/star/comp/helper/BootstrapException.html \
- com/sun/star/comp/helper/ComponentContext.html \
- com/sun/star/comp/helper/ComponentContextEntry.html \
- com/sun/star/comp/helper/SharedLibraryLoader.html \
- com/sun/star/comp/helper/class-use/Bootstrap.html \
- com/sun/star/comp/helper/class-use/BootstrapException.html \
- com/sun/star/comp/helper/class-use/ComponentContext.html \
- com/sun/star/comp/helper/class-use/ComponentContextEntry.html \
- com/sun/star/comp/helper/class-use/SharedLibraryLoader.html \
- com/sun/star/comp/helper/package-frame.html \
- com/sun/star/comp/helper/package-summary.html \
- com/sun/star/comp/helper/package-tree.html \
- com/sun/star/comp/helper/package-use.html \
- com/sun/star/lib/uno/helper/ComponentBase.html \
- com/sun/star/lib/uno/helper/Factory.html \
- com/sun/star/lib/uno/helper/InterfaceContainer.html \
- com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.html \
- com/sun/star/lib/uno/helper/PropertySet.html \
- com/sun/star/lib/uno/helper/PropertySetMixin.BoundListeners.html \
- com/sun/star/lib/uno/helper/PropertySetMixin.html \
- com/sun/star/lib/uno/helper/UnoUrl.html \
- com/sun/star/lib/uno/helper/WeakAdapter.html \
- com/sun/star/lib/uno/helper/WeakBase.html \
- com/sun/star/lib/uno/helper/class-use/ComponentBase.html \
- com/sun/star/lib/uno/helper/class-use/Factory.html \
- com/sun/star/lib/uno/helper/class-use/InterfaceContainer.html \
- com/sun/star/lib/uno/helper/class-use/MultiTypeInterfaceContainer.html \
- com/sun/star/lib/uno/helper/class-use/PropertySet.html \
- com/sun/star/lib/uno/helper/class-use/PropertySetMixin.BoundListeners.html \
- com/sun/star/lib/uno/helper/class-use/PropertySetMixin.html \
- com/sun/star/lib/uno/helper/class-use/UnoUrl.html \
- com/sun/star/lib/uno/helper/class-use/WeakAdapter.html \
- com/sun/star/lib/uno/helper/class-use/WeakBase.html \
- com/sun/star/lib/uno/helper/package-frame.html \
- com/sun/star/lib/uno/helper/package-summary.html \
- com/sun/star/lib/uno/helper/package-tree.html \
- com/sun/star/lib/uno/helper/package-use.html \
- com/sun/star/lib/unoloader/UnoClassLoader.html \
- com/sun/star/lib/unoloader/UnoLoader.html \
- com/sun/star/lib/unoloader/class-use/UnoClassLoader.html \
- com/sun/star/lib/unoloader/class-use/UnoLoader.html \
- com/sun/star/lib/unoloader/package-frame.html \
- com/sun/star/lib/unoloader/package-summary.html \
- com/sun/star/lib/unoloader/package-tree.html \
- com/sun/star/lib/unoloader/package-use.html \
- com/sun/star/lib/util/UrlToFileMapper.html \
- com/sun/star/lib/util/class-use/UrlToFileMapper.html \
- com/sun/star/lib/util/package-frame.html \
- com/sun/star/lib/util/package-summary.html \
- com/sun/star/lib/util/package-tree.html \
- com/sun/star/lib/util/package-use.html \
- com/sun/star/uno/Any.html \
- com/sun/star/uno/AnyConverter.html \
- com/sun/star/uno/Ascii.html \
- com/sun/star/uno/AsciiString.html \
- com/sun/star/uno/Enum.html \
- com/sun/star/uno/IBridge.html \
- com/sun/star/uno/IEnvironment.html \
- com/sun/star/uno/IFieldDescription.html \
- com/sun/star/uno/IMapping.html \
- com/sun/star/uno/IMemberDescription.html \
- com/sun/star/uno/IMethodDescription.html \
- com/sun/star/uno/IQueryInterface.html \
- com/sun/star/uno/ITypeDescription.html \
- com/sun/star/uno/MappingException.html \
- com/sun/star/uno/Type.html \
- com/sun/star/uno/Union.html \
- com/sun/star/uno/UnoRuntime.html \
- com/sun/star/uno/WeakReference.html \
- com/sun/star/uno/class-use/Any.html \
- com/sun/star/uno/class-use/AnyConverter.html \
- com/sun/star/uno/class-use/Ascii.html \
- com/sun/star/uno/class-use/AsciiString.html \
- com/sun/star/uno/class-use/Enum.html \
- com/sun/star/uno/class-use/IBridge.html \
- com/sun/star/uno/class-use/IEnvironment.html \
- com/sun/star/uno/class-use/IFieldDescription.html \
- com/sun/star/uno/class-use/IMapping.html \
- com/sun/star/uno/class-use/IMemberDescription.html \
- com/sun/star/uno/class-use/IMethodDescription.html \
- com/sun/star/uno/class-use/IQueryInterface.html \
- com/sun/star/uno/class-use/ITypeDescription.html \
- com/sun/star/uno/class-use/MappingException.html \
- com/sun/star/uno/class-use/Type.html \
- com/sun/star/uno/class-use/Union.html \
- com/sun/star/uno/class-use/UnoRuntime.html \
- com/sun/star/uno/class-use/WeakReference.html \
- com/sun/star/uno/package-frame.html \
- com/sun/star/uno/package-summary.html \
- com/sun/star/uno/package-tree.html \
- com/sun/star/uno/package-use.html \
- constant-values.html \
- deprecated-list.html \
- help-doc.html \
- index-files/index-1.html \
- index-files/index-10.html \
- index-files/index-11.html \
- index-files/index-12.html \
- index-files/index-13.html \
- index-files/index-14.html \
- index-files/index-15.html \
- index-files/index-16.html \
- index-files/index-17.html \
- index-files/index-18.html \
- index-files/index-19.html \
- index-files/index-2.html \
- index-files/index-20.html \
- index-files/index-21.html \
- index-files/index-3.html \
- index-files/index-4.html \
- index-files/index-5.html \
- index-files/index-6.html \
- index-files/index-7.html \
- index-files/index-8.html \
- index-files/index-9.html \
- index.html \
- overview-frame.html \
- overview-summary.html \
- overview-tree.html \
- package-list \
- resources/background.gif \
- resources/tab.gif \
- resources/titlebar.gif \
- resources/titlebar_end.gif \
- serialized-form.html \
- stylesheet.css \
-))
-
-# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list