You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/04/10 11:20:24 UTC
svn commit: r1466396 [10/13] - in /openoffice/trunk: ./
main/chart2/source/controller/dialogs/
main/chart2/source/controller/drawinglayer/
main/chart2/source/controller/inc/ main/chart2/source/controller/main/
main/chart2/source/inc/chartview/ main/cha...
Modified: openoffice/trunk/main/svx/source/xoutdev/xtable.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/xoutdev/xtable.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/xoutdev/xtable.cxx (original)
+++ openoffice/trunk/main/svx/source/xoutdev/xtable.cxx Wed Apr 10 09:20:16 2013
@@ -26,6 +26,8 @@
#include <svx/xtable.hxx>
#include <svx/xpool.hxx>
+#include <svx/svdobj.hxx>
+#include <svx/svdpool.hxx>
#define GLOBALOVERFLOW
@@ -41,311 +43,36 @@ Color RGB_Color( ColorData nColorName )
return aRGBColor;
}
-// ---------------------
-// class XPropertyTable
-// ---------------------
-
-/*************************************************************************
-|*
-|* XPropertyTable::XPropertyTable()
-|*
-*************************************************************************/
-
-XPropertyTable::XPropertyTable( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- aName ( pszStandard, 8 ),
- aPath ( rPath ),
- pXPool ( pInPool ),
- aTable ( nInitSize, nReSize ),
- pBmpTable ( NULL ),
- bTableDirty ( sal_True ),
- bBitmapsDirty ( sal_True ),
- bOwnPool ( sal_False )
-{
- if( !pXPool )
- {
- bOwnPool = sal_True;
- pXPool = new XOutdevItemPool;
- DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
- }
-}
-
-/*************************************************************************
-|*
-|* XPropertyTable::XPropertyTable( SvStraem& )
-|*
-*************************************************************************/
-
-XPropertyTable::XPropertyTable( SvStream& /*rIn*/) :
- pBmpTable ( NULL )
-{
-}
-
-/*************************************************************************
-|*
-|* XPropertyTable::~XPropertyTable()
-|*
-*************************************************************************/
-
-XPropertyTable::~XPropertyTable()
-{
- XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First();
- Bitmap* pBitmap = NULL;
- for (sal_uIntPtr nIndex = 0; nIndex < aTable.Count(); nIndex++)
- {
- delete pEntry;
- pEntry = (XPropertyEntry*)aTable.Next();
- }
- // Hier wird die Bitmaptabelle geloescht
- if( pBmpTable )
- {
- pBitmap = (Bitmap*) pBmpTable->First();
-
- for( sal_uIntPtr nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
- {
- delete pBitmap;
- pBitmap = (Bitmap*) pBmpTable->Next();
- }
- delete pBmpTable;
- pBmpTable = NULL;
- }
- // Eigener Pool wird geloescht
- if( bOwnPool && pXPool )
- {
- SfxItemPool::Free(pXPool);
- }
-}
-
-/*************************************************************************
-|*
-|* XPropertyTable::Clear()
-|*
-*************************************************************************/
-
-void XPropertyTable::Clear()
-{
- aTable.Clear();
- if( pBmpTable )
- pBmpTable->Clear();
-}
-
-/************************************************************************/
-
-long XPropertyTable::Count() const
-{
- if( bTableDirty )
- {
- // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
- if( !( (XPropertyTable*) this )->Load() )
- ( (XPropertyTable*) this )->Create();
- }
- return( aTable.Count() );
-}
-
-/*************************************************************************
-|*
-|* XPropertyEntry* XPropertyTable::Get()
-|*
-*************************************************************************/
-
-XPropertyEntry* XPropertyTable::Get( long nIndex, sal_uInt16 /*nDummy*/) const
-{
- if( bTableDirty )
- {
- // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
- if( !( (XPropertyTable*) this )->Load() )
- ( (XPropertyTable*) this )->Create();
- }
- return (XPropertyEntry*) aTable.GetObject( (sal_uIntPtr) nIndex );
-}
-
-/*************************************************************************
-|*
-|* long XPropertyTable::Get(const String& rName)
-|*
-*************************************************************************/
-
-long XPropertyTable::Get(const XubString& rName)
-{
- if( bTableDirty )
- {
- // bTableDirty = sal_False;
- if( !Load() )
- Create();
- }
- long nPos = 0;
- XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First();
- while (pEntry && pEntry->GetName() != rName)
- {
- nPos++;
- pEntry = (XPropertyEntry*)aTable.Next();
- }
- if (!pEntry) nPos = -1;
- return nPos;
-}
-
-/*************************************************************************
-|*
-|* Bitmap* XPropertyTable::GetBitmap()
-|*
-*************************************************************************/
-
-Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
-{
- if( pBmpTable )
- {
- if( bBitmapsDirty )
- {
- ( (XPropertyTable*) this )->bBitmapsDirty = sal_False;
- ( (XPropertyTable*) this )->CreateBitmapsForUI();
- }
-
- if( pBmpTable->Count() >= (sal_uIntPtr) nIndex )
- return (Bitmap*) pBmpTable->GetObject( (sal_uIntPtr) nIndex );
- }
- return( NULL );
-}
-
-/*************************************************************************
-|*
-|* void XPropertyTable::Insert()
-|*
-*************************************************************************/
-
-sal_Bool XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
-{
- sal_Bool bReturn = aTable.Insert( (sal_uIntPtr) nIndex, pEntry );
-
- if( pBmpTable && !bBitmapsDirty )
- {
- Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
- pBmpTable->Insert( (sal_uIntPtr) nIndex, pBmp );
- }
- return bReturn;
-}
-
-/*************************************************************************
-|*
-|* void XPropertyTable::Replace()
-|*
-*************************************************************************/
-
-XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
-{
- XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (sal_uIntPtr) nIndex, pEntry );
-
- if( pBmpTable && !bBitmapsDirty )
- {
- Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
- Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (sal_uIntPtr) nIndex, pBmp );
- if( pOldBmp )
- delete pOldBmp;
- }
- return pOldEntry;
-}
-
-/*************************************************************************
-|*
-|* void XPropertyTable::Remove()
-|*
-*************************************************************************/
-
-XPropertyEntry* XPropertyTable::Remove( long nIndex, sal_uInt16 /*nDummy*/)
-{
- if( pBmpTable && !bBitmapsDirty )
- {
- Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (sal_uIntPtr) nIndex );
- if( pOldBmp )
- delete pOldBmp;
- }
- return (XPropertyEntry*) aTable.Remove((sal_uIntPtr)nIndex);
-}
-
-/************************************************************************/
-
-void XPropertyTable::SetName( const String& rString )
-{
- if(rString.Len())
- {
- aName = rString;
- }
-}
-
// --------------------
// class XPropertyList
// --------------------
-
-/*************************************************************************
-|*
-|* XPropertyList::XPropertyList()
-|*
-*************************************************************************/
-
-XPropertyList::XPropertyList( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- aName ( pszStandard, 8 ),
- aPath ( rPath ),
- pXPool ( pInPool ),
- aList ( nInitSize, nReSize ),
- pBmpList ( NULL ),
- bListDirty ( sal_True ),
- bBitmapsDirty ( sal_True ),
- bOwnPool ( sal_False )
+XPropertyList::XPropertyList( const String& rPath, XOutdevItemPool* pInPool ) :
+ maName ( pszStandard, 8 ),
+ maPath ( rPath ),
+ mpXPool ( pInPool ),
+ maList ( 16, 16 ),
+ mbListDirty (true)
{
- if( !pXPool )
+ if( !mpXPool )
{
- bOwnPool = sal_True;
- pXPool = new XOutdevItemPool;
- DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
+ mpXPool = static_cast< XOutdevItemPool* >(&SdrObject::GetGlobalDrawObjectItemPool());
}
}
/*************************************************************************
|*
-|* XPropertyList::XPropertyList( SvStraem& )
-|*
-*************************************************************************/
-
-XPropertyList::XPropertyList( SvStream& /*rIn*/) :
- pBmpList ( NULL )
-{
-}
-
-/*************************************************************************
-|*
|* XPropertyList::~XPropertyList()
|*
*************************************************************************/
XPropertyList::~XPropertyList()
{
- XPropertyEntry* pEntry = (XPropertyEntry*)aList.First();
- Bitmap* pBitmap = NULL;
- for( sal_uIntPtr nIndex = 0; nIndex < aList.Count(); nIndex++ )
+ XPropertyEntry* pEntry = (XPropertyEntry*)maList.First();
+ for( sal_uIntPtr nIndex = 0; nIndex < maList.Count(); nIndex++ )
{
delete pEntry;
- pEntry = (XPropertyEntry*)aList.Next();
- }
-
- if( pBmpList )
- {
- pBitmap = (Bitmap*) pBmpList->First();
-
- for( sal_uIntPtr nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
- {
- delete pBitmap;
- pBitmap = (Bitmap*) pBmpList->Next();
- }
- delete pBmpList;
- pBmpList = NULL;
- }
-
- if( bOwnPool && pXPool )
- {
- SfxItemPool::Free(pXPool);
+ pEntry = (XPropertyEntry*)maList.Next();
}
}
@@ -357,22 +84,20 @@ XPropertyList::~XPropertyList()
void XPropertyList::Clear()
{
- aList.Clear();
- if( pBmpList )
- pBmpList->Clear();
+ maList.Clear();
}
/************************************************************************/
long XPropertyList::Count() const
{
- if( bListDirty )
+ if( mbListDirty )
{
// ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
if( !( (XPropertyList*) this )->Load() )
( (XPropertyList*) this )->Create();
}
- return( aList.Count() );
+ return( maList.Count() );
}
/*************************************************************************
@@ -383,13 +108,13 @@ long XPropertyList::Count() const
XPropertyEntry* XPropertyList::Get( long nIndex, sal_uInt16 /*nDummy*/) const
{
- if( bListDirty )
+ if( mbListDirty )
{
// ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
if( !( (XPropertyList*) this )->Load() )
( (XPropertyList*) this )->Create();
}
- return (XPropertyEntry*) aList.GetObject( (sal_uIntPtr) nIndex );
+ return (XPropertyEntry*) maList.GetObject( (sal_uIntPtr) nIndex );
}
/*************************************************************************
@@ -400,18 +125,18 @@ XPropertyEntry* XPropertyList::Get( long
long XPropertyList::Get(const XubString& rName)
{
- if( bListDirty )
+ if( mbListDirty )
{
//bListDirty = sal_False;
if( !Load() )
Create();
}
long nPos = 0;
- XPropertyEntry* pEntry = (XPropertyEntry*)aList.First();
+ XPropertyEntry* pEntry = (XPropertyEntry*)maList.First();
while (pEntry && pEntry->GetName() != rName)
{
nPos++;
- pEntry = (XPropertyEntry*)aList.Next();
+ pEntry = (XPropertyEntry*)maList.Next();
}
if (!pEntry) nPos = -1;
return nPos;
@@ -423,19 +148,23 @@ long XPropertyList::Get(const XubString&
|*
*************************************************************************/
-Bitmap* XPropertyList::GetBitmap( long nIndex ) const
+Bitmap XPropertyList::GetUiBitmap( long nIndex ) const
{
- if( pBmpList )
- {
- if( bBitmapsDirty )
- {
- ( (XPropertyList*) this )->bBitmapsDirty = sal_False;
- ( (XPropertyList*) this )->CreateBitmapsForUI();
- }
- if( pBmpList->Count() >= (sal_uIntPtr) nIndex )
- return (Bitmap*) pBmpList->GetObject( (sal_uIntPtr) nIndex );
- }
- return( NULL );
+ Bitmap aRetval;
+ XPropertyEntry* pEntry = (XPropertyEntry*)maList.GetObject((sal_uIntPtr)nIndex);
+
+ if(pEntry)
+ {
+ aRetval = pEntry->GetUiBitmap();
+
+ if(aRetval.IsEmpty())
+ {
+ aRetval = const_cast< XPropertyList* >(this)->CreateBitmapForUI(nIndex);
+ pEntry->SetUiBitmap(aRetval);
+ }
+ }
+
+ return aRetval;
}
/*************************************************************************
@@ -446,14 +175,7 @@ Bitmap* XPropertyList::GetBitmap( long n
void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
{
- aList.Insert( pEntry, (sal_uIntPtr) nIndex );
-
- if( pBmpList && !bBitmapsDirty )
- {
- Bitmap* pBmp = CreateBitmapForUI(
- (sal_uIntPtr) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
- pBmpList->Insert( pBmp, (sal_uIntPtr) nIndex );
- }
+ maList.Insert( pEntry, (sal_uIntPtr) nIndex );
}
/*************************************************************************
@@ -464,16 +186,7 @@ void XPropertyList::Insert( XPropertyEnt
XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
{
- XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (sal_uIntPtr) nIndex );
-
- if( pBmpList && !bBitmapsDirty )
- {
- Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
- Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (sal_uIntPtr) nIndex );
- if( pOldBmp )
- delete pOldBmp;
- }
- return pOldEntry;
+ return (XPropertyEntry*) maList.Replace( pEntry, (sal_uIntPtr) nIndex );
}
/*************************************************************************
@@ -484,13 +197,7 @@ XPropertyEntry* XPropertyList::Replace(
XPropertyEntry* XPropertyList::Remove( long nIndex, sal_uInt16 /*nDummy*/)
{
- if( pBmpList && !bBitmapsDirty )
- {
- Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (sal_uIntPtr) nIndex );
- if( pOldBmp )
- delete pOldBmp;
- }
- return (XPropertyEntry*) aList.Remove( (sal_uIntPtr) nIndex );
+ return (XPropertyEntry*) maList.Remove( (sal_uIntPtr) nIndex );
}
/************************************************************************/
@@ -499,9 +206,29 @@ void XPropertyList::SetName( const Strin
{
if(rString.Len())
{
- aName = rString;
+ maName = rString;
}
}
+sal_uInt32 XPropertyList::getUiBitmapWidth() const
+{
+ static sal_uInt32 nWidth = 32; // alternative: 42;
+
+ return nWidth;
+}
+
+sal_uInt32 XPropertyList::getUiBitmapHeight() const
+{
+ static sal_uInt32 nHeight = 12; // alternative: 16;
+ return nHeight;
+}
+
+sal_uInt32 XPropertyList::getUiBitmapLineWidth() const
+{
+ static sal_uInt32 nLineWidth = 3;
+
+ return nLineWidth;
+}
+// eof
Modified: openoffice/trunk/main/svx/source/xoutdev/xtablend.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/xoutdev/xtablend.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/xoutdev/xtablend.cxx (original)
+++ openoffice/trunk/main/svx/source/xoutdev/xtablend.cxx Wed Apr 10 09:20:16 2013
@@ -67,6 +67,7 @@
#include <svx/svdmodel.hxx>
#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
#include <svx/sdr/contact/displayinfo.hxx>
+#include <svx/xlnwtit.hxx>
#define GLOBALOVERFLOW
@@ -74,90 +75,9 @@ using namespace com::sun::star;
using namespace rtl;
sal_Unicode const pszExtLineEnd[] = {'s','o','e'};
-
-static char const aChckLEnd[] = { 0x04, 0x00, 'S','O','E','L'}; // < 5.2
-static char const aChckLEnd0[] = { 0x04, 0x00, 'S','O','E','0'}; // = 5.2
-static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
-
-// --------------------
-// class XLineEndTable
-// --------------------
-
-/*************************************************************************
-|*
-|* XLineEndTable::XLineEndTable()
-|*
-*************************************************************************/
-
-XLineEndTable::XLineEndTable( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- XPropertyTable( rPath, pInPool, nInitSize, nReSize)
-{
- pBmpTable = new Table( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XLineEndTable::~XLineEndTable()
-{
-}
-
-/************************************************************************/
-
-XLineEndEntry* XLineEndTable::Replace(long nIndex, XLineEndEntry* pEntry )
-{
- return (XLineEndEntry*) XPropertyTable::Replace(nIndex, pEntry);
-}
-
-/************************************************************************/
-
-XLineEndEntry* XLineEndTable::Remove(long nIndex)
-{
- return (XLineEndEntry*) XPropertyTable::Remove(nIndex, 0);
-}
-
-/************************************************************************/
-
-XLineEndEntry* XLineEndTable::GetLineEnd(long nIndex) const
-{
- return (XLineEndEntry*) XPropertyTable::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XLineEndTable::Load()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XLineEndTable::Save()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XLineEndTable::Create()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
- return( NULL );
-}
-
-/************************************************************************/
-
-sal_Bool XLineEndTable::CreateBitmapsForUI()
-{
- return( sal_False );
-}
+//static char const aChckLEnd[] = { 0x04, 0x00, 'S','O','E','L'}; // < 5.2
+//static char const aChckLEnd0[] = { 0x04, 0x00, 'S','O','E','0'}; // = 5.2
+//static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
// --------------------
// class XLineEndList
@@ -202,12 +122,13 @@ void XLineEndList::impCreate()
VirtualDevice* pVirDev = new VirtualDevice;
OSL_ENSURE(0 != pVirDev, "XLineEndList: no VirtualDevice created!" );
pVirDev->SetMapMode(MAP_100TH_MM);
- const Size aSize(pVirDev->PixelToLogic(Size(BITMAP_WIDTH * 2, BITMAP_HEIGHT)));
+ const Size aSize(pVirDev->PixelToLogic(Size(getUiBitmapWidth() * 2, getUiBitmapHeight())));
pVirDev->SetOutputSize(aSize);
pVirDev->SetDrawMode(rStyleSettings.GetHighContrastMode()
? DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT
: DRAWMODE_DEFAULT);
-
+ pVirDev->SetBackground(rStyleSettings.GetFieldColor());
+
SdrModel* pSdrModel = new SdrModel();
OSL_ENSURE(0 != pSdrModel, "XLineEndList: no SdrModel created!" );
pSdrModel->GetItemPool().FreezeIdRanges();
@@ -228,8 +149,11 @@ void XLineEndList::impCreate()
SdrObject* pLineObject = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aPolygon));
OSL_ENSURE(0 != pLineObject, "XLineEndList: no LineObject created!" );
pLineObject->SetModel(pSdrModel);
- pLineObject->SetMergedItem(XLineStartWidthItem(aSize.Height()));
- pLineObject->SetMergedItem(XLineEndWidthItem(aSize.Height()));
+ const Size aLineWidth(pVirDev->PixelToLogic(Size(getUiBitmapLineWidth(), 0)));
+ pLineObject->SetMergedItem(XLineWidthItem(aLineWidth.getWidth()));
+ const sal_uInt32 nArrowHeight((aSize.Height() * 8) / 10);
+ pLineObject->SetMergedItem(XLineStartWidthItem(nArrowHeight));
+ pLineObject->SetMergedItem(XLineEndWidthItem(nArrowHeight));
pLineObject->SetMergedItem(XLineColorItem(String(), rStyleSettings.GetFieldTextColor()));
mpData = new impXLineEndList(pVirDev, pSdrModel, pBackgroundObject, pLineObject);
@@ -246,11 +170,10 @@ void XLineEndList::impDestroy()
}
}
-XLineEndList::XLineEndList(const String& rPath, XOutdevItemPool* _pXPool, sal_uInt16 nInitSize, sal_uInt16 nReSize)
-: XPropertyList(rPath, _pXPool, nInitSize, nReSize),
+XLineEndList::XLineEndList(const String& rPath, XOutdevItemPool* _pXPool)
+: XPropertyList(rPath, _pXPool),
mpData(0)
{
- pBmpList = new List(nInitSize, nReSize);
}
XLineEndList::~XLineEndList()
@@ -275,19 +198,19 @@ XLineEndEntry* XLineEndList::GetLineEnd(
sal_Bool XLineEndList::Load()
{
- if( bListDirty )
+ if( mbListDirty )
{
- bListDirty = sal_False;
+ mbListDirty = false;
- INetURLObject aURL( aPath );
+ INetURLObject aURL( maPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
- DBG_ASSERT( !aPath.Len(), "invalid URL" );
+ DBG_ASSERT( !maPath.Len(), "invalid URL" );
return sal_False;
}
- aURL.Append( aName );
+ aURL.Append( maName );
if( !aURL.getExtension().getLength() )
aURL.setExtension( rtl::OUString( pszExtLineEnd, 3 ) );
@@ -300,15 +223,15 @@ sal_Bool XLineEndList::Load()
sal_Bool XLineEndList::Save()
{
- INetURLObject aURL( aPath );
+ INetURLObject aURL( maPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
- DBG_ASSERT( !aPath.Len(), "invalid URL" );
+ DBG_ASSERT( !maPath.Len(), "invalid URL" );
return sal_False;
}
- aURL.Append( aName );
+ aURL.Append( maName );
if( !aURL.getExtension().getLength() )
aURL.setExtension( rtl::OUString( pszExtLineEnd, 3 ) );
@@ -340,25 +263,7 @@ sal_Bool XLineEndList::Create()
return( sal_True );
}
-sal_Bool XLineEndList::CreateBitmapsForUI()
-{
- impCreate();
-
- for( long i = 0; i < Count(); i++)
- {
- Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
- OSL_ENSURE(0 != pBmp, "XLineEndList: Bitmap(UI) could not be created!" );
-
- if( pBmp )
- pBmpList->Insert( pBmp, i );
- }
-
- impDestroy();
-
- return( sal_True );
-}
-
-Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
+Bitmap XLineEndList::CreateBitmapForUI( long nIndex )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
@@ -374,17 +279,11 @@ Bitmap* XLineEndList::CreateBitmapForUI(
sdr::contact::ObjectContactOfObjListPainter aPainter(*pVD, aObjectVector, 0);
sdr::contact::DisplayInfo aDisplayInfo;
+ pVD->Erase();
aPainter.ProcessDisplay(aDisplayInfo);
const Point aZero(0, 0);
- Bitmap* pBitmap = new Bitmap(pVD->GetBitmap(aZero, pVD->GetOutputSize()));
-
- if(bDelete)
- {
- impDestroy();
- }
-
- return pBitmap;
+ return pVD->GetBitmap(aZero, pVD->GetOutputSize());
}
//////////////////////////////////////////////////////////////////////////////
Modified: openoffice/trunk/main/svx/util/svx.component
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/util/svx.component?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/svx/util/svx.component (original)
+++ openoffice/trunk/main/svx/util/svx.component Wed Apr 10 09:20:16 2013
@@ -69,4 +69,7 @@
<implementation name="com.sun.star.svx.UpSearchToolboxController">
<service name="com.sun.star.frame.ToolbarController"/>
</implementation>
+ <implementation name="org.apache.openoffice.comp.svx.sidebar.PanelFactory">
+ <service name="com.sun.star.ui.UIElementFactory"/>
+ </implementation>
</component>
Modified: openoffice/trunk/main/sw/AllLangResTarget_sw.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/AllLangResTarget_sw.mk?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/AllLangResTarget_sw.mk (original)
+++ openoffice/trunk/main/sw/AllLangResTarget_sw.mk Wed Apr 10 09:20:16 2013
@@ -156,6 +156,8 @@ $(eval $(call gb_SrsTarget_add_files,sw/
sw/source/ui/ribbar/tbxanchr.src \
sw/source/ui/ribbar/workctrl.src \
sw/source/ui/shells/shells.src \
+ sw/source/ui/sidebar/PagePropertyPanel.src \
+ sw/source/ui/sidebar/WrapPropertyPanel.src \
sw/source/ui/smartmenu/stmenu.src \
sw/source/ui/table/chartins.src \
sw/source/ui/table/colwd.src \
Modified: openoffice/trunk/main/sw/Library_sw.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_sw.mk?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_sw.mk (original)
+++ openoffice/trunk/main/sw/Library_sw.mk Wed Apr 10 09:20:16 2013
@@ -646,6 +646,13 @@ $(eval $(call gb_Library_add_exception_o
sw/source/ui/shells/txtattr \
sw/source/ui/shells/txtcrsr \
sw/source/ui/shells/txtnum \
+ sw/source/ui/sidebar/PageOrientationControl \
+ sw/source/ui/sidebar/PageMarginControl \
+ sw/source/ui/sidebar/PageSizeControl \
+ sw/source/ui/sidebar/PageColumnControl \
+ sw/source/ui/sidebar/PagePropertyPanel \
+ sw/source/ui/sidebar/WrapPropertyPanel \
+ sw/source/ui/sidebar/SwPanelFactory \
sw/source/ui/smartmenu/stmenu \
sw/source/ui/table/chartins \
sw/source/ui/table/swtablerep \
Modified: openoffice/trunk/main/sw/inc/cmdid.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/cmdid.h?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/cmdid.h (original)
+++ openoffice/trunk/main/sw/inc/cmdid.h Wed Apr 10 09:20:16 2013
@@ -64,6 +64,7 @@ Achtung: Ab sofort sind in diesem File k
#define FN_EXTRA2 (SID_SW_START + 2200)
#define FN_PARAM2 (SID_SW_START + 2400)
#define FN_NOTES (SID_SW_START + 2500)
+#define FN_SIDEBAR (SID_SW_START + 2550)
/* More accurately, this range should be from FN_EXTRA2 to FN_PARAM2-1, but
* FN_NUMBER_NEWSTART comes from FN_FORMAT2, and FN_PARAM_LINK_DISPLAY_NAME
@@ -480,7 +481,7 @@ Achtung: Ab sofort sind in diesem File k
#define FN_SET_WIDOW (FN_FORMAT + 36) /* Widows */
#define FN_SET_ORPHAN (FN_FORMAT + 37) /* Orphans */
-
+#define FN_FORMAT_PAGE_SETTING_DLG (FN_FORMAT + 42) /* */
#define FN_REGISTER_COLLECTION (FN_FORMAT + 43) /* Referenzvorlage an der Seite */
#define FN_REGISTER_MODE (FN_FORMAT + 44) /* Registermodus an/aus */
#define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* Zahlenformat in Tabelle */
@@ -638,10 +639,9 @@ Achtung: Ab sofort sind in diesem File k
#define FN_FRAME_WRAP_CONTOUR (FN_FORMAT + 184) /* Rahmen Kunturumlauf */
-#define FN_TABLE_VERT_NONE (FN_FORMAT + 185) /* vertikale Ausrichtung in Tabellenzellen */
-#define FN_TABLE_VERT_CENTER (FN_FORMAT + 186) /* -"- */
-#define FN_TABLE_VERT_BOTTOM (FN_FORMAT + 187) /* -"- */
-#define FN_TABLE_SET_VERT_ALIGN (FN_FORMAT + 188) /* -"- */
+// +185..+187 removed in favor of corresponding globally available slot
+
+#define FN_TABLE_SET_VERT_ALIGN (FN_FORMAT + 188) /* vertical alignment in Writer table cells */
#define FN_TABLE_MODE_FIX (FN_FORMAT + 189) /* Tabellenmodus */
#define FN_TABLE_MODE_FIX_PROP (FN_FORMAT + 190) /* -"- */
#define FN_TABLE_MODE_VARIABLE (FN_FORMAT + 191) /* -"- */
@@ -1258,10 +1258,13 @@ Achtung: Ab sofort sind in diesem File k
#define FN_IID_COLRIGHT (FN_FRAME + 17)
#define FN_SET_FRM_ALT_NAME (FN_FRAME + 18)
-// --> OD 2009-07-13 #i73249#
#define FN_UNO_TITLE (FN_FRAME + 19)
#define FN_UNO_DESCRIPTION (FN_FRAME + 20)
-// <--
+
+#define FN_PROPERTY_WRAP_DLG (FN_SIDEBAR + 0)
+#define SID_ATTR_PAGE_COLUMN (FN_SIDEBAR + 1)
+#define SID_ATTR_PAGE_ULSPACE (FN_SIDEBAR + 2)
+#define SID_ATTR_PAGE_LRSPACE (FN_SIDEBAR + 3)
//Member-Ids fuer Fill/SetVariable an Items
Modified: openoffice/trunk/main/sw/inc/docsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/docsh.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/docsh.hxx (original)
+++ openoffice/trunk/main/sw/inc/docsh.hxx Wed Apr 10 09:20:16 2013
@@ -104,12 +104,21 @@ class SW_DLLPUBLIC SwDocShell: public Sf
// OLE-Geraffel
SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16);
- // Methoden fuer StyleSheets
- SW_DLLPRIVATE sal_uInt16 Edit( const String &rName, const String& rParent, sal_uInt16 nFamily,
- sal_uInt16 nMask, sal_Bool bNew,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bBasic = sal_False );
+ // Methoden fuer StyleSheets
+
+ // @param nSlot
+ // Only used for nFamily == SFX_STYLE_FAMILY_PAGE. Identifies optional Slot by which the edit is triggered.
+ // Used to activate certain dialog pane
+ SW_DLLPRIVATE sal_uInt16 Edit(
+ const String &rName,
+ const String& rParent,
+ const sal_uInt16 nFamily,
+ sal_uInt16 nMask,
+ const sal_Bool bNew,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ const sal_Bool bBasic = sal_False );
+
SW_DLLPRIVATE sal_uInt16 Delete(const String &rName, sal_uInt16 nFamily);
SW_DLLPRIVATE sal_uInt16 ApplyStyles(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0,
sal_uInt16 nMode = 0 );
@@ -245,10 +254,13 @@ public:
void _LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrentDocument );
- // Seitenvorlagedialog anzeigen, ggf. auf Spaltenpage
- void FormatPage( const String& rPage,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0 );
+ // Show page style format dialog
+ // @param nSlot
+ // Identifies slot by which the dialog is triggered. Used to activate certain dialog pane
+ void FormatPage(
+ const String& rPage,
+ const sal_uInt16 nSlot,
+ SwWrtShell& rActShell );
// --> OD 2006-11-07 #i59688#
// linked graphics are now loaded on demand.
Modified: openoffice/trunk/main/sw/inc/editsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/editsh.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/editsh.hxx (original)
+++ openoffice/trunk/main/sw/inc/editsh.hxx Wed Apr 10 09:20:16 2013
@@ -496,6 +496,9 @@ public:
sal_Bool HasBullet() const;
// <- i29560
+ sal_Bool SelectionHasNumber() const;
+ sal_Bool SelectionHasBullet() const;
+
String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
void ChgNumRuleFmts( const SwNumRule& rRule );
// setze und erfrage, ob an aktueller PointPos eine Numerierung mit
Modified: openoffice/trunk/main/sw/inc/helpid.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/helpid.h?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/helpid.h (original)
+++ openoffice/trunk/main/sw/inc/helpid.h Wed Apr 10 09:20:16 2013
@@ -305,6 +305,14 @@
#define HID_OPTCOMPATIBILITY_PAGE "SW_HID_OPTCOMPATIBILITY_PAGE"
#define HID_COMPATIBILITY_OPTIONS_BOX "SW_HID_COMPATIBILITY_OPTIONS_BOX"
+#define HID_PROPERTYPANEL_WRAP_SECTION "SW_HID_PROPERTYPANEL_WRAP_SECTION"
+#define HID_PROPERTYPANEL_WRAP_RB_NO_WRAP "SW_HID_PROPERTYPANEL_WRAP_RB_NO_WRAP"
+#define HID_PROPERTYPANEL_WRAP_RB_WRAP_LEFT "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_LEFT"
+#define HID_PROPERTYPANEL_WRAP_RB_WRAP_RIGHT "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_RIGHT"
+#define HID_PROPERTYPANEL_WRAP_RB_WRAP_PARALLEL "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_PARALLEL"
+#define HID_PROPERTYPANEL_WRAP_RB_WRAP_THROUGH "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_THROUGH"
+#define HID_PROPERTYPANEL_WRAP_RB_WRAP_IDEAL "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_IDEAL"
+
// AutoPilot Help-IDs *********************************************************
#define HID_LETTER_PAGE1 "SW_HID_LETTER_PAGE1"
@@ -343,6 +351,27 @@
#define HID_AUTOPILOT_PREV "SW_HID_AUTOPILOT_PREV"
#define HID_AUTOPILOT_OK "SW_HID_AUTOPILOT_OK"
+// sw::sidebar::PagePropertyPanel
+#define HID_SWPAGE_ORIENTATION "HID_SWPAGE_ORIENTATION"
+#define HID_SWPAGE_TBI_ORIENTATION "HID_SWPAGE_TBI_ORIENTATION"
+#define HID_SWPAGE_MARGIN "HID_SWPAGE_MARGIN"
+#define HID_SWPAGE_TBI_MARGIN "HID_SWPAGE_TBI_MARGIN"
+#define HID_SWPAGE_SIZE "HID_SWPAGE_SIZE"
+#define HID_SWPAGE_TBI_SIZE "HID_SWPAGE_TBI_SIZE"
+#define HID_SWPAGE_COLUMN "HID_SWPAGE_COLUMN"
+#define HID_SWPAGE_TBI_COLUMN "HID_SWPAGE_TBI_COLUMN"
+#define HID_SWPAGE_LEFT_MARGIN "HID_SWPAGE_LEFT_MARGIN"
+#define HID_SWPAGE_RIGHT_MARGIN "HID_SWPAGE_RIGHT_MARGIN"
+#define HID_SWPAGE_TOP_MARGIN "HID_SWPAGE_TOP_MARGIN"
+#define HID_SWPAGE_BOTTOM_MARGIN "HID_SWPAGE_BOTTOM_MARGIN"
+#define HID_SWPAGE_SIZE_MORE "HID_SWPAGE_SIZE_MORE"
+#define HID_SWPAGE_COLUMN_MORE "HID_SWPAGE_COLUMN_MORE"
+#define HID_SWPAGE_VS_ORIENTATION "HID_SWPAGE_VS_ORIENTATION"
+#define HID_SWPAGE_VS_MARGIN "HID_SWPAGE_VS_MARGIN"
+#define HID_SWPAGE_VS_SIZE "HID_SWPAGE_VS_SIZE"
+#define HID_SWPAGE_VS_COLUMN "HID_SWPAGE_VS_COLUMN"
+#define HID_PROPERTYPANEL_SWPAGE_SECTION "HID_PROPERTYPANEL_SWPAGE_SECTION"
+
// HelpIds fuers Menue *****************************************************
#define HID_MN_SUB_TBLROW "SW_HID_MN_SUB_TBLROW"
Modified: openoffice/trunk/main/sw/inc/rcid.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/rcid.hrc?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/rcid.hrc (original)
+++ openoffice/trunk/main/sw/inc/rcid.hrc Wed Apr 10 09:20:16 2013
@@ -74,6 +74,7 @@
#define RC_UNDO (RC_BASE + 3750)
#define RC_SMARTTAG (RC_BASE + 3950) // SMARTTAGS
#define RC_UNOCORE (RC_BASE + 4050)
+#define RC_PROPERTYPANEL (RC_BASE + 4070)
#define RC_ANNOTATION (RC_BASE + 4150)
/*--------------------------------------------------------------------
@@ -264,4 +265,7 @@
#define RC_UNOCORE_BEGIN RC_UNOCORE
#define RC_UNOCORE_END (RC_UNOCORE + 10)
+// property panel
+#define RC_PROPERTYPANEL_BEGIN RC_PROPERTYPANEL
+#define RC_PROPERTYPANEL_END (RC_PROPERTYPANEL + 10)
#endif
Modified: openoffice/trunk/main/sw/inc/swabstdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/swabstdlg.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/swabstdlg.hxx (original)
+++ openoffice/trunk/main/sw/inc/swabstdlg.hxx Wed Apr 10 09:20:16 2013
@@ -420,14 +420,17 @@ public:
sal_Bool bFmt = sal_False,
sal_uInt16 nDefPage = 0,
const String* pFmtStr = 0) = 0; //add for SwFrmDlg
- virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
- Window* pParent,
- SfxStyleSheetBase& rBase,
- sal_uInt16 nRegion,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bNew = sal_False ) = 0; //add for SwTemplateDlg
- virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
+ // @param nSlot
+ // Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
+ // Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
+ virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+ Window* pParent,
+ SfxStyleSheetBase& rBase,
+ sal_uInt16 nRegion,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ sal_Bool bNew = sal_False ) = 0; //add for SwTemplateDlg
+ virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg
Modified: openoffice/trunk/main/sw/inc/swcommands.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/swcommands.h?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/swcommands.h (original)
+++ openoffice/trunk/main/sw/inc/swcommands.h Wed Apr 10 09:20:16 2013
@@ -50,9 +50,9 @@
#define CMD_FN_NUMBER_BULLETS ".uno:BulletsAndNumberingDialog"
#define CMD_FN_CALC_TABLE ".uno:Calc"
#define CMD_FN_CALCULATE ".uno:CalculateSel"
-#define CMD_FN_TABLE_VERT_BOTTOM ".uno:CellVertBottom"
-#define CMD_FN_TABLE_VERT_CENTER ".uno:CellVertCenter"
-#define CMD_FN_TABLE_VERT_NONE ".uno:CellVertTop"
+#define CMD_SID_TABLE_VERT_BOTTOM ".uno:CellVertBottom"
+#define CMD_SID_TABLE_VERT_CENTER ".uno:CellVertCenter"
+#define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop"
#define CMD_FN_FRAME_CHAIN ".uno:ChainFrames"
#define CMD_FN_CHANGE_DBFIELD ".uno:ChangeDatabaseField"
#define CMD_FN_NUMBERING_OUTLINE_DLG ".uno:ChapterNumberingDialog"
Modified: openoffice/trunk/main/sw/sdi/_annotsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/_annotsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/_annotsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/_annotsh.sdi Wed Apr 10 09:20:16 2013
@@ -179,6 +179,24 @@ interface _Annotation
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_ATTR_PARA_LRSPACE
+ [
+ ExecMethod = Exec;
+ StateMethod = GetState ;
+ ]
+
+ SID_ATTR_PARA_LINESPACE
+ [
+ ExecMethod = Exec;
+ StateMethod = GetState ;
+ ]
+
+ SID_ATTR_PARA_ULSPACE
+ [
+ ExecMethod = Exec;
+ StateMethod = GetState ;
+ ]
+
FN_INSERT_STRING
[
ExecMethod = Exec ;
@@ -206,6 +224,13 @@ interface _Annotation
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
+ SID_CHAR_DLG_EFFECT
+ [
+ ExecMethod = Exec ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
SID_ATTR_CHAR_WEIGHT // api:
[
Modified: openoffice/trunk/main/sw/sdi/_basesh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/_basesh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/_basesh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/_basesh.sdi Wed Apr 10 09:20:16 2013
@@ -237,17 +237,23 @@ interface BaseTextSelection
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_FORMAT_PAGE_DLG // status(final|play)
- [
- ExecMethod = ExecDlg ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
+ FN_FORMAT_PAGE_DLG // status(final|play)
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
- FN_FORMAT_PAGE_COLUMN_DLG // status(final|play)
- [
- ExecMethod = ExecDlg ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
+ FN_FORMAT_PAGE_COLUMN_DLG // status(final|play)
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
+ FN_FORMAT_PAGE_SETTING_DLG
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
FN_CONVERT_TABLE_TO_TEXT
[
Modified: openoffice/trunk/main/sw/sdi/_frmsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/_frmsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/_frmsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/_frmsh.sdi Wed Apr 10 09:20:16 2013
@@ -147,6 +147,27 @@ interface BaseTextFrame
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_ATTR_TRANSFORM
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_ATTR_TRANSFORM_WIDTH
+ [
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+ SID_ATTR_TRANSFORM_HEIGHT
+ [
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+ SID_ATTR_TRANSFORM_PROTECT_SIZE
+ [
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
SID_ATTR_ULSPACE // status(final|play)
[
ExecMethod = Execute ;
@@ -168,6 +189,12 @@ interface BaseTextFrame
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ FN_PROPERTY_WRAP_DLG // status(final|play)
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
SID_FRAME_LINESTYLE // status()
[
Modified: openoffice/trunk/main/sw/sdi/_grfsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/_grfsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/_grfsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/_grfsh.sdi Wed Apr 10 09:20:16 2013
@@ -32,6 +32,12 @@ interface BaseTextGraphic
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_FLIP_VERTICAL
+ [
+ ExecMethod = ExecAttr ;
+ StateMethod = GetAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
FN_FLIP_HORZ_GRAFIC // status(final|play)
[
@@ -39,6 +45,12 @@ interface BaseTextGraphic
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_FLIP_HORIZONTAL
+ [
+ ExecMethod = ExecAttr ;
+ StateMethod = GetAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
FN_FORMAT_GRAFIC_DLG // status(final|play)
[
@@ -46,6 +58,12 @@ interface BaseTextGraphic
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ FN_PROPERTY_WRAP_DLG // status(final|play)
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
FN_SAVE_GRAPHIC // status(final|play)
Modified: openoffice/trunk/main/sw/sdi/_tabsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/_tabsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/_tabsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/_tabsh.sdi Wed Apr 10 09:20:16 2013
@@ -63,26 +63,27 @@ interface BaseTextTable
]
- FN_TABLE_VERT_NONE
+ SID_TABLE_VERT_NONE
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_TABLE_VERT_CENTER
+ SID_TABLE_VERT_CENTER
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_TABLE_VERT_BOTTOM
+ SID_TABLE_VERT_BOTTOM
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
FN_TABLE_SET_COL_WIDTH // status( final|play )
[
ExecMethod = Execute ;
Modified: openoffice/trunk/main/sw/sdi/_textsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/_textsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/_textsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/_textsh.sdi Wed Apr 10 09:20:16 2013
@@ -59,6 +59,7 @@ interface BaseText
SID_ATTR_BRUSH_CHAR // status()
[
ExecMethod = Execute ;
+ StateMethod = GetTxtCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
@@ -732,6 +733,18 @@ interface BaseText
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ FN_BUL_NUM_RULE_INDEX // status(final|play)
+ [
+ ExecMethod = ExecEnterNum ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+ FN_NUM_NUM_RULE_INDEX // status(final|play)
+ [
+ ExecMethod = ExecEnterNum ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
FN_NUMBER_BULLETS // status(final|play)
[
ExecMethod = ExecEnterNum ;
@@ -793,6 +806,21 @@ interface BaseText
ExecMethod = ExecMoveMisc ;
StateMethod = NoState ;
]
+ FN_SVX_SET_NUMBER
+ [
+ ExecMethod = ExecSetNumber;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+ FN_SVX_SET_BULLET
+ [
+ ExecMethod = ExecSetNumber;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+ SID_OUTLINE_BULLET // status(final|play)
+ [
+ ExecMethod = ExecEnterNum ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
FN_INSERT_FOOTNOTE_DLG // status(final|play|rec)
[
@@ -1199,6 +1227,11 @@ interface BaseText
ExecMethod = Execute ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_ATTR_PARA_LRSPACE
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetAttrState;
+ ]
FN_SELECT_PARA // status(final|play)
[
ExecMethod = Execute ;
@@ -1446,6 +1479,12 @@ interface BaseText
ExecMethod = Execute ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
+ SID_CHAR_DLG_EFFECT
+ [
+ ExecMethod = Execute ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
SID_CHAR_DLG_FOR_PARAGRAPH
[
ExecMethod = Execute ;
Modified: openoffice/trunk/main/sw/sdi/_viewsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/_viewsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/_viewsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/_viewsh.sdi Wed Apr 10 09:20:16 2013
@@ -404,6 +404,31 @@ interface BaseTextEditView
ExecMethod = Execute ;
StateMethod = GetState ;
]
+
+ SID_ATTR_PARA_ULSPACE
+ [
+ ExecMethod = ExecTabWin ;
+ StateMethod = StateTabWin ;
+ ]
+
+ SID_ATTR_PAGE_COLUMN
+ [
+ ExecMethod = ExecTabWin ;
+ StateMethod = StateTabWin ;
+ ]
+ SID_ATTR_PAGE_ULSPACE
+ [
+ ExecMethod = ExecTabWin ;
+ StateMethod = StateTabWin ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+ SID_ATTR_PAGE_LRSPACE
+ [
+ ExecMethod = ExecTabWin ;
+ StateMethod = StateTabWin ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
SID_THESAURUS // status(final|play)
[
ExecMethod = ExecLingu ;
Modified: openoffice/trunk/main/sw/sdi/drawsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/drawsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/drawsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/drawsh.sdi Wed Apr 10 09:20:16 2013
@@ -33,6 +33,20 @@ interface TextDraw : TextDrawBase
Export = FALSE;
]
+ SID_ATTR_LINE_START
+ [
+ ExecMethod = ExecDrawAttrArgs ;
+ StateMethod = DisableState ;
+ Export = FALSE;
+ ]
+
+ SID_ATTR_LINE_END
+ [
+ ExecMethod = ExecDrawAttrArgs ;
+ StateMethod = DisableState ;
+ Export = FALSE;
+ ]
+
SID_ATTR_LINE_STYLE
[
Export = FALSE;
@@ -48,6 +62,30 @@ interface TextDraw : TextDrawBase
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_ATTR_LINE_TRANSPARENCE
+ [
+ Export = FALSE;
+ ExecMethod = ExecDrawAttrArgs ;
+ StateMethod = GetDrawAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
+ SID_ATTR_LINE_JOINT
+ [
+ Export = FALSE;
+ ExecMethod = ExecDrawAttrArgs ;
+ StateMethod = GetDrawAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
+ SID_ATTR_LINE_CAP
+ [
+ Export = FALSE;
+ ExecMethod = ExecDrawAttrArgs ;
+ StateMethod = GetDrawAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
SID_DASH_LIST
[
StateMethod = GetDrawAttrState ;
@@ -134,6 +172,22 @@ interface TextDraw : TextDrawBase
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_ATTR_FILL_TRANSPARENCE
+ [
+ Export = FALSE;
+ ExecMethod = ExecDrawAttrArgs ;
+ StateMethod = GetDrawAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
+ SID_ATTR_FILL_FLOATTRANSPARENCE
+ [
+ Export = FALSE;
+ ExecMethod = ExecDrawAttrArgs ;
+ StateMethod = GetDrawAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
SID_ATTRIBUTES_LINE
[
ExecMethod = ExecDrawDlg ;
@@ -158,6 +212,12 @@ interface TextDraw : TextDrawBase
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_FLIP_VERTICAL
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
FN_FLIP_HORZ_GRAFIC
[
@@ -165,6 +225,12 @@ interface TextDraw : TextDrawBase
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_FLIP_HORIZONTAL
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
SID_OBJECT_ROTATE
[
Modified: openoffice/trunk/main/sw/sdi/drwbassh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/drwbassh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/drwbassh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/drwbassh.sdi Wed Apr 10 09:20:16 2013
@@ -32,6 +32,7 @@ interface TextDrawBase : BaseTextDrawBas
shell SwDrawBaseShell: SwBaseShell
{
import TextDrawBase[Automation];
+ import Sidebar;
SID_OBJECT_ALIGN
[
Modified: openoffice/trunk/main/sw/sdi/drwtxtsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/drwtxtsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/drwtxtsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/drwtxtsh.sdi Wed Apr 10 09:20:16 2013
@@ -210,6 +210,24 @@ interface TextDrawText
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_ATTR_PARA_LRSPACE //for indent
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+
+ SID_ATTR_PARA_LINESPACE // api:
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+
+ SID_ATTR_PARA_ULSPACE
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+
SID_ATTR_PARA_ADJUST_LEFT // api:
[
ExecMethod = Execute ;
@@ -299,6 +317,13 @@ interface TextDrawText
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
+ SID_CHAR_DLG_EFFECT
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
SID_CHAR_DLG_FOR_PARAGRAPH
[
ExecMethod = Execute ;
@@ -569,6 +594,25 @@ interface TextDrawText
[
StateMethod = StateDisableItems ;
]
+
+ SID_TABLE_VERT_NONE
+ [
+ ExecMethod = ExecDraw ;
+ StateMethod = GetStatePropPanelAttr ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+ SID_TABLE_VERT_CENTER
+ [
+ ExecMethod = ExecDraw ;
+ StateMethod = GetStatePropPanelAttr ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+ SID_TABLE_VERT_BOTTOM
+ [
+ ExecMethod = ExecDraw ;
+ StateMethod = GetStatePropPanelAttr ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
}
interface TextDrawFont
Modified: openoffice/trunk/main/sw/sdi/swriter.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/swriter.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/swriter.sdi (original)
+++ openoffice/trunk/main/sw/sdi/swriter.sdi Wed Apr 10 09:20:16 2013
@@ -729,87 +729,6 @@ SfxVoidItem CalculateSel FN_CALCULATE
]
//--------------------------------------------------------------------------
-SfxBoolItem CellVertBottom FN_TABLE_VERT_BOTTOM
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TABLE;
-]
-
-//--------------------------------------------------------------------------
-SfxBoolItem CellVertCenter FN_TABLE_VERT_CENTER
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TABLE;
-]
-
-//--------------------------------------------------------------------------
-SfxBoolItem CellVertTop FN_TABLE_VERT_NONE
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TABLE;
-]
-
-//--------------------------------------------------------------------------
SfxBoolItem ChainFrames FN_FRAME_CHAIN
[
@@ -3459,6 +3378,30 @@ SfxVoidItem GraphicDialog FN_FORMAT_GRAF
GroupId = GID_GRAPHIC;
]
//--------------------------------------------------------------------------
+SfxVoidItem ObjectWrapDialog FN_PROPERTY_WRAP_DLG
+()
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Asynchron;
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_GRAPHIC;
+]
+//--------------------------------------------------------------------------
SfxVoidItem SaveGraphic FN_SAVE_GRAPHIC
()
[
@@ -6349,6 +6292,30 @@ SfxVoidItem PageDialog FN_FORMAT_PAGE_DL
GroupId = GID_FORMAT;
]
+SfxVoidItem PageSettingDialog FN_FORMAT_PAGE_SETTING_DLG
+()
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Asynchron;
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
//--------------------------------------------------------------------------
SfxVoidItem PageDown FN_PAGEDOWN
()
@@ -10287,3 +10254,83 @@ SfxVoidItem CopyHyperlinkLocation FN_COP
ToolBoxConfig = TRUE,
GroupId = GID_EDIT;
]
+
+
+SfxInt16Item SwPageColumn SID_ATTR_PAGE_COLUMN
+
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = TRUE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
+SvxLongULSpaceItem SwPageULMargin SID_ATTR_PAGE_ULSPACE
+
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
+SvxLongLRSpaceItem SwPageLRMargin SID_ATTR_PAGE_LRSPACE
+
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
Modified: openoffice/trunk/main/sw/sdi/swslots.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/swslots.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/swslots.sdi (original)
+++ openoffice/trunk/main/sw/sdi/swslots.sdi Wed Apr 10 09:20:16 2013
@@ -74,7 +74,8 @@ ModulePrefix( "Sw" )
include "wtextsh.sdi"
include "_drwbase.sdi"
- include "drwbassh.sdi"
+ include "sidebar.sdi"
+ include "drwbassh.sdi"
include "wdrwbase.sdi"
include "_formsh.sdi"
Modified: openoffice/trunk/main/sw/sdi/wdrwbase.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/wdrwbase.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/wdrwbase.sdi (original)
+++ openoffice/trunk/main/sw/sdi/wdrwbase.sdi Wed Apr 10 09:20:16 2013
@@ -31,6 +31,7 @@ interface WebDrawBase : BaseTextDrawBase
shell SwWebDrawBaseShell: SwBaseShell
{
import WebDrawBase[Automation];
+ import Sidebar;
SID_OBJECT_ALIGN
[
Modified: openoffice/trunk/main/sw/source/core/doc/docdesc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docdesc.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/docdesc.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/docdesc.cxx Wed Apr 10 09:20:16 2013
@@ -24,6 +24,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
+#include <cmdid.h>
#include <hintids.hxx>
#include <vcl/virdev.hxx>
#include <svx/svdmodel.hxx>
@@ -34,6 +35,8 @@
#include <tools/urlobj.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/printer.hxx>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
#include <unotools/localedatawrapper.hxx>
#include <com/sun/star/document/PrinterIndependentLayout.hpp>
#include <fmtfsize.hxx>
@@ -424,6 +427,18 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, c
{
GetIDocumentUndoRedo().DelAllUndoObj();
}
+
+ SfxBindings* pBindings =
+ ( GetDocShell() && GetDocShell()->GetDispatcher() ) ? GetDocShell()->GetDispatcher()->GetBindings() : 0;
+ if ( pBindings )
+ {
+ pBindings->Invalidate( SID_ATTR_PAGE_COLUMN );
+ pBindings->Invalidate( SID_ATTR_PAGE );
+ pBindings->Invalidate( SID_ATTR_PAGE_SIZE );
+ pBindings->Invalidate( SID_ATTR_PAGE_ULSPACE );
+ pBindings->Invalidate( SID_ATTR_PAGE_LRSPACE );
+ }
+
}
/*************************************************************************
Modified: openoffice/trunk/main/sw/source/core/draw/drawdoc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/draw/drawdoc.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/draw/drawdoc.cxx (original)
+++ openoffice/trunk/main/sw/source/core/draw/drawdoc.cxx Wed Apr 10 09:20:16 2013
@@ -76,8 +76,8 @@ SwDrawDocument::SwDrawDocument( SwDoc* p
SetObjectShell( pDocSh );
SvxColorTableItem* pColItem = ( SvxColorTableItem* )
( pDocSh->GetItem( SID_COLOR_TABLE ) );
- XColorTable *pXCol = pColItem ? pColItem->GetColorTable() :
- XColorTable::GetStdColorTable();
+ XColorList *pXCol = pColItem ? pColItem->GetColorTable() :
+ XColorList::GetStdColorList();
SetColorTable( pXCol );
if ( !pColItem )
@@ -92,7 +92,7 @@ SwDrawDocument::SwDrawDocument( SwDoc* p
SetObjectShell( pDocSh );
}
else
- SetColorTable( XColorTable::GetStdColorTable() );
+ SetColorTable( XColorList::GetStdColorList() );
// copy all the default values to the SdrModel
SfxItemPool* pSdrPool = pD->GetAttrPool().GetSecondaryPool();
Modified: openoffice/trunk/main/sw/source/core/edit/ednumber.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/edit/ednumber.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/edit/ednumber.cxx (original)
+++ openoffice/trunk/main/sw/source/core/edit/ednumber.cxx Wed Apr 10 09:20:16 2013
@@ -164,7 +164,88 @@ sal_Bool SwEditShell::NoNum()
return bRet;
}
// Loeschen, Splitten der Aufzaehlungsliste
+sal_Bool SwEditShell::SelectionHasNumber() const
+{
+ sal_Bool bResult = HasNumber();
+ const SwTxtNode * pTxtNd =
+ GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+ if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) {
+ SwPamRanges aRangeArr( *GetCrsr() );
+ SwPaM aPam( *GetCrsr()->GetPoint() );
+ for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n )
+ {
+ aRangeArr.SetPam( n, aPam );
+ {
+ sal_uInt32 nStt = aPam.GetPoint()->nNode.GetIndex(),
+ nEnd = aPam.GetMark()->nNode.GetIndex();
+ if( nStt > nEnd )
+ {
+ sal_uInt32 nTmp = nStt; nStt = nEnd; nEnd = nTmp;
+ }
+ for (sal_uInt32 nPos = nStt; nPos<=nEnd; nPos++) {
+ SwTxtNode * pTxtNd = pDoc->GetNodes()[nPos]->GetTxtNode();
+ if (pTxtNd && pTxtNd->Len()!=0)
+ {
+ bResult = pTxtNd->HasNumber();
+
+ // --> OD 2005-10-26 #b6340308#
+ // special case: outline numbered, not counted paragraph
+ if ( bResult &&
+ pTxtNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
+ !pTxtNd->IsCountedInList() )
+ {
+ bResult = sal_False;
+ }
+ if (bResult==sal_False) {
+ break;
+ }
+ // <--
+ }
+ }
+ }
+ }
+
+ }
+ return bResult;
+}
+//Sym3_879 add a new function to determine number on/off status
+sal_Bool SwEditShell::SelectionHasBullet() const
+{
+ sal_Bool bResult = HasBullet();
+ const SwTxtNode * pTxtNd =
+ GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+ if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) {
+ SwPamRanges aRangeArr( *GetCrsr() );
+ SwPaM aPam( *GetCrsr()->GetPoint() );
+ for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n )
+ {
+ aRangeArr.SetPam( n, aPam );
+ {
+ sal_uInt32 nStt = aPam.GetPoint()->nNode.GetIndex(),
+ nEnd = aPam.GetMark()->nNode.GetIndex();
+ if( nStt > nEnd )
+ {
+ sal_uInt32 nTmp = nStt; nStt = nEnd; nEnd = nTmp;
+ }
+ for (sal_uInt32 nPos = nStt; nPos<=nEnd; nPos++) {
+ SwTxtNode * pTxtNd = pDoc->GetNodes()[nPos]->GetTxtNode();
+ if (pTxtNd && pTxtNd->Len()!=0)
+ {
+ bResult = pTxtNd->HasBullet();
+
+ if (bResult==sal_False) {
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ }
+
+ return bResult;
+}
// -> #i29560#
sal_Bool SwEditShell::HasNumber() const
{
Modified: openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx (original)
+++ openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx Wed Apr 10 09:20:16 2013
@@ -2486,10 +2486,10 @@ sal_uInt8 SwFEShell::IsSelObjProtected(
{
// TODO/LATER: use correct aspect
const bool bNeverResize = (embed::EmbedMisc::EMBED_NEVERRESIZE & xObj->getStatus( embed::Aspects::MSOLE_CONTENT ));
- if ( (FLYPROTECT_CONTENT & eType) && bNeverResize )
- {
- nChk |= FLYPROTECT_SIZE;
- nChk |= FLYPROTECT_FIXED;
+ if ( ( (FLYPROTECT_CONTENT & eType) || (FLYPROTECT_SIZE & eType) ) && bNeverResize )
+ {
+ nChk |= FLYPROTECT_SIZE;
+ nChk |= FLYPROTECT_FIXED;
}
// set FLYPROTECT_POS if it is a Math object anchored 'as char' and baseline alignment is activated
Modified: openoffice/trunk/main/sw/source/ui/app/docsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docsh2.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/docsh2.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docsh2.cxx Wed Apr 10 09:20:16 2013
@@ -1019,7 +1019,7 @@ void SwDocShell::Execute(SfxRequest& rRe
case SID_GET_COLORTABLE:
{
SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
- XColorTable* pTable = pColItem->GetColorTable();
+ XColorList* pTable = pColItem->GetColorTable();
rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable));
}
break;
Modified: openoffice/trunk/main/sw/source/ui/app/docshdrw.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docshdrw.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/docshdrw.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docshdrw.cxx Wed Apr 10 09:20:16 2013
@@ -73,7 +73,7 @@ void SwDocShell::InitDraw()
rOutliner.SetHyphenator( xHyphenator );
}
else
- PutItem( SvxColorTableItem( XColorTable::GetStdColorTable(), SID_COLOR_TABLE ));
+ PutItem( SvxColorTableItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ));
}
Modified: openoffice/trunk/main/sw/source/ui/app/docshini.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docshini.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/docshini.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docshini.cxx Wed Apr 10 09:20:16 2013
@@ -439,9 +439,9 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxOb
// wird nur die DocInfo fuer den Explorer gelesen, ist das Item nicht da
if(pColItem)
{
- XColorTable* pTable = pColItem->GetColorTable();
+ XColorList* pTable = pColItem->GetColorTable();
// wurde eine neue Table angelegt, muss sie auch geloescht werden.
- if((void*)pTable != (void*)(XColorTable::GetStdColorTable()) )
+ if((void*)pTable != (void*)(XColorList::GetStdColorList()) )
delete pTable;
}
Modified: openoffice/trunk/main/sw/source/ui/app/docst.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docst.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/docst.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docst.cxx Wed Apr 10 09:20:16 2013
@@ -283,7 +283,7 @@ void SwDocShell::ExecStyleSheet( SfxRequ
if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY,
sal_False, &pItem ))
{
- sal_uInt16 nFamily = ((const SfxUInt16Item*)pItem)->GetValue();
+ const sal_uInt16 nFamily = ((const SfxUInt16Item*)pItem)->GetValue();
String sName;
sal_uInt16 nMask = 0;
@@ -298,7 +298,7 @@ void SwDocShell::ExecStyleSheet( SfxRequ
sal_False, &pItem ))
sParent = ((const SfxStringItem*)pItem)->GetValue();
- nRet = Edit( sName, sParent, nFamily, nMask, sal_True, sal_False, 0, rReq.IsAPI() );
+ nRet = Edit( sName, sParent, nFamily, nMask, sal_True, 0, 0, rReq.IsAPI() );
}
break;
@@ -458,7 +458,7 @@ void SwDocShell::ExecStyleSheet( SfxRequ
switch(nSlot)
{
case SID_STYLE_EDIT:
- nRet = Edit(aParam, aEmptyStr, nFamily, nMask, sal_False, sal_False, pActShell );
+ nRet = Edit(aParam, aEmptyStr, nFamily, nMask, sal_False, 0, pActShell );
break;
case SID_STYLE_DELETE:
nRet = Delete(aParam, nFamily);
@@ -509,9 +509,15 @@ void SwDocShell::ExecStyleSheet( SfxRequ
--------------------------------------------------------------------*/
-sal_uInt16 SwDocShell::Edit( const String &rName, const String &rParent, sal_uInt16 nFamily, sal_uInt16 nMask,
- sal_Bool bNew, sal_Bool bColumn, SwWrtShell* pActShell,
- sal_Bool bBasic )
+sal_uInt16 SwDocShell::Edit(
+ const String &rName,
+ const String &rParent,
+ const sal_uInt16 nFamily,
+ sal_uInt16 nMask,
+ const sal_Bool bNew,
+ const sal_uInt16 nSlot,
+ SwWrtShell* pActShell,
+ const sal_Bool bBasic )
{
ASSERT(GetWrtShell(), "Keine Shell, keine Styles");
SfxStyleSheetBase *pStyle = 0;
@@ -671,14 +677,14 @@ sal_uInt16 SwDocShell::Edit( const Strin
!pCurrShell->getIDocumentDeviceAccess()->getPrinter( false ) )
pCurrShell->InitPrt( pCurrShell->getIDocumentDeviceAccess()->getPrinter( true ) );
- PutItem(SfxUInt16Item(SID_HTML_MODE, nHtmlMode));
- FieldUnit eMetric = ::GetDfltMetric(0 != (HTMLMODE_ON&nHtmlMode));
+ PutItem(SfxUInt16Item(SID_HTML_MODE, nHtmlMode));
+ FieldUnit eMetric = ::GetDfltMetric(0 != (HTMLMODE_ON&nHtmlMode));
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
- SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateTemplateDialog( DLG_TEMPLATE_BASE,
- 0, *(xTmp.get()), nFamily, bColumn,
- pActShell ? pActShell : pWrtShell, bNew);
+ 0, *(xTmp.get()), nFamily, nSlot,
+ pActShell ? pActShell : pWrtShell, bNew);
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if(RET_OK == pDlg->Execute())
{
@@ -1286,9 +1292,12 @@ void SwDocShell::_LoadStyles( SfxObjectS
}
-void SwDocShell::FormatPage( const String& rPage, sal_Bool bColumn, SwWrtShell* pActShell )
+void SwDocShell::FormatPage(
+ const String& rPage,
+ const sal_uInt16 nSlot,
+ SwWrtShell& rActShell )
{
- Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, bColumn, pActShell);
+ Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, nSlot, &rActShell);
}
Bitmap SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode )
Modified: openoffice/trunk/main/sw/source/ui/app/mn.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/mn.src?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/mn.src (original)
+++ openoffice/trunk/main/sw/source/ui/app/mn.src Wed Apr 10 09:20:16 2013
@@ -430,20 +430,20 @@ location: <project>/uiconfig/[swriter|sw
SEPARATOR ; \
MenuItem\
{\
- Identifier = FN_TABLE_VERT_NONE ; \
- HelpId = CMD_FN_TABLE_VERT_NONE ; \
+ Identifier = SID_TABLE_VERT_NONE ; \
+ HelpId = CMD_SID_TABLE_VERT_NONE ; \
Text [ en-US ] = "~Top" ; \
};\
MenuItem\
{\
- Identifier = FN_TABLE_VERT_CENTER ; \
- HelpId = CMD_FN_TABLE_VERT_CENTER ; \
+ Identifier = SID_TABLE_VERT_CENTER ; \
+ HelpId = CMD_SID_TABLE_VERT_CENTER ; \
Text [ en-US ] = "C~enter" ; \
};\
MenuItem\
{\
- Identifier = FN_TABLE_VERT_BOTTOM ; \
- HelpId = CMD_FN_TABLE_VERT_BOTTOM ; \
+ Identifier = SID_TABLE_VERT_BOTTOM ; \
+ HelpId = CMD_SID_TABLE_VERT_BOTTOM ; \
Text [ en-US ] = "~Bottom" ; \
};\
SEPARATOR ; \
Modified: openoffice/trunk/main/sw/source/ui/app/swmodule.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/swmodule.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/swmodule.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/swmodule.cxx Wed Apr 10 09:20:16 2013
@@ -134,6 +134,7 @@
#include <mailmergechildwindow.hxx>
#include <modcfg.hxx>
#include <fontcfg.hxx>
+#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/taskpane.hxx>
#include <sfx2/evntconf.hxx>
#include <sfx2/appuno.hxx>
@@ -464,7 +465,8 @@ void SwDLL::RegisterControls()
::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod);
- ::sfx2::TaskPaneWrapper::RegisterChildWindow( sal_False, pMod );
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(NULL, pMod);
+ ::sfx2::TaskPaneWrapper::RegisterChildWindow(NULL, pMod);
}
Modified: openoffice/trunk/main/sw/source/ui/config/optpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/config/optpage.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/config/optpage.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/config/optpage.cxx Wed Apr 10 09:20:16 2013
@@ -2133,7 +2133,7 @@ void SwRedlineOptionsTabPage::Reset( con
aDeletedColorLB.InsertEntry(sAuthor);
aChangedColorLB.InsertEntry(sAuthor);
- XColorTable* pColorTbl = XColorTable::GetStdColorTable();
+ XColorList* pColorTbl = XColorList::GetStdColorList();
sal_uInt16 i;
for( i = 0; i < pColorTbl->Count(); ++i )
{
Modified: openoffice/trunk/main/sw/source/ui/dialog/swdlgfact.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/dialog/swdlgfact.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/dialog/swdlgfact.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/dialog/swdlgfact.cxx Wed Apr 10 09:20:16 2013
@@ -1295,7 +1295,7 @@ SfxAbstractTabDialog* SwAbstractDialogFa
Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
- sal_Bool bColumn,
+ const sal_uInt16 nSlot,
SwWrtShell* pActShell,
sal_Bool bNew ) //add for SwTemplateDlg
{
@@ -1303,7 +1303,7 @@ SfxAbstractTabDialog* SwAbstractDialogFa
switch ( nResId )
{
case DLG_TEMPLATE_BASE :
- pDlg = new SwTemplateDlg( pParent, rBase, nRegion, bColumn, pActShell, bNew );
+ pDlg = new SwTemplateDlg( pParent, rBase, nRegion, nSlot, pActShell, bNew );
break;
default:
break;
Modified: openoffice/trunk/main/sw/source/ui/dialog/swdlgfact.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/dialog/swdlgfact.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/dialog/swdlgfact.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/dialog/swdlgfact.hxx Wed Apr 10 09:20:16 2013
@@ -498,14 +498,14 @@ public:
sal_Bool bFmt = sal_False,
sal_uInt16 nDefPage = 0,
const String* pFmtStr = 0); //add for SwFrmDlg
- virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
- Window* pParent,
- SfxStyleSheetBase& rBase,
- sal_uInt16 nRegion,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bNew = sal_False ); //add for SwTemplateDlg
- virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
+ virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+ Window* pParent,
+ SfxStyleSheetBase& rBase,
+ sal_uInt16 nRegion,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ sal_Bool bNew = sal_False ); //add for SwTemplateDlg
+ virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell); //add for SwGlossaryDlg
Modified: openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx Wed Apr 10 09:20:16 2013
@@ -106,7 +106,7 @@ extern SW_DLLPUBLIC SwWrtShell* GetActiv
SwTemplateDlg::SwTemplateDlg(Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
- sal_Bool bColumn,
+ const sal_uInt16 nSlot,
SwWrtShell* pActShell,
sal_Bool bNew ) :
SfxStyleDialog( pParent,
@@ -260,15 +260,6 @@ SwTemplateDlg::SwTemplateDlg(Window* p
AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
- // Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen)
-/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase.
- GetItemSet().Get(RES_FRM_SIZE));
- if( !aSize.GetWidth() )
- {
- aSize.SetWidth( DFLT_WIDTH );
- aSize.SetHeight( DFLT_HEIGHT );
- rBase.GetItemSet().Put( aSize );
- }*/
break;
}
// Seitenvorlagen
@@ -277,34 +268,40 @@ SwTemplateDlg::SwTemplateDlg(Window* p
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
- AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)),
- SvxHeaderPage::Create,
- SvxHeaderPage::GetRanges );
- AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)),
- SvxFooterPage::Create,
- SvxFooterPage::GetRanges );
- if(bColumn)
- SetCurPageId(TP_COLUMN);
+ AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)),
+ SvxHeaderPage::Create,
+ SvxHeaderPage::GetRanges );
+ AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)),
+ SvxFooterPage::Create,
+ SvxFooterPage::GetRanges );
+ if ( nSlot == FN_FORMAT_PAGE_COLUMN_DLG )
+ {
+ SetCurPageId(TP_COLUMN);
+ }
+ else if ( nSlot == FN_FORMAT_PAGE_SETTING_DLG )
+ {
+ SetCurPageId(TP_PAGE_STD);
+ }
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");
- AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)),
+ AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)),
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ),
- sal_False,
- 1 ); // nach der Verwalten-Page
- if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell()))
- {
+ sal_False,
+ 1 ); // nach der Verwalten-Page
+ if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell()))
+ {
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
- AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)),
- pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
- AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)),
- SwColumnPage::Create,
- SwColumnPage::GetRanges );
- AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)),
- SwFootNotePage::Create,
- SwFootNotePage::GetRanges );
+ AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)),
+ pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
+ AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)),
+ SwColumnPage::Create,
+ SwColumnPage::GetRanges );
+ AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)),
+ SwFootNotePage::Create,
+ SwFootNotePage::GetRanges );
AddTabPage(TP_TEXTGRID_PAGE, String(SW_RES(STR_PAGE_TEXTGRID)),
SwTextGridPage::Create,
SwTextGridPage::GetRanges );
@@ -314,9 +311,9 @@ SwTemplateDlg::SwTemplateDlg(Window* p
}
- }
- break;
- // Numerierungsvorlagen
+ }
+ break;
+ // Numerierungsvorlagen
case SFX_STYLE_FAMILY_PSEUDO:
{
AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
Modified: openoffice/trunk/main/sw/source/ui/inc/drwbassh.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/drwbassh.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/drwbassh.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/drwbassh.hxx Wed Apr 10 09:20:16 2013
@@ -49,6 +49,7 @@ public:
void Execute(SfxRequest &);
void GetState(SfxItemSet &);
+ void GetDrawAttrStateForIFBX( SfxItemSet& rSet );
void DisableState(SfxItemSet &rSet) { Disable(rSet);}
sal_Bool Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
Modified: openoffice/trunk/main/sw/source/ui/inc/drwtxtsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/drwtxtsh.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/drwtxtsh.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/drwtxtsh.hxx Wed Apr 10 09:20:16 2013
@@ -60,6 +60,7 @@ public:
void Execute(SfxRequest &);
void ExecDraw(SfxRequest &);
+ void GetStatePropPanelAttr(SfxItemSet &);
void GetState(SfxItemSet &);
void GetDrawTxtCtrlState(SfxItemSet&);
Modified: openoffice/trunk/main/sw/source/ui/inc/textsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/textsh.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/textsh.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/textsh.hxx Wed Apr 10 09:20:16 2013
@@ -64,6 +64,7 @@ public:
void ExecMoveLingu(SfxRequest &);
void ExecMoveMisc(SfxRequest &);
void ExecField(SfxRequest &rReq);
+ void ExecSetNumber(SfxRequest &);
void StateField(SfxItemSet &);
void ExecIdx(SfxRequest &);
void GetIdxState(SfxItemSet &);
Modified: openoffice/trunk/main/sw/source/ui/inc/tmpdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/tmpdlg.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/tmpdlg.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/tmpdlg.hxx Wed Apr 10 09:20:16 2013
@@ -35,26 +35,29 @@ class SwWrtShell;
class SwTemplateDlg: public SfxStyleDialog
{
- sal_uInt16 nType;
- sal_uInt16 nHtmlMode;
- SwWrtShell* pWrtShell;
- sal_Bool bNewStyle;
+ sal_uInt16 nType;
+ sal_uInt16 nHtmlMode;
+ SwWrtShell* pWrtShell;
+ sal_Bool bNewStyle;
- DECL_LINK( NumOptionsHdl, PushButton* );
+ DECL_LINK( NumOptionsHdl, PushButton* );
public:
- SwTemplateDlg( Window* pParent,
- SfxStyleSheetBase& rBase,
- sal_uInt16 nRegion,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bNew = sal_False );
+ // @param nSlot
+ // Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
+ // Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
+ SwTemplateDlg( Window* pParent,
+ SfxStyleSheetBase& rBase,
+ sal_uInt16 nRegion,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ sal_Bool bNew = sal_False );
- ~SwTemplateDlg();
- const SfxItemSet* GetRefreshedSet();
+ ~SwTemplateDlg();
+ const SfxItemSet* GetRefreshedSet();
- virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
- virtual short Ok();
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
+ virtual short Ok();
};
Modified: openoffice/trunk/main/sw/source/ui/misc/pggrid.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/misc/pggrid.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/misc/pggrid.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/misc/pggrid.cxx Wed Apr 10 09:20:16 2013
@@ -143,7 +143,7 @@ SwTextGridPage::SwTextGridPage(Window *p
aDisplayCB.SetClickHdl(LINK(this, SwTextGridPage, DisplayGridHdl));
- XColorTable* pColorTbl = XColorTable::GetStdColorTable();
+ XColorList* pColorTbl = XColorList::GetStdColorList();
aColorLB.InsertAutomaticEntry();
for( sal_uInt16 i = 0; i < pColorTbl->Count(); ++i )
{