openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1470868 [27/40] - in /openoffice/branches/ia2: ./ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/win/ extras/l10n/source/fi/ main/ main/animations/source/animcore/ main/automation/source/communi/ main/basctl/source/basicide/ ...
Date Tue, 23 Apr 2013 09:51:53 GMT
Modified: openoffice/branches/ia2/main/svx/source/xoutdev/xtabcolr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/xoutdev/xtabcolr.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/xoutdev/xtabcolr.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/xoutdev/xtabcolr.cxx Tue Apr 23 09:51:15 2013
@@ -55,78 +55,63 @@ static char const aChckColor[]  = { 0x04
 static char const aChckColor0[] = { 0x04, 0x00, 'S','O','C','0'};	// = 5.2
 static char const aChckXML[]    = { '<', '?', 'x', 'm', 'l' };		// = 6.0
 
-// ------------------
-// class XColorTable
-// ------------------
-
-static XColorTable* pTable=0;
-
 /*************************************************************************
 |*
-|* XColorTable::XColorTable()
+|* XColorList::XColorList()
 |*
 *************************************************************************/
 
-XColorTable::XColorTable( const String& rPath,
-							XOutdevItemPool* pInPool,
-							sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-				XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+static XColorList* pStaticGlobalColorList = 0;
+
+XColorList::XColorList( const String& rPath, XOutdevItemPool* pInPool ) :
+				XPropertyList( rPath, pInPool )
 {
-	// ColorTable braucht keine eigene BmpTable
-	// pBmpTable = new Table( nInitSize, nReSize );
 }
 
 /************************************************************************/
 
-XColorTable::~XColorTable()
-{
-}
-
-XColorTable* XColorTable::GetStdColorTable()
+XColorList::~XColorList()
 {
-	if ( !pTable )
-		pTable = new XColorTable( SvtPathOptions().GetPalettePath() );
-	return pTable;
 }
 
 /************************************************************************/
 
-XColorEntry* XColorTable::Replace(long nIndex, XColorEntry* pEntry )
+XColorEntry* XColorList::Replace(XColorEntry* pEntry, long nIndex )
 {
-	return (XColorEntry*) XPropertyTable::Replace(nIndex, pEntry);
+	return (XColorEntry*) XPropertyList::Replace(pEntry, nIndex);
 }
 
 /************************************************************************/
 
-XColorEntry* XColorTable::Remove(long nIndex)
+XColorEntry* XColorList::Remove(long nIndex)
 {
-	return (XColorEntry*) XPropertyTable::Remove(nIndex, 0);
+	return (XColorEntry*) XPropertyList::Remove(nIndex, 0);
 }
 
 /************************************************************************/
 
-XColorEntry* XColorTable::GetColor(long nIndex) const
+XColorEntry* XColorList::GetColor(long nIndex) const
 {
-	return (XColorEntry*) XPropertyTable::Get(nIndex, 0);
+	return (XColorEntry*) XPropertyList::Get(nIndex, 0);
 }
 
 /************************************************************************/
 
-sal_Bool XColorTable::Load()
+sal_Bool XColorList::Load()
 {
-	if( bTableDirty )
+	if( mbListDirty )
 	{
-		bTableDirty = 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( pszExtColor, 3 ) );
@@ -139,17 +124,17 @@ sal_Bool XColorTable::Load()
 
 /************************************************************************/
 
-sal_Bool XColorTable::Save()
+sal_Bool XColorList::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( pszExtColor, 3 ) );
@@ -160,7 +145,7 @@ sal_Bool XColorTable::Save()
 
 /************************************************************************/
 
-sal_Bool XColorTable::Create()
+sal_Bool XColorList::Create()
 {
 	XubString aStr;
 	xub_StrLen nLen;
@@ -217,328 +202,249 @@ sal_Bool XColorTable::Create()
 
 	for( sal_uInt16 n = 0; n < 16; ++n )
 	{
-		Insert( n, new XColorEntry( Color( aColTab[n] ),
-									String( ResId( aResId[ n ], rRes )) ) );
+		Insert( new XColorEntry( Color( aColTab[n] ), String( ResId( aResId[ n ], rRes )) ), n );
 	}
 
 	aStr = SVX_RESSTR( RID_SVXSTR_GREY );
 	aStr.AppendAscii(" 80%");
 	nLen = aStr.Len() - 3;
-	Insert(16, new XColorEntry( Color( 51, 51, 51 ), aStr ) );
+	Insert( new XColorEntry( Color( 51, 51, 51 ), aStr ) , 16);
 	aStr.SetChar(nLen, sal_Unicode('7'));
-	Insert(17, new XColorEntry( Color( 76, 76, 76 ), aStr ) );
+	Insert( new XColorEntry( Color( 76, 76, 76 ), aStr ) , 17);
 	aStr.SetChar(nLen, sal_Unicode('6'));
-	Insert(18, new XColorEntry( Color(102,102,102 ), aStr ) );
+	Insert( new XColorEntry( Color(102,102,102 ), aStr ) , 18);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert(19, new XColorEntry( Color(153,153,153 ), aStr ) );
+	Insert( new XColorEntry( Color(153,153,153 ), aStr ) , 19);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert(20, new XColorEntry( Color(179,179,179 ), aStr ) );
+	Insert( new XColorEntry( Color(179,179,179 ), aStr ) , 20);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert(21, new XColorEntry( Color(204,204,204 ), aStr ) );
+	Insert( new XColorEntry( Color(204,204,204 ), aStr ) , 21);
 	// BM: new 15%
 	aStr.SetChar(nLen, sal_Unicode('1'));
 	aStr.SetChar(nLen + 1, sal_Unicode('5'));
-	Insert(22, new XColorEntry( Color(217,217,217 ), aStr ) );
+	Insert( new XColorEntry( Color(217,217,217 ), aStr ) , 22);
 	aStr.SetChar(nLen + 1, sal_Unicode('0'));
-	Insert(23, new XColorEntry( Color(230,230,230 ), aStr ) );
-	Insert(24, new XColorEntry( Color(230,230,255 ), SVX_RESSTR( RID_SVXSTR_BLUEGREY ) ) );
+	Insert( new XColorEntry( Color(230,230,230 ), aStr ) , 23);
+	Insert( new XColorEntry( Color(230,230,255 ), SVX_RESSTR( RID_SVXSTR_BLUEGREY ) ) , 24);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_RED );
 	aStr.AppendAscii(" 1");
 	nLen = aStr.Len() - 1;
-	Insert(25, new XColorEntry( Color(255, 51,102 ), aStr ) );
+	Insert( new XColorEntry( Color(255, 51,102 ), aStr ) , 25);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert(26, new XColorEntry( Color(220, 35,  0 ), aStr ) );
+	Insert( new XColorEntry( Color(220, 35,  0 ), aStr ) , 26);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert(27, new XColorEntry( Color(184, 71,  0 ), aStr ) );
+	Insert( new XColorEntry( Color(184, 71,  0 ), aStr ) , 27);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert(28, new XColorEntry( Color(255, 51, 51 ), aStr ) );
+	Insert( new XColorEntry( Color(255, 51, 51 ), aStr ) , 28);
 	aStr.SetChar(nLen, sal_Unicode('5'));
-	Insert(29, new XColorEntry( Color(235, 97, 61 ), aStr ) );
+	Insert( new XColorEntry( Color(235, 97, 61 ), aStr ) , 29);
 	aStr.SetChar(nLen, sal_Unicode('6'));
-	Insert(30, new XColorEntry( Color(184, 71, 71 ), aStr ) );
+	Insert( new XColorEntry( Color(184, 71, 71 ), aStr ) , 30);
 	aStr.SetChar(nLen, sal_Unicode('7'));
-	Insert(31, new XColorEntry( Color(184,  0, 71 ), aStr ) );
+	Insert( new XColorEntry( Color(184,  0, 71 ), aStr ) , 31);
 	aStr.SetChar(nLen, sal_Unicode('8'));
-	Insert(32, new XColorEntry( Color(153, 40, 76 ), aStr ) );
+	Insert( new XColorEntry( Color(153, 40, 76 ), aStr ) , 32);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_MAGENTA );
 	aStr.AppendAscii(" 1");
 	nLen = aStr.Len() - 1;
-	Insert(33, new XColorEntry( Color(148,  0,107 ), aStr ) );
+	Insert( new XColorEntry( Color(148,  0,107 ), aStr ) , 33);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert(34, new XColorEntry( Color(148, 71,107 ), aStr ) );
+	Insert( new XColorEntry( Color(148, 71,107 ), aStr ) , 34);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert(35, new XColorEntry( Color(148, 71,148 ), aStr ) );
+	Insert( new XColorEntry( Color(148, 71,148 ), aStr ) , 35);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert(36, new XColorEntry( Color(153,102,204 ), aStr ) );
+	Insert( new XColorEntry( Color(153,102,204 ), aStr ) , 36);
 	aStr.SetChar(nLen, sal_Unicode('5'));
-	Insert(37, new XColorEntry( Color(107, 71,148 ), aStr ) );
+	Insert( new XColorEntry( Color(107, 71,148 ), aStr ) , 37);
 	aStr.SetChar(nLen, sal_Unicode('6'));
-	Insert(38, new XColorEntry( Color(107, 35,148 ), aStr ) );
+	Insert( new XColorEntry( Color(107, 35,148 ), aStr ) , 38);
 	aStr.SetChar(nLen, sal_Unicode('7'));
-	Insert(39, new XColorEntry( Color(107,  0,148 ), aStr ) );
+	Insert( new XColorEntry( Color(107,  0,148 ), aStr ) , 39);
 	aStr.SetChar(nLen, sal_Unicode('8'));
-	Insert(40, new XColorEntry( Color( 94, 17,166 ), aStr ) );
+	Insert( new XColorEntry( Color( 94, 17,166 ), aStr ) , 40);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_BLUE );
 	aStr.AppendAscii(" 1");
 	nLen = aStr.Len() - 1;
