summaryrefslogtreecommitdiff
path: root/svx/inc/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/inc/svx')
-rw-r--r--svx/inc/svx/msvbahelper.hxx58
-rw-r--r--svx/inc/svx/numitem.hxx30
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx5
-rw-r--r--svx/inc/svx/selectioncontroller.hxx11
-rw-r--r--svx/inc/svx/svdedxv.hxx17
5 files changed, 97 insertions, 24 deletions
diff --git a/svx/inc/svx/msvbahelper.hxx b/svx/inc/svx/msvbahelper.hxx
new file mode 100644
index 000000000000..b1db44237fa6
--- /dev/null
+++ b/svx/inc/svx/msvbahelper.hxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile:
+ * $Revision:
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _MSVBAHELPER_HXX
+#define _MSVBAHELPER_HXX
+
+#include <sfx2/objsh.hxx>
+#include "svx/svxdllapi.h"
+
+namespace ooo { namespace vba
+{
+ class SVX_DLLPUBLIC VBAMacroResolvedInfo
+ {
+ SfxObjectShell* mpDocContext;
+ bool mbFound;
+ String msResolvedMacro;
+ public:
+ VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){}
+ void SetResolved( bool bRes ) { mbFound = bRes; }
+ bool IsResolved() { return mbFound; }
+ void SetMacroDocContext(SfxObjectShell* pShell ) { mpDocContext = pShell; }
+ SfxObjectShell* MacroDocContext() { return mpDocContext; }
+ String ResolvedMacro() { return msResolvedMacro; }
+ void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
+ };
+
+ SVX_DLLPUBLIC String makeMacroURL( const String& sMacroName );
+ SVX_DLLPUBLIC VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
+ SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
+} }
+
+#endif
diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx
index 17eb3d62630c..9840ec1688ac 100644
--- a/svx/inc/svx/numitem.hxx
+++ b/svx/inc/svx/numitem.hxx
@@ -76,12 +76,6 @@ namespace com{namespace sun{ namespace star{
#define SVX_NO_NUM 200 // Markierung fuer keine Numerierung
#define SVX_NO_NUMLEVEL 0x20
-// --> OD 2008-01-10 #newlistlevelattrs# - no longer used
-//#define NUMITEM_VERSION_01 0x01
-//#define NUMITEM_VERSION_02 0x02
-//#define NUMITEM_VERSION_03 0x03
-// <--
-
#define LINK_TOKEN 0x80 //indicate linked bitmaps - for use in dialog only
class SVX_DLLPUBLIC SvxNumberType
{
@@ -191,14 +185,10 @@ public:
SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
// <--
SvxNumberFormat(const SvxNumberFormat& rFormat);
- // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-// SvxNumberFormat(SvStream &rStream);
- // <--
+ SvxNumberFormat(SvStream &rStream);
virtual ~SvxNumberFormat();
- // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-// SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter);
- // <--
+ SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter);
SvxNumberFormat& operator=( const SvxNumberFormat& );
BOOL operator==( const SvxNumberFormat& ) const;
@@ -304,9 +294,7 @@ public:
= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
// <--
SvxNumRule(const SvxNumRule& rCopy);
- // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-// SvxNumRule(SvStream &rStream);
- // <--
+ SvxNumRule(SvStream &rStream);
virtual ~SvxNumRule();
int operator==( const SvxNumRule& ) const;
@@ -314,9 +302,7 @@ public:
SvxNumRule& operator=( const SvxNumRule& );
- // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-// SvStream& Store(SvStream &rStream);
- // <--
+ SvStream& Store(SvStream &rStream);
const SvxNumberFormat* Get(USHORT nLevel)const;
const SvxNumberFormat& GetLevel(USHORT nLevel)const;
@@ -354,11 +340,9 @@ public:
virtual ~SvxNumBulletItem();
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-// virtual SfxPoolItem* Create(SvStream &, USHORT) const;
-// virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
-// virtual USHORT GetVersion( USHORT nFileVersion ) const;
- // <--
+ virtual SfxPoolItem* Create(SvStream &, USHORT) const;
+ USHORT GetVersion( USHORT nFileVersion ) const;
+ virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
virtual int operator==( const SfxPoolItem& ) const;
SvxNumRule* GetNumRule() const {return pNumRule;}
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index 87a1de55ec0a..f6cc2abf32f6 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -105,8 +105,11 @@ namespace sdr { namespace contact {
// support for Primitive2D
virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
+ // visibility check
+ virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const;
+
private:
- ViewObjectContactOfUnoControl(); // never implemented
+ ViewObjectContactOfUnoControl(); // never implemented
ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& ); // never implemented
ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ); // never implemented
};
diff --git a/svx/inc/svx/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx
index 5cf8c294a1bb..b9c04b54c0dc 100644
--- a/svx/inc/svx/selectioncontroller.hxx
+++ b/svx/inc/svx/selectioncontroller.hxx
@@ -33,6 +33,8 @@
#include "svx/svxdllapi.h"
+#include <boost/shared_ptr.hpp>
+
#include <cppuhelper/weak.hxx>
class KeyEvent;
@@ -70,6 +72,15 @@ public:
virtual bool GetMarkedObjModel( SdrPage* pNewPage );
virtual bool PasteObjModel( const SdrModel& rModel );
+
+ /** returns a format paint brush set from the current selection */
+ virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet );
+
+ /** applies a format paint brush set from the current selection.
+ if bNoCharacterFormats is true, no character attributes are changed.
+ if bNoParagraphFormats is true, no paragraph attributes are changed.
+ */
+ virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats );
};
}
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index 17333ad74459..293e50896044 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -41,6 +41,8 @@
// Vorausdeklarationen
//************************************************************
+#include <boost/shared_ptr.hpp>
+
class SdrOutliner;
class OutlinerView;
class EditStatus;
@@ -282,6 +284,21 @@ public:
rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; }
+ /** returns true if the shape identified by its inventor and identifier supports format paint brush operation */
+ virtual bool SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const;
+
+ /** returns a format paint brush set from the current selection */
+ virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet );
+
+ /** applies a format paint brush set from the current selection.
+ if bNoCharacterFormats is true, no character attributes are changed.
+ if bNoParagraphFormats is true, no paragraph attributes are changed.
+ */
+ virtual void ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats );
+
+ /** helper function for selections with multiple SdrText for one SdrTextObj (f.e. tables ) */
+ void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats );
+
protected:
virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos );
virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos );
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-05 18:31:37 +0000