[Libreoffice-commits] core.git: 6 commits - cui/source include/editeng include/sfx2 include/svl include/svx include/test sfx2/source
Thomas Arnhold
thomas at arnhold.org
Sun Jun 30 04:23:20 PDT 2013
cui/source/inc/macroass.hxx | 6 ---
include/editeng/eeitemid.hxx | 1
include/sfx2/evntconf.hxx | 6 ---
include/sfx2/macropg.hxx | 10 -----
include/sfx2/thumbnailview.hxx | 8 ++--
include/svl/macitem.hxx | 2 -
include/svl/xmlement.hxx | 34 -------------------
include/svx/xftsfit.hxx | 48 ----------------------------
include/test/sheet/tableautoformatfield.hxx | 2 -
sfx2/source/control/thumbnailview.cxx | 2 -
10 files changed, 7 insertions(+), 112 deletions(-)
New commits:
commit fc98acd38c3ab26c1e0d3d72556123cc40522bff
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jun 30 13:09:49 2013 +0200
remove unused and non-working methods
cui/source/inc/macroass.hxx and include/sfx2/macropg.hxx seem to be duplicates
Change-Id: I7df15a2ac97aff92449d40045c55de811bd701f2
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 72ccce6..e2fc52a 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -63,7 +63,6 @@ public:
const SvxMacroTableDtor& GetMacroTbl() const;
void SetMacroTbl( const SvxMacroTableDtor& rTbl );
- void ClearMacroTbl();
virtual void ScriptChanged();
virtual void PageCreated (SfxAllItemSet aSet);
@@ -88,11 +87,6 @@ inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
aTbl = rTbl;
}
-inline void _SfxMacroTabPage::ClearMacroTbl()
-{
- aTbl.clear();
-}
-
class SfxMacroTabPage : public _SfxMacroTabPage
{
public:
diff --git a/include/sfx2/macropg.hxx b/include/sfx2/macropg.hxx
index 1a6c871..3ac5ad8 100644
--- a/include/sfx2/macropg.hxx
+++ b/include/sfx2/macropg.hxx
@@ -72,14 +72,9 @@ public:
const SvxMacroTableDtor& GetMacroTbl() const;
void SetMacroTbl( const SvxMacroTableDtor& rTbl );
- void ClearMacroTbl();
virtual void ScriptChanged( const String& rLanguage );
- // zum setzen / abfragen der Links
- void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
- FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const;
-
// --------- Erben aus der Basis -------------
virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
@@ -99,11 +94,6 @@ inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
aTbl = rTbl;
}
-inline void _SfxMacroTabPage::ClearMacroTbl()
-{
- aTbl.DelDtor();
-}
-
class SFX2_DLLPUBLIC SfxMacroTabPage : public _SfxMacroTabPage
{
public:
commit f8c0e13ba28172b8c61ea2a5085f1abf46a33936
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jun 30 12:55:40 2013 +0200
Rename ValueItemList to ThumbnailValueItemList
The more common definition comes from svtools/valueset.hxx.
Make the difference clear.
Change-Id: I79b09f31007a4c00860fa97d8517a2b1f6aadeea
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index abff5f5..dbbe57d 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -26,7 +26,7 @@ class HelpEvent;
class KeyEvent;
class DataChangedEvent;
class ScrollBar;
-typedef ::std::vector< ThumbnailViewItem* > ValueItemList;
+typedef ::std::vector< ThumbnailViewItem* > ThumbnailValueItemList;
struct ThumbnailItemAttributes;
class ThumbnailViewAcc;
@@ -299,9 +299,9 @@ protected:
protected:
- ValueItemList mItemList;
- ValueItemList mFilteredItemList; ///< Cache to store the filtered items
- ValueItemList::iterator mpStartSelRange;
+ ThumbnailValueItemList mItemList;
+ ThumbnailValueItemList mFilteredItemList; ///< Cache to store the filtered items
+ ThumbnailValueItemList::iterator mpStartSelRange;
ScrollBar* mpScrBar;
Rectangle maItemListRect;
long mnHeaderHeight;
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index ca75d10..cfefc1f 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -993,7 +993,7 @@ void ThumbnailView::RemoveItem( sal_uInt16 nItemId )
}
// delete item from the filter item list
- ValueItemList::iterator it = mFilteredItemList.begin();
+ ThumbnailValueItemList::iterator it = mFilteredItemList.begin();
::std::advance( it, nPos );
if ((*it)->isSelected())
commit 6ddfb81c0793cb067b5d8c3b434b2500bac379d1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jun 30 12:54:40 2013 +0200
add missing css prefix to header
Change-Id: I4c3311061150f2fd6c703566f064df8263caaa09
diff --git a/include/test/sheet/tableautoformatfield.hxx b/include/test/sheet/tableautoformatfield.hxx
index a42f5b9..3b15248 100644
--- a/include/test/sheet/tableautoformatfield.hxx
+++ b/include/test/sheet/tableautoformatfield.hxx
@@ -15,7 +15,7 @@ class TableAutoFormatField
{
public:
//don't use virtual init() here
- css::uno::Reference< beans::XPropertySet > initTest();
+ css::uno::Reference< css::beans::XPropertySet > initTest();
virtual css::uno::Reference< > getServiceFactory() = 0;
commit d930a807aaec3bf8ea5ebe377a4a1fe7a7155022
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jun 30 12:49:02 2013 +0200
remove unused ITEMID_MACRO
Change-Id: I11e94d406daa8e834253c9d3c44ec4e52c2418e1
diff --git a/include/editeng/eeitemid.hxx b/include/editeng/eeitemid.hxx
index 8230387..80da17e 100644
--- a/include/editeng/eeitemid.hxx
+++ b/include/editeng/eeitemid.hxx
@@ -115,7 +115,6 @@
#define ITEMID_PROTECT 0
#define ITEMID_BACKGROUND 0
#define ITEMID_SHADOW 0
-#define ITEMID_MACRO 0
#define ITEMID_BOX 0
#define ITEMID_BOXINFO 0
#define ITEMID_BRUSH 0
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 2f181ad..bf8fd6b 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -25,14 +25,8 @@
#include <tools/rtti.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
-
#include <sfx2/event.hxx>
-
#include <sfx2/sfxsids.hrc>
-#ifdef ITEMID_MACRO
-#undef ITEMID_MACRO
-#endif
-#define ITEMID_MACRO SID_ATTR_MACROITEM
#include <svl/macitem.hxx>
#include <vector>
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 9d73f6a..10f6357 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -160,7 +160,7 @@ class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem
public:
TYPEINFO();
- explicit inline SvxMacroItem ( const sal_uInt16 nId /*= ITEMID_MACRO*/ );
+ explicit inline SvxMacroItem ( const sal_uInt16 nId );
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
commit bb5196b40cc5f8f2d4f221e61a20d572ce504558
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jun 30 12:45:57 2013 +0200
remove bogus header svl/xmlement.hxx
This one is unused. The right choice is xmloff/xmlement.hxx
Change-Id: I8bbbcfd0a45f28a309bd22ac2b819fab2e2b2793
diff --git a/include/svl/xmlement.hxx b/include/svl/xmlement.hxx
deleted file mode 100644
index c6b67d5..0000000
--- a/include/svl/xmlement.hxx
+++ /dev/null
@@ -1,34 +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 _SVTOOLS_XMLEMENT_HXX
-#define _SVTOOLS_XMLEMENT_HXX
-
-#include <sal/types.h>
-
-struct SvXMLEnumMapEntry
-{
- const sal_Char *pName;
- sal_uInt16 nValue;
-};
-
-
-#endif // _SVTOOLS_XMLEMENT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c9145615570515c6cecb3cfc843b9ab72821977b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jun 30 12:23:54 2013 +0200
remove unused header xftsfit.hxx
Change-Id: Ia669845468a5f089864e4d08744871c9c05de61c
diff --git a/include/svx/xftsfit.hxx b/include/svx/xftsfit.hxx
deleted file mode 100644
index ca4bd2b..0000000
--- a/include/svx/xftsfit.hxx
+++ /dev/null
@@ -1,48 +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 _SVX_XFTSFIT_HXX
-#define _SVX_XFTSFIT_HXX
-
-#include "svx/svxdllapi.h"
-
-/*************************************************************************
-|*
-|* FormText-StdFormItem
-|*
-\************************************************************************/
-
-class SVX_DLLPUBLIC XFormTextStdFormItem : public SfxEnumItem
-{
-public:
- TYPEINFO();
- XFormTextStdFormItem(XFormTextStdForm = XFTFORM_NONE);
- XFormTextStdFormItem(SvStream& rIn);
- virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- virtual sal_uInt16 GetValueCount() const;
- XFormTextStdForm GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); }
- // #FontWork#
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list