diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-11-09 00:38:08 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2014-11-09 07:42:26 +0200 |
| commit | 853e9c00a359b93c546e2e8a5fcee9e8aebf49b8 (patch) | |
| tree | 4b536ec37d9161099595285596407b53ca28c276 /include | |
| parent | 261f84a08d8631d70c62d849cd11b21bc9d1f106 (diff) | |
fdo#85804 Use the new popups in the sidebar too
Change-Id: Ib4767eeef1dc6c404bb36068f806c42ccc1086b6
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/dialogs.hrc | 7 | ||||
| -rw-r--r-- | include/svx/sidebar/ValueSetWithTextControl.hxx | 55 |
2 files changed, 2 insertions, 60 deletions
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index b8755e601f5c..067298f294c8 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -26,7 +26,7 @@ // Resource-Id's ------------------------------------------------------------ // !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!! (not for RIDs for Strings - they have there own) -#define RID_SVX_FIRSTFREE 333 +#define RID_SVX_FIRSTFREE 330 // some strings also used in CUI #define RID_SVXERRCTX (RID_SVX_START + 351) @@ -216,10 +216,7 @@ #define RID_SIDEBAR_EMPTY_PANEL (RID_SVX_START + 327) #define RID_SIDEBAR_PARA_PANEL (RID_SVX_START + 328) -#define RID_POPUPPANEL_PARAPAGE_BULLETS (RID_SVX_START + 329) -#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 330) - -#define RID_SIDEBAR_INSERT_PANEL (RID_SVX_START + 331) +#define RID_SIDEBAR_INSERT_PANEL (RID_SVX_START + 329) // !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above) diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index 4cb6fbd9c5bc..33054ead6feb 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -23,26 +23,10 @@ #include <svtools/valueset.hxx> #include <limits.h> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/lang/Locale.hpp> - #include <vcl/image.hxx> #include <vector> -namespace com{namespace sun{ namespace star{ - namespace container{ - class XIndexAccess; - } - namespace beans{ - struct PropertyValue; - } - namespace text{ - class XNumberingFormatter; - } -}}} - namespace svx { namespace sidebar { /** Specialization of class <ValueSet>. @@ -114,45 +98,6 @@ private: tItemList maItems; }; -class SVX_DLLPUBLIC SvxNumValueSet2 : public ValueSet -{ - Color aLineColor; - Rectangle aOrgRect; - VirtualDevice* pVDev; - - com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> xFormatter; - com::sun::star::lang::Locale aLocale; - - com::sun::star::uno::Sequence< - com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue> > aNumSettings; - - - public: - SvxNumValueSet2( vcl::Window* pParent, const ResId& rResId); - virtual ~SvxNumValueSet2(); - - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; - - - void SetNumberingSettings( - const com::sun::star::uno::Sequence< - com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue> >& aNum, - com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& xFormatter, - const com::sun::star::lang::Locale& rLocale ); -}; - -class SVX_DLLPUBLIC SvxNumValueSet3 : public ValueSet -{ - public: - SvxNumValueSet3( vcl::Window* pParent, const ResId& rResId); - virtual ~SvxNumValueSet3(); - - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; - -}; - } } // end of namespace svx::sidebar #endif |