-	Insert(41, new XColorEntry( Color( 40,  0,153 ), aStr ) );
+	Insert( new XColorEntry( Color( 40,  0,153 ), aStr ) , 41);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert(42, new XColorEntry( Color( 71,  0,184 ), aStr ) );
+	Insert( new XColorEntry( Color( 71,  0,184 ), aStr ) , 42);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert(43, new XColorEntry( Color( 35,  0,220 ), aStr ) );
+	Insert( new XColorEntry( Color( 35,  0,220 ), aStr ) , 43);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert(44, new XColorEntry( Color( 35, 35,220 ), aStr ) );
+	Insert( new XColorEntry( Color( 35, 35,220 ), aStr ) , 44);
 	aStr.SetChar(nLen, sal_Unicode('5'));
-	Insert(45, new XColorEntry( Color(  0, 71,255 ), aStr ) );
+	Insert( new XColorEntry( Color(  0, 71,255 ), aStr ) , 45);
 	aStr.SetChar(nLen, sal_Unicode('6'));
-	Insert(46, new XColorEntry( Color(  0,153,255 ), aStr ) );
+	Insert( new XColorEntry( Color(  0,153,255 ), aStr ) , 46);
 	aStr.SetChar(nLen, sal_Unicode('7'));
-	Insert(47, new XColorEntry( Color(  0,184,255 ), aStr ) );
+	Insert( new XColorEntry( Color(  0,184,255 ), aStr ) , 47);
 	aStr.SetChar(nLen, sal_Unicode('8'));
-	Insert(48, new XColorEntry( Color(153,204,255 ), aStr ) );
+	Insert( new XColorEntry( Color(153,204,255 ), aStr ) , 48);
 	//Insert(48, new XColorEntry( Color( 46,215,255 ), aStr ) );
 
 	aStr = SVX_RESSTR( RID_SVXSTR_CYAN );
 	aStr.AppendAscii(" 1");
 	nLen = aStr.Len() - 1;
-	Insert(49, new XColorEntry( Color(  0,220,255 ), aStr ) );
+	Insert( new XColorEntry( Color(  0,220,255 ), aStr ) , 49);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert(50, new XColorEntry( Color(  0,204,204 ), aStr ) );
+	Insert( new XColorEntry( Color(  0,204,204 ), aStr ) , 50);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert(51, new XColorEntry( Color( 35,184,220 ), aStr ) );
+	Insert( new XColorEntry( Color( 35,184,220 ), aStr ) , 51);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert(52, new XColorEntry( Color( 71,184,184 ), aStr ) );
+	Insert( new XColorEntry( Color( 71,184,184 ), aStr ) , 52);
 	aStr.SetChar(nLen, sal_Unicode('5'));
-	Insert(53, new XColorEntry( Color( 51,163,163 ), aStr ) );
+	Insert( new XColorEntry( Color( 51,163,163 ), aStr ) , 53);
 	aStr.SetChar(nLen, sal_Unicode('6'));
-	Insert(54, new XColorEntry( Color( 25,138,138 ), aStr ) );
+	Insert( new XColorEntry( Color( 25,138,138 ), aStr ) , 54);
 	aStr.SetChar(nLen, sal_Unicode('7'));
-	Insert(55, new XColorEntry( Color(  0,107,107 ), aStr ) );
+	Insert( new XColorEntry( Color(  0,107,107 ), aStr ) , 55);
 	aStr.SetChar(nLen, sal_Unicode('8'));
-	Insert(56, new XColorEntry( Color(  0, 74, 74 ), aStr ) );
+	Insert( new XColorEntry( Color(  0, 74, 74 ), aStr ) , 56);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_GREEN );
 	aStr.AppendAscii(" 1");
 	nLen = aStr.Len() - 1;
-	Insert(57, new XColorEntry( Color( 53, 94,  0 ), aStr ) );
+	Insert( new XColorEntry( Color( 53, 94,  0 ), aStr ) , 57);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert(58, new XColorEntry( Color( 92,133, 38 ), aStr ) );
+	Insert( new XColorEntry( Color( 92,133, 38 ), aStr ) , 58);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert(59, new XColorEntry( Color(125,166, 71 ), aStr ) );
+	Insert( new XColorEntry( Color(125,166, 71 ), aStr ) , 59);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert(60, new XColorEntry( Color(148,189, 94 ), aStr ) );
+	Insert( new XColorEntry( Color(148,189, 94 ), aStr ) , 60);
 	aStr.SetChar(nLen, sal_Unicode('5'));
-	Insert(61, new XColorEntry( Color(  0,174,  0 ), aStr ) );
+	Insert( new XColorEntry( Color(  0,174,  0 ), aStr ) , 61);
 	aStr.SetChar(nLen, sal_Unicode('6'));
-	Insert(62, new XColorEntry( Color( 51,204,102 ), aStr ) );
+	Insert( new XColorEntry( Color( 51,204,102 ), aStr ) , 62);
 	aStr.SetChar(nLen, sal_Unicode('7'));
-	Insert(63, new XColorEntry( Color( 61,235, 61 ), aStr ) );
+	Insert( new XColorEntry( Color( 61,235, 61 ), aStr ) , 63);
 	aStr.SetChar(nLen, sal_Unicode('8'));
-	Insert(64, new XColorEntry( Color( 35,255, 35 ), aStr ) );
+	Insert( new XColorEntry( Color( 35,255, 35 ), aStr ) , 64);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_YELLOW );
 	aStr.AppendAscii(" 1");
 	nLen = aStr.Len() - 1;
-	Insert(65, new XColorEntry( Color(230,255,  0 ), aStr ) );
+	Insert( new XColorEntry( Color(230,255,  0 ), aStr ) , 65);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert(66, new XColorEntry( Color(255,255,153 ), aStr ) );
+	Insert( new XColorEntry( Color(255,255,153 ), aStr ) , 66);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert(67, new XColorEntry( Color(255,255,102 ), aStr ) );
+	Insert( new XColorEntry( Color(255,255,102 ), aStr ) , 67);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert(68, new XColorEntry( Color(230,230, 76 ), aStr ) );
+	Insert( new XColorEntry( Color(230,230, 76 ), aStr ) , 68);
 	aStr.SetChar(nLen, sal_Unicode('5'));
-	Insert(69, new XColorEntry( Color(204,204,  0 ), aStr ) );
+	Insert( new XColorEntry( Color(204,204,  0 ), aStr ) , 69);
 	aStr.SetChar(nLen, sal_Unicode('6'));
-	Insert(70, new XColorEntry( Color(179,179,  0 ), aStr ) );
+	Insert( new XColorEntry( Color(179,179,  0 ), aStr ) , 70);
 	aStr.SetChar(nLen, sal_Unicode('7'));
-	Insert(71, new XColorEntry( Color(128,128, 25 ), aStr ) );
+	Insert( new XColorEntry( Color(128,128, 25 ), aStr ) , 71);
 	aStr.SetChar(nLen, sal_Unicode('8'));
-	Insert(72, new XColorEntry( Color(102,102,  0 ), aStr ) );
+	Insert( new XColorEntry( Color(102,102,  0 ), aStr ) , 72);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_BROWN );
 	aStr.AppendAscii(" 1");
 	nLen = aStr.Len() - 1;
-	Insert(73, new XColorEntry( Color( 76, 25,  0 ), aStr ) );
+	Insert( new XColorEntry( Color( 76, 25,  0 ), aStr ) , 73);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert(74, new XColorEntry( Color(102, 51,  0 ), aStr ) );
+	Insert( new XColorEntry( Color(102, 51,  0 ), aStr ) , 74);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert(75, new XColorEntry( Color(128, 76, 25 ), aStr ) );
+	Insert( new XColorEntry( Color(128, 76, 25 ), aStr ) , 75);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert(76, new XColorEntry( Color(153,102, 51 ), aStr ) );
+	Insert( new XColorEntry( Color(153,102, 51 ), aStr ) , 76);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_ORANGE );
 	aStr.AppendAscii(" 1");
 	nLen = aStr.Len() - 1;
-	Insert(77, new XColorEntry( Color(204,102, 51 ), aStr ) );
+	Insert( new XColorEntry( Color(204,102, 51 ), aStr ) , 77);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert(78, new XColorEntry( Color(255,102, 51 ), aStr ) );
+	Insert( new XColorEntry( Color(255,102, 51 ), aStr ) , 78);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert(79, new XColorEntry( Color(255,153,102 ), aStr ) );
+	Insert( new XColorEntry( Color(255,153,102 ), aStr ) , 79);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert(80, new XColorEntry( Color(255,204,153 ), aStr ) );
+	Insert( new XColorEntry( Color(255,204,153 ), aStr ) , 80);
 
 	// new chart colors
 	aStr = SVX_RESSTR( RID_SVXSTR_VIOLET );
-	Insert( 81, new XColorEntry( Color( 0x99, 0x99, 0xff ), aStr ) );
+	Insert( new XColorEntry( Color( 0x99, 0x99, 0xff ), aStr ) , 81);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_BORDEAUX );
-	Insert( 82, new XColorEntry( Color( 0x99, 0x33, 0x66 ), aStr ) );
+	Insert( new XColorEntry( Color( 0x99, 0x33, 0x66 ), aStr ) , 82);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_PALE_YELLOW );
-	Insert( 83, new XColorEntry( Color( 0xff, 0xff, 0xcc ), aStr ) );
+	Insert( new XColorEntry( Color( 0xff, 0xff, 0xcc ), aStr ) , 83);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_PALE_GREEN );
-	Insert( 84, new XColorEntry( Color( 0xcc, 0xff, 0xff ), aStr ) );
+	Insert( new XColorEntry( Color( 0xcc, 0xff, 0xff ), aStr ) , 84);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_DKVIOLET );
-	Insert( 85, new XColorEntry( Color( 0x66, 0x00, 0x66 ), aStr ) );
+	Insert( new XColorEntry( Color( 0x66, 0x00, 0x66 ), aStr ) , 85);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_SALMON );
-	Insert( 86, new XColorEntry( Color( 0xff, 0x80, 0x80 ), aStr ) );
+	Insert( new XColorEntry( Color( 0xff, 0x80, 0x80 ), aStr ) , 86);
 
 	aStr = SVX_RESSTR( RID_SVXSTR_SEABLUE );
-	Insert( 87, new XColorEntry( Color( 0x00, 0x66, 0xcc ), aStr ) );
+	Insert( new XColorEntry( Color( 0x00, 0x66, 0xcc ), aStr ) , 87);
 
 	// Sun colors
 	aStr = SVX_RESSTR( RID_SVXSTR_COLOR_SUN );
 	aStr.AppendAscii(" 1");
 	nLen = aStr.Len() - 1;
-	Insert( 88, new XColorEntry( Color( 0x33, 0x33, 0x66 ), aStr ) );
+	Insert( new XColorEntry( Color( 0x33, 0x33, 0x66 ), aStr ) , 88);
 	aStr.SetChar(nLen, sal_Unicode('2'));
-	Insert( 89, new XColorEntry( Color( 0x66, 0x66, 0x99 ), aStr ) );
+	Insert( new XColorEntry( Color( 0x66, 0x66, 0x99 ), aStr ) , 89);
 	aStr.SetChar(nLen, sal_Unicode('3'));
-	Insert( 90, new XColorEntry( Color( 0x99, 0x99, 0xcc ), aStr ) );
+	Insert( new XColorEntry( Color( 0x99, 0x99, 0xcc ), aStr ) , 90);
 	aStr.SetChar(nLen, sal_Unicode('4'));
-	Insert( 91, new XColorEntry( Color( 0xcc, 0xcc, 0xff ), aStr ) );
+	Insert( new XColorEntry( Color( 0xcc, 0xcc, 0xff ), aStr ) , 91);
 
     // Chart default colors
     aStr = SVX_RESSTR( RID_SVXSTR_COLOR_CHART );
     aStr.AppendAscii(" 1");
     nLen = aStr.Len() - 1;
-    Insert( 92, new XColorEntry( Color( 0x00, 0x45, 0x86 ), aStr ) );
+    Insert( new XColorEntry( Color( 0x00, 0x45, 0x86 ), aStr ) , 92);
     aStr.SetChar(nLen, sal_Unicode('2'));
-    Insert( 93, new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStr ) );
+    Insert( new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStr ) , 93);
     aStr.SetChar(nLen, sal_Unicode('3'));
-    Insert( 94, new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStr ) );
+    Insert( new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStr ) , 94);
     aStr.SetChar(nLen, sal_Unicode('4'));
-    Insert( 95, new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStr ) );
+    Insert( new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStr ) , 95);
     aStr.SetChar(nLen, sal_Unicode('5'));
-    Insert( 96, new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStr ) );
+    Insert( new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStr ) , 96);
     aStr.SetChar(nLen, sal_Unicode('6'));
-    Insert( 97, new XColorEntry( Color( 0x83, 0xca, 0xff ), aStr ) );
+    Insert( new XColorEntry( Color( 0x83, 0xca, 0xff ), aStr ) , 97);
     aStr.SetChar(nLen, sal_Unicode('7'));
-    Insert( 98, new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStr ) );
+    Insert( new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStr ) , 98);
     aStr.SetChar(nLen, sal_Unicode('8'));
-    Insert( 99, new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStr ) );
+    Insert( new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStr ) , 99);
     aStr.SetChar(nLen, sal_Unicode('9'));
-    Insert( 100, new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStr ) );
+    Insert( new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStr ) , 100);
     aStr.SetChar(nLen, sal_Unicode('1'));
     aStr.AppendAscii("0");
     nLen = aStr.Len() - 1;
-    Insert( 101, new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStr ) );
+    Insert( new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStr ) , 101);
     aStr.SetChar(nLen, sal_Unicode('1'));
-    Insert( 102, new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStr ) );
+    Insert( new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStr ) , 102);
     aStr.SetChar(nLen, sal_Unicode('2'));
-    Insert( 103, new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStr ) );
+    Insert( new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStr ) , 103);
 
 	return( Count() == 104 );
 }
 
 /************************************************************************/
 
-sal_Bool XColorTable::CreateBitmapsForUI()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
-	return( NULL );
-}
-
-// --------------------
-// class XColorList
-// --------------------
-
-/*************************************************************************
-|*
-|* XColorList::XColorList()
-|*
-*************************************************************************/
-
-XColorList::XColorList( const String& rPath,
-							XOutdevItemPool* pInPool,
-							sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-				XPropertyList( rPath, pInPool, nInitSize, nReSize)
-{
-	// pBmpList = new List( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XColorList::~XColorList()
+Bitmap XColorList::CreateBitmapForUI( long /*nIndex*/ )
 {
+	return Bitmap();
 }
 
 /************************************************************************/
 
-XColorEntry* XColorList::Replace(XColorEntry* pEntry, long nIndex )
-{
-	return (XColorEntry*) XPropertyList::Replace(pEntry, nIndex);
-}
-
-/************************************************************************/
-
-XColorEntry* XColorList::Remove(long nIndex)
-{
-	return (XColorEntry*) XPropertyList::Remove(nIndex, 0);
-}
-
-/************************************************************************/
-
-XColorEntry* XColorList::GetColor(long nIndex) const
-{
-	return (XColorEntry*) XPropertyList::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::Load()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::Save()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::Create()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::CreateBitmapsForUI()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
+XColorList* XColorList::GetStdColorList()
 {
-	return( NULL );
+	if ( !pStaticGlobalColorList )
+		pStaticGlobalColorList = new XColorList( SvtPathOptions().GetPalettePath() );
+	return pStaticGlobalColorList;
 }
 
 // eof

Modified: openoffice/branches/ia2/main/svx/source/xoutdev/xtabdash.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/xoutdev/xtabdash.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/xoutdev/xtabdash.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/xoutdev/xtabdash.cxx Tue Apr 23 09:51:15 2013
@@ -70,86 +70,6 @@ char const aChckDash[]  = { 0x04, 0x00, 
 char const aChckDash0[] = { 0x04, 0x00, 'S','O','D','0'};	// = 5.2
 char const aChckXML[]   = { '<', '?', 'x', 'm', 'l' };		// = 6.0
 
-// -----------------
-// class XDashTable
-// -----------------
-
-/*************************************************************************
-|*
-|* XDashTable::XDashTable()
-|*
-*************************************************************************/
-
-XDashTable::XDashTable( const String& rPath,
-							XOutdevItemPool* pInPool,
-							sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-				XPropertyTable( rPath, pInPool, nInitSize, nReSize)
-{
-	pBmpTable = new Table( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XDashTable::~XDashTable()
-{
-}
-
-/************************************************************************/
-
-XDashEntry* XDashTable::Replace(long nIndex, XDashEntry* pEntry )
-{
-	return (XDashEntry*) XPropertyTable::Replace(nIndex, pEntry);
-}
-
-/************************************************************************/
-
-XDashEntry* XDashTable::Remove(long nIndex)
-{
-	return (XDashEntry*) XPropertyTable::Remove(nIndex, 0);
-}
-
-/************************************************************************/
-
-XDashEntry* XDashTable::GetDash(long nIndex) const
-{
-	return (XDashEntry*) XPropertyTable::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XDashTable::Load()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XDashTable::Save()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XDashTable::Create()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XDashTable::CreateBitmapsForUI()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
-	return( NULL );
-}
-
 // ----------------
 // class XDashList
 // ----------------
@@ -183,6 +103,10 @@ public:
     SdrObject* getLineObject() const { return mpLineObject; }
 };
 
+// to avoid rendering trouble (e.g. vcl renderer) and to get better AAed quality,
+// use double prerender size
+static bool bUseDoubleSize = true;
+
 void XDashList::impCreate()
 {
     if(!mpData)
@@ -193,13 +117,16 @@ void XDashList::impCreate()
         VirtualDevice* pVirDev = new VirtualDevice;
 		OSL_ENSURE(0 != pVirDev, "XDashList: 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(
+            bUseDoubleSize ? getUiBitmapWidth() * 5 : getUiBitmapWidth() * 5 / 2, 
+            bUseDoubleSize ? getUiBitmapHeight() * 2 : getUiBitmapHeight())));
 		pVirDev->SetOutputSize(aSize);
         pVirDev->SetDrawMode(rStyleSettings.GetHighContrastMode()
             ? DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT
             : DRAWMODE_DEFAULT);
-    
-	    SdrModel* pSdrModel = new SdrModel();
+        pVirDev->SetBackground(rStyleSettings.GetFieldColor());
+
+        SdrModel* pSdrModel = new SdrModel();
 		OSL_ENSURE(0 != pSdrModel, "XDashList: no SdrModel created!" );
 	    pSdrModel->GetItemPool().FreezeIdRanges();
 
@@ -211,8 +138,9 @@ void XDashList::impCreate()
         pBackgroundObject->SetMergedItem(XLineStyleItem(XLINE_NONE));
         pBackgroundObject->SetMergedItem(XFillColorItem(String(), rStyleSettings.GetFieldColor()));
 
-        const basegfx::B2DPoint aStart(0, aSize.Height() / 2);
-        const basegfx::B2DPoint aEnd(aSize.Width(), aSize.Height() / 2);
+        const sal_uInt32 nHalfHeight(aSize.Height() / 2);
+        const basegfx::B2DPoint aStart(0, nHalfHeight);
+        const basegfx::B2DPoint aEnd(aSize.Width(), nHalfHeight);
 	    basegfx::B2DPolygon aPolygon;
 	    aPolygon.append(aStart);
 	    aPolygon.append(aEnd);
@@ -221,8 +149,8 @@ void XDashList::impCreate()
     	pLineObject->SetModel(pSdrModel);
         pLineObject->SetMergedItem(XLineStyleItem(XLINE_DASH));
         pLineObject->SetMergedItem(XLineColorItem(String(), rStyleSettings.GetFieldTextColor()));
-        pLineObject->SetMergedItem(XLineWidthItem(30));
-
+		const Size aLineWidth(pVirDev->PixelToLogic(Size(getUiBitmapLineWidth(), 0)));
+        pLineObject->SetMergedItem(XLineWidthItem(bUseDoubleSize ? aLineWidth.getWidth() * 2 : aLineWidth.getWidth()));
         mpData = new impXDashList(pVirDev, pSdrModel, pBackgroundObject, pLineObject);
 		OSL_ENSURE(0 != mpData, "XDashList: data creation went wrong!" );
     }
@@ -237,11 +165,13 @@ void XDashList::impDestroy()
     }
 }
 
-XDashList::XDashList(const String& rPath, XOutdevItemPool* pInPool, sal_uInt16 nInitSize, sal_uInt16 nReSize)
-:   XPropertyList(rPath, pInPool, nInitSize, nReSize),
-    mpData(0)
+XDashList::XDashList(const String& rPath, XOutdevItemPool* pInPool )
+:   XPropertyList(rPath, pInPool ),
+    mpData(0),
+    maBitmapSolidLine(),
+    maStringSolidLine(),
+    maStringNoLine()
 {
-	pBmpList = new List(nInitSize, nReSize);
 }
 
 XDashList::~XDashList()
@@ -266,19 +196,19 @@ XDashEntry* XDashList::GetDash(long nInd
 
 sal_Bool XDashList::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( pszExtDash, 3 ) );
@@ -291,15 +221,15 @@ sal_Bool XDashList::Load()
 
 sal_Bool XDashList::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( pszExtDash, 3 ) );
@@ -324,32 +254,21 @@ sal_Bool XDashList::Create()
 	return( sal_True );
 }
 
-sal_Bool XDashList::CreateBitmapsForUI()
-{
-    impCreate();
-
-    for( long i = 0; i < Count(); i++)
-	{
-		Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
-		DBG_ASSERT( pBmp, "XDashList: Bitmap(UI) konnte nicht erzeugt werden!" );
-
-		if( pBmp )
-			pBmpList->Insert( pBmp, i );
-	}
-
-    impDestroy();
-
-	return( sal_True );
-}
-
-Bitmap* XDashList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
+Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash)
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
     SdrObject* pLine = mpData->getLineObject();
 
-    pLine->SetMergedItem(XLineStyleItem(XLINE_DASH));
-    pLine->SetMergedItem(XLineDashItem(String(), GetDash(nIndex)->GetDash()));
+    if(pDash)
+    {
+        pLine->SetMergedItem(XLineStyleItem(XLINE_DASH));
+        pLine->SetMergedItem(XLineDashItem(String(), *pDash));
+    }
+    else
+    {
+        pLine->SetMergedItem(XLineStyleItem(XLINE_SOLID));
+    }
 
     sdr::contact::SdrObjectVector aObjectVector;
 	aObjectVector.push_back(mpData->getBackgroundObject());
@@ -357,17 +276,59 @@ Bitmap* XDashList::CreateBitmapForUI( lo
 	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()));
+    Bitmap aResult(pVD->GetBitmap(aZero, pVD->GetOutputSize()));
+    
+    if(bUseDoubleSize)
+    {
+        const Size aCurrentSize(aResult.GetSizePixel());
 
-	if(bDelete)
-	{
-        impDestroy();
-	}
+        aResult.Scale(Size(aCurrentSize.Width() / 2, aCurrentSize.Height() / 2), BMP_SCALE_FASTESTINTERPOLATE);
+    }
+
+    return aResult;
+}
+
+Bitmap XDashList::CreateBitmapForUI( long nIndex )
+{
+    const XDash& rDash = GetDash(nIndex)->GetDash();
+
+    return ImpCreateBitmapForXDash(&rDash);
+}
+
+Bitmap XDashList::GetBitmapForUISolidLine() const
+{
+    if(maBitmapSolidLine.IsEmpty())
+    {
+        const_cast< XDashList* >(this)->maBitmapSolidLine = const_cast< XDashList* >(this)->ImpCreateBitmapForXDash(0);
+    }
+
+    return maBitmapSolidLine;
+}
+
+String XDashList::GetStringForUiSolidLine() const
+{
+    if(!maStringSolidLine.Len())
+    {
+        const_cast< XDashList* >(this)->maStringSolidLine = String(ResId(RID_SVXSTR_SOLID, DIALOG_MGR()));
+    }
+
+    return maStringSolidLine;
+}
+
+String XDashList::GetStringForUiNoLine() const
+{
+    if(!maStringNoLine.Len())
+    {
+        // formally was RID_SVXSTR_INVISIBLE, but tomake equal 
+        // everywhere, use RID_SVXSTR_NONE
+        const_cast< XDashList* >(this)->maStringNoLine = String(ResId(RID_SVXSTR_NONE, DIALOG_MGR()));
+    }
 
-	return pBitmap;
+    return maStringNoLine;
 }
 
 //////////////////////////////////////////////////////////////////////////////

Modified: openoffice/branches/ia2/main/svx/source/xoutdev/xtabgrdt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/xoutdev/xtabgrdt.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/xoutdev/xtabgrdt.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/xoutdev/xtabgrdt.cxx Tue Apr 23 09:51:15 2013
@@ -67,86 +67,6 @@ char const aChckGradient[]  = { 0x04, 0x
 char const aChckGradient0[] = { 0x04, 0x00, 'S','O','G','0'};	// = 5.2
 char const aChckXML[]       = { '<', '?', 'x', 'm', 'l' };		// = 6.0
 
-// ---------------------
-// class XGradientTable
-// ---------------------
-
-/*************************************************************************
-|*
-|* XGradientTable::XGradientTable()
-|*
-*************************************************************************/
-
-XGradientTable::XGradientTable( const String& rPath,
-							XOutdevItemPool* pInPool,
-							sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-				XPropertyTable( rPath, pInPool, nInitSize, nReSize)
-{
-	pBmpTable = new Table( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XGradientTable::~XGradientTable()
-{
-}
-
-/************************************************************************/
-
-XGradientEntry* XGradientTable::Replace(long nIndex, XGradientEntry* pEntry )
-{
-	return (XGradientEntry*) XPropertyTable::Replace(nIndex, pEntry);
-}
-
-/************************************************************************/
-
-XGradientEntry* XGradientTable::Remove(long nIndex)
-{
-	return (XGradientEntry*) XPropertyTable::Remove(nIndex, 0);
-}
-
-/************************************************************************/
-
-XGradientEntry* XGradientTable::GetGradient(long nIndex) const
-{
-	return (XGradientEntry*) XPropertyTable::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XGradientTable::Load()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XGradientTable::Save()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XGradientTable::Create()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XGradientTable::CreateBitmapsForUI()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
-	return( NULL );
-}
-
 // --------------------
 // class XGradientList
 // --------------------
@@ -186,12 +106,13 @@ void XGradientList::impCreate()
         VirtualDevice* pVirDev = new VirtualDevice;
 		OSL_ENSURE(0 != pVirDev, "XGradientList: no VirtualDevice created!" );
 		pVirDev->SetMapMode(MAP_100TH_MM);
-		const Size aSize(pVirDev->PixelToLogic(Size(BITMAP_WIDTH, BITMAP_HEIGHT)));
+		const Size aSize(pVirDev->PixelToLogic(Size(getUiBitmapWidth(), 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, "XGradientList: no SdrModel created!" );
 	    pSdrModel->GetItemPool().FreezeIdRanges();
@@ -204,7 +125,7 @@ void XGradientList::impCreate()
         pBackgroundObject->SetMergedItem(XFillStyleItem(XFILL_GRADIENT));
         pBackgroundObject->SetMergedItem(XLineStyleItem(XLINE_SOLID));
         pBackgroundObject->SetMergedItem(XLineColorItem(String(), Color(COL_BLACK)));
-        pBackgroundObject->SetMergedItem(XGradientStepCountItem(sal_uInt16((BITMAP_WIDTH + BITMAP_HEIGHT) / 3)));
+        pBackgroundObject->SetMergedItem(XGradientStepCountItem(sal_uInt16((getUiBitmapWidth() + getUiBitmapHeight()) / 3)));
 
         mpData = new impXGradientList(pVirDev, pSdrModel, pBackgroundObject);
 		OSL_ENSURE(0 != mpData, "XGradientList: data creation went wrong!" );
@@ -220,11 +141,10 @@ void XGradientList::impDestroy()
     }
 }
 
-XGradientList::XGradientList( const String& rPath, XOutdevItemPool* pInPool, sal_uInt16 nInitSize, sal_uInt16 nReSize)
-:   XPropertyList(rPath, pInPool, nInitSize, nReSize),
+XGradientList::XGradientList( const String& rPath, XOutdevItemPool* pInPool )
+:   XPropertyList(rPath, pInPool ),
     mpData(0)
 {
-	pBmpList = new List(nInitSize, nReSize);
 }
 
 XGradientList::~XGradientList()
@@ -253,19 +173,19 @@ XGradientEntry* XGradientList::GetGradie
 
 sal_Bool XGradientList::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( pszExtGradient, 3 ) );
@@ -279,15 +199,15 @@ sal_Bool XGradientList::Load()
 
 sal_Bool XGradientList::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( pszExtGradient, 3 ) );
@@ -318,25 +238,7 @@ sal_Bool XGradientList::Create()
 	return( sal_True );
 }
 
-sal_Bool XGradientList::CreateBitmapsForUI()
-{
-    impCreate();
-
-    for( long i = 0; i < Count(); i++)
-	{
-		Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
-		DBG_ASSERT( pBmp, "XGradientList: Bitmap(UI) konnte nicht erzeugt werden!" );
-
-		if( pBmp )
-			pBmpList->Insert( pBmp, i );
-	}
-
-    impDestroy();
-
-	return( sal_False );
-}
-
-Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
+Bitmap XGradientList::CreateBitmapForUI( long nIndex )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
@@ -351,17 +253,11 @@ Bitmap* XGradientList::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/branches/ia2/main/svx/source/xoutdev/xtabhtch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/xoutdev/xtabhtch.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/xoutdev/xtabhtch.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/xoutdev/xtabhtch.cxx Tue Apr 23 09:51:15 2013
@@ -66,86 +66,6 @@ char const aChckHatch[]  = { 0x04, 0x00,
 char const aChckHatch0[] = { 0x04, 0x00, 'S','O','H','0'};	// = 5.2
 char const aChckXML[]    = { '<', '?', 'x', 'm', 'l' };		// = 6.0
 
-// ------------------
-// class XHatchTable
-// ------------------
-
-/*************************************************************************
-|*
-|* XHatchTable::XHatchTable()
-|*
-*************************************************************************/
-
-XHatchTable::XHatchTable( const String& rPath,
-							XOutdevItemPool* pInPool,
-							sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-				XPropertyTable( rPath, pInPool, nInitSize, nReSize)
-{
-	pBmpTable = new Table( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XHatchTable::~XHatchTable()
-{
-}
-
-/************************************************************************/
-
-XHatchEntry* XHatchTable::Replace(long nIndex, XHatchEntry* pEntry )
-{
-	return (XHatchEntry*) XPropertyTable::Replace(nIndex, pEntry);
-}
-
-/************************************************************************/
-
-XHatchEntry* XHatchTable::Remove(long nIndex)
-{
-	return (XHatchEntry*) XPropertyTable::Remove(nIndex, 0);
-}
-
-/************************************************************************/
-
-XHatchEntry* XHatchTable::GetHatch(long nIndex) const
-{
-	return (XHatchEntry*) XPropertyTable::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XHatchTable::Load()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XHatchTable::Save()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XHatchTable::Create()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XHatchTable::CreateBitmapsForUI()
-{
-	return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
-	return( NULL );
-}
-
 // -----------------
 // class XHatchList
 // -----------------
@@ -189,13 +109,14 @@ void XHatchList::impCreate()
         VirtualDevice* pVirDev = new VirtualDevice;
 		OSL_ENSURE(0 != pVirDev, "XDashList: no VirtualDevice created!" );
 		pVirDev->SetMapMode(MAP_100TH_MM);
-		const Size aSize(pVirDev->PixelToLogic(Size(BITMAP_WIDTH, BITMAP_HEIGHT)));
+		const Size aSize(pVirDev->PixelToLogic(Size(getUiBitmapWidth(), getUiBitmapHeight())));
 		pVirDev->SetOutputSize(aSize);
         pVirDev->SetDrawMode(rStyleSettings.GetHighContrastMode()
             ? DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT
             : DRAWMODE_DEFAULT);
-    
-	    SdrModel* pSdrModel = new SdrModel();
+        pVirDev->SetBackground(rStyleSettings.GetFieldColor());
+
+        SdrModel* pSdrModel = new SdrModel();
 		OSL_ENSURE(0 != pSdrModel, "XDashList: no SdrModel created!" );
 	    pSdrModel->GetItemPool().FreezeIdRanges();
 
@@ -229,11 +150,10 @@ void XHatchList::impDestroy()
     }
 }
 
-XHatchList::XHatchList(const String& rPath, XOutdevItemPool* pInPool, sal_uInt16 nInitSize, sal_uInt16 nReSize)
-:   XPropertyList(rPath, pInPool, nInitSize, nReSize),
+XHatchList::XHatchList(const String& rPath, XOutdevItemPool* pInPool)
+:   XPropertyList(rPath, pInPool),
     mpData(0)
 {
-	pBmpList = new List(nInitSize, nReSize);
 }
 
 XHatchList::~XHatchList()
@@ -262,19 +182,19 @@ XHatchEntry* XHatchList::GetHatch(long n
 
 sal_Bool XHatchList::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( pszExtHatch, 3 ) );
@@ -287,15 +207,15 @@ sal_Bool XHatchList::Load()
 
 sal_Bool XHatchList::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( pszExtHatch, 3 ) );
@@ -320,25 +240,7 @@ sal_Bool XHatchList::Create()
 	return( sal_True );
 }
 
-sal_Bool XHatchList::CreateBitmapsForUI()
-{
-    impCreate();
-
-    for( long i = 0; i < Count(); i++)
-	{
-		Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
-		DBG_ASSERT( pBmp, "XHatchList: Bitmap(UI) konnte nicht erzeugt werden!" );
-
-		if( pBmp )
-			pBmpList->Insert( pBmp, i );
-	}
-
-    impDestroy();
-
-	return( sal_True );
-}
-
-Bitmap* XHatchList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
+Bitmap XHatchList::CreateBitmapForUI( long nIndex )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
@@ -353,17 +255,11 @@ Bitmap* XHatchList::CreateBitmapForUI( l
 	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/branches/ia2/main/svx/source/xoutdev/xtable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/xoutdev/xtable.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/xoutdev/xtable.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/xoutdev/xtable.cxx Tue Apr 23 09:51:15 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 = 1;
+
+    return nLineWidth;
+}
 
+// eof

Modified: openoffice/branches/ia2/main/svx/source/xoutdev/xtablend.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/xoutdev/xtablend.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/xoutdev/xtablend.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/xoutdev/xtablend.cxx Tue Apr 23 09:51:15 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/branches/ia2/main/svx/util/svx.component
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/util/svx.component?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/util/svx.component (original)
+++ openoffice/branches/ia2/main/svx/util/svx.component Tue Apr 23 09:51:15 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/branches/ia2/main/sw/AllLangResTarget_sw.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/AllLangResTarget_sw.mk?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/AllLangResTarget_sw.mk (original)
+++ openoffice/branches/ia2/main/sw/AllLangResTarget_sw.mk Tue Apr 23 09:51:15 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/branches/ia2/main/sw/Library_sw.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/Library_sw.mk?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/Library_sw.mk (original)
+++ openoffice/branches/ia2/main/sw/Library_sw.mk Tue Apr 23 09:51:15 2013
@@ -88,6 +88,7 @@ $(eval $(call gb_Library_add_exception_o
 	sw/source/core/access/accdoc \
 	sw/source/core/access/accembedded \
 	sw/source/core/access/accfootnote \
+	sw/source/core/access/accfield \
 	sw/source/core/access/accframe \
 	sw/source/core/access/accframebase\
 	sw/source/core/access/accfrmobj \
@@ -99,6 +100,7 @@ $(eval $(call gb_Library_add_exception_o
 	sw/source/core/access/acchypertextdata \
 	sw/source/core/access/accmap \
 	sw/source/core/access/accnotextframe \
+	sw/source/core/access/accnotexthyperlink \
 	sw/source/core/access/accpage \
 	sw/source/core/access/accpara \
 	sw/source/core/access/accportions \
@@ -646,6 +648,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/branches/ia2/main/sw/inc/PostItMgr.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/PostItMgr.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/PostItMgr.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/PostItMgr.hxx Tue Apr 23 09:51:15 2013
@@ -282,6 +282,10 @@ class SwPostItMgr: public SfxListener
 			sal_uInt16 SearchReplace(const SwFmtFld &pFld, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
 			sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
 
+			//IAccessibility2 Implementation 2009-----
+			// get the PostIt window by index
+			sal_Int32 GetPostItCount() {return mvPostItFlds.size();};
+			//-----IAccessibility2 Implementation 2009
             void AssureStdModeAtShell();
 
             void ConnectSidebarWinToFrm( const SwFrm& rFrm,

Modified: openoffice/branches/ia2/main/sw/inc/access.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/access.hrc?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/access.hrc (original)
+++ openoffice/branches/ia2/main/sw/inc/access.hrc Tue Apr 23 09:51:15 2013
@@ -59,9 +59,12 @@
 #define STR_ACCESS_SW_CATEGORY 					(RC_ACCESS_BEGIN + 29)
 #define STR_ACCESS_TL_GLOBAL					(RC_ACCESS_BEGIN + 30)
 #define STR_ACCESS_TL_CONTENT					(RC_ACCESS_BEGIN + 31)
+#define STR_ACCESS_FORMULA_TYPE					(RC_ACCESS_BEGIN + 32)
+#define STR_ACCESS_FORMULA_TEXT					(RC_ACCESS_BEGIN + 33)
+#define STR_ACCESS_FORMULA_TOOLBAR				(RC_ACCESS_BEGIN + 34)
 //-----IAccessibility2 Implementation 2009
 
-#define ACCESS_ACT_END STR_ACCESS_TL_CONTENT
+#define ACCESS_ACT_END STR_ACCESS_FORMULA_TOOLBAR
 
 #if ACCESS_ACT_END > RC_ACCESS_END
 #error Resource-Id Ueberlauf in #file, #line

Modified: openoffice/branches/ia2/main/sw/inc/accmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/accmap.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/accmap.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/accmap.hxx Tue Apr 23 09:51:15 2013
@@ -32,7 +32,14 @@
 #include <tools/debug.hxx>
 #include <tools/fract.hxx>
 
+//IAccessibility2 Implementation 2009-----
+#include <svx/AccessibleControlShape.hxx>
+#include <svx/AccessibleShape.hxx>
+#include "fesh.hxx"
 #include <vector>
+#include <set>
+class SwAccessibleParagraph;
+//-----IAccessibility2 Implementation 2009
 
 class ViewShell;
 class Rectangle;
@@ -80,8 +87,8 @@ class Window;
 typedef sal_uInt16 tAccessibleStates;
 // <--
 
-class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
-						public accessibility::IAccessibleParent
+class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder,
+						public ::accessibility::IAccessibleParent
 {
     mutable ::vos::OMutex maMutex;
 	::vos::OMutex maEventMutex;
@@ -115,10 +122,19 @@ class SwAccessibleMap : public accessibi
 	void InvalidateCursorPosition(
 		const ::com::sun::star::uno::Reference<
 			::com::sun::star::accessibility::XAccessible>& rAcc );
-	void DoInvalidateShapeSelection();
-	void DoInvalidateShapeFocus();
+	//IAccessibility2 Implementation 2009-----
+	void DoInvalidateShapeSelection(sal_Bool bInvalidateFocusMode = sal_False);
+	
+	//Replace by DoInvalidateShapeSelection
+	//void DoInvalidateShapeFocus();
 	void InvalidateShapeSelection();
 
+	//mpSelectedFrmMap contains the old selected objects.
+	SwAccessibleContextMap_Impl *mpSeletedFrmMap;
+	//IvalidateShapeInParaSelection() method is reponsible for the updating the selected states of the objects.
+	void InvalidateShapeInParaSelection();
+	//-----IAccessibility2 Implementation 2009
+
     void _InvalidateRelationSet( const SwFrm* pFrm, sal_Bool bFrom );
 
 	::com::sun::star::uno::Reference<
@@ -174,6 +190,15 @@ public:
     {
         return mpVSh;
     }
+	//IAccessibility2 Implementation 2009-----
+	sal_Bool IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh);
+	void AddShapeContext(const SdrObject *pObj,
+							 ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccShape);
+	
+	void AddGroupContext(const SdrObject *pParentObj,
+					::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccParent);
+	void RemoveGroupContext(const SdrObject *pParentObj, ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccParent);
+	//-----IAccessibility2 Implementation 2009
 
     const SwRect& GetVisArea() const;
 
@@ -214,7 +239,11 @@ public:
 
 	void InvalidateCursorPosition( const SwFrm *pFrm );
 	void InvalidateFocus();
-
+	//IAccessibility2 Implementation 2009-----
+	void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
+	void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection);
+	void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
+	//-----IAccessibility2 Implementation 2009
 	void SetCursorContext(
 		const ::vos::ORef < SwAccessibleContext >& rCursorContext );
 
@@ -292,6 +321,14 @@ public:
 		const long _nIndex,
 		const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
 	)	throw (::com::sun::star::uno::RuntimeException);
+	//IAccessibility2 Implementation 2009-----
+	virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel
+		(::com::sun::star::beans::XPropertySet* pSet) 
+		throw (::com::sun::star::uno::RuntimeException);
+	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >   GetAccessibleCaption (
+		const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape)
+    throw (::com::sun::star::uno::RuntimeException);
+	//-----IAccessibility2 Implementation 2009
 
     // additional Core/Pixel conversions for internal use; also works
     // for preview
@@ -321,5 +358,17 @@ private:
     */
     void GetMapMode( const Point& _rPoint,
                      MapMode&     _orMapMode ) const;
+//IAccessibility2 Implementation 2009-----
+public:
+	virtual sal_Bool IsDocumentSelAll();
+
+	::com::sun::star::uno::WeakReference < ::com::sun::star::accessibility::XAccessible > 
+		GetCursorContext() const { return mxCursorContext; }
+
+    //Para Container for InvalidateCursorPosition
+    typedef std::set< SwAccessibleParagraph* >  SET_PARA;
+    SET_PARA m_setParaAdd;
+    SET_PARA m_setParaRemove;
+    //-----IAccessibility2 Implementation 2009
 };
 #endif

Modified: openoffice/branches/ia2/main/sw/inc/cmdid.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/cmdid.h?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/cmdid.h (original)
+++ openoffice/branches/ia2/main/sw/inc/cmdid.h Tue Apr 23 09:51:15 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
@@ -466,8 +467,6 @@ Achtung: Ab sofort sind in diesem File k
 #define FN_INDENT_TO_TABSTOP	(FN_FORMAT + 17) /* Einrueckung auf die naechste Tabpostion */
 //schon in svxids.hrc
 //#define FN_SET_JUSTIFY_PARA 	(FN_FORMAT + 21) /* Ausrichtung Absatz */
-#define FN_FLIP_HORZ_GRAFIC 	(FN_FORMAT + 25) /* Spiegeln horizontal */
-#define FN_FLIP_VERT_GRAFIC 	(FN_FORMAT + 26) /* Spiegeln vertikal */
 #define FN_SET_LINE_SPACE		(FN_FORMAT + 27) /* Zeilenabstand parametrisiert */
 #define FN_SET_ADJUST			(FN_FORMAT + 28) /* Ausrichtung parametrisiert */
 #define FN_SET_LRMARGIN 		(FN_FORMAT + 29) /* linker/rechter Rand */
@@ -480,7 +479,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 +637,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 +1256,12 @@ 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 SID_ATTR_PAGE_COLUMN            (FN_SIDEBAR + 0)
+#define SID_ATTR_PAGE_ULSPACE           (FN_SIDEBAR + 1)
+#define SID_ATTR_PAGE_LRSPACE           (FN_SIDEBAR + 2)
 
 
 //Member-Ids fuer Fill/SetVariable an Items

Modified: openoffice/branches/ia2/main/sw/inc/crsrsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/crsrsh.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/crsrsh.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/crsrsh.hxx Tue Apr 23 09:51:15 2013
@@ -857,6 +857,13 @@ public:
     // is cursor or the point in/over a right to left formatted text?
     sal_Bool IsInRightToLeftText( const Point* pPt = 0 ) const;
 
+    //IAccessibility2 Implementation 2009-----
+    void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
+	SwFrm* oldColFrm;
+	bool   bColumnChange();
+    void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection);
+    void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
+    //-----IAccessibility2 Implementation 2009
     // If the current cursor position is inside a hidden range, the hidden range
     // is selected and true is returned:
     bool SelectHiddenRange();

Modified: openoffice/branches/ia2/main/sw/inc/doc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/doc.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/doc.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/doc.hxx Tue Apr 23 09:51:15 2013
@@ -481,6 +481,9 @@ private:
     bool mbClipBoard             : 1;    // true: this document represents the clipboard
     bool mbColumnSelection       : 1;    // true: this content has bee created by a column selection
                                          //       (clipboard docs only)
+	//IAccessibility2 Implementation 2009-----
+	sal_Bool	bIsPrepareSelAll		:1;
+	//-----IAccessibility2 Implementation 2009
 
 #ifdef DBG_UTIL
     bool mbXMLExport : 1;                // sal_True: during XML export
@@ -701,6 +704,11 @@ private:
      SwFmt *_MakeFrmFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
      SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, sal_Bool, sal_Bool );
 
+//IAccessibility2 Implementation 2009-----
+private:
+	sal_Bool bReadOnly;
+	String msDocAccTitle;
+
      void InitTOXTypes();
      void   Paste( const SwDoc& );
      bool DeleteAndJoinImpl(SwPaM&, const bool);
@@ -710,6 +718,12 @@ private:
      bool ReplaceRangeImpl(SwPaM&, String const&, const bool);
 
 public:
+	virtual void setDocReadOnly( sal_Bool b) { bReadOnly = b; }
+	virtual sal_Bool getDocReadOnly() const { return bReadOnly; }
+	virtual void setDocAccTitle( const String& rTitle ) { msDocAccTitle = rTitle; }
+	virtual const String getDocAccTitle() const { return msDocAccTitle; }
+	//-----IAccessibility2 Implementation 2009
+
 	enum DocumentType {
 		DOCTYPE_NATIVE,
 		DOCTYPE_MSWORD				//This doc medul is come from Ms Word
@@ -1049,6 +1063,14 @@ public:
     bool InXMLExport() const            { return mbXMLExport; }
     void SetXMLExport( bool bFlag )     { mbXMLExport = bFlag; }
 #endif
+	//-----IAccessibility2 Implementation 2009
+	void SetSelAll( sal_Bool bSel ) 
+	{
+		bIsPrepareSelAll = bSel;
+	}
+	sal_Bool IsPrepareSelAll()  { return bIsPrepareSelAll; }
+	void SetPrepareSelAll() { bIsPrepareSelAll = sal_True; }
+	//IAccessibility2 Implementation 2009-----
 
     void SetContainsAtPageObjWithContentAnchor( const bool bFlag )
     {

Modified: openoffice/branches/ia2/main/sw/inc/docsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/docsh.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/docsh.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/docsh.hxx Tue Apr 23 09:51:15 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.
@@ -292,7 +304,13 @@ public:
     // read by the binary filter:
     virtual void UpdateLinks();
     // <--
-
+	//IAccessibility2 Implementation 2009-----
+	virtual void setDocAccTitle( const String& rTitle );
+	virtual const String getDocAccTitle() const;
+
+	void setDocReadOnly( sal_Bool bReadOnly);
+	sal_Bool getDocReadOnly() const;
+	//-----IAccessibility2 Implementation 2009
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
                                 GetController();
 

Modified: openoffice/branches/ia2/main/sw/inc/editsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/editsh.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/editsh.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/editsh.hxx Tue Apr 23 09:51:15 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/branches/ia2/main/sw/inc/fesh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/fesh.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/fesh.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/fesh.hxx Tue Apr 23 09:51:15 2013
@@ -482,6 +482,10 @@ public:
 	sal_uInt16 IsObjSelected() const;	//Liefert gleich die Anzahl der Objekte,
 									//zaehlt aber nicht die Objekte in Gruppen.
 	sal_Bool IsObjSelected( const SdrObject& rObj ) const;
+	//IAccessibility2 Implementation 2009-----
+	sal_Bool IsObjSameLevelWithMarked(const SdrObject* pObj) const;
+    const SdrMarkList* GetMarkList() const{ return _GetMarkList(); };
+    //-----IAccessibility2 Implementation 2009
 
 	void EndTextEdit();				//Loescht ggf. das Objekt.
 

Modified: openoffice/branches/ia2/main/sw/inc/fldbas.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/fldbas.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/fldbas.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/fldbas.hxx Tue Apr 23 09:51:15 2013
@@ -138,8 +138,18 @@ enum SwFldTypesEnum
     TYP_DROPDOWN,
 	TYP_END
 };
-
-
+//IAccessibility2 Implementation 2009-----
+enum SwAttrFieldTYpe
+{
+	ATTR_NONE,
+	ATTR_DATEFLD,
+	ATTR_TIMEFLD,
+	ATTR_PAGENUMBERFLD,
+	ATTR_PAGECOOUNTFLD,
+	ATTR_BOOKMARKFLD,
+	ATTR_SETREFATTRFLD
+};
+//-----IAccessibility2 Implementation 2009
 enum SwFileNameFormat
 {
 	FF_BEGIN,



Mime
View raw message