[Libreoffice-commits] .: 5 commits - connectivity/source sfx2/inc sfx2/source svx/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Sat Jun 4 23:46:07 PDT 2011
connectivity/source/drivers/adabas/BDriver.cxx | 13 --
connectivity/source/drivers/adabas/BFunctions.cxx | 7 -
connectivity/source/drivers/odbc/OFunctions.cxx | 21 ---
sfx2/inc/sfx2/objsh.hxx | 3
sfx2/source/control/bindings.cxx | 6 -
sfx2/source/dialog/basedlgs.cxx | 6 -
sfx2/source/dialog/tabdlg.cxx | 6 -
sfx2/source/doc/objstor.cxx | 101 +-----------------
svx/source/dialog/ctredlin.src | 2
svx/source/fmcomp/gridcols.cxx | 6 -
svx/source/svdraw/svdobj.cxx | 66 +-----------
svx/source/svdraw/svdocapt.cxx | 7 -
svx/source/svdraw/svdocirc.cxx | 10 -
svx/source/svdraw/svdoedge.cxx | 49 ++-------
svx/source/svdraw/svdograf.cxx | 27 ----
svx/source/svdraw/svdogrp.cxx | 36 +-----
svx/source/svdraw/svdomeas.cxx | 11 --
svx/source/svdraw/svdoole2.cxx | 68 ++----------
svx/source/svdraw/svdopage.cxx | 7 -
svx/source/svdraw/svdopath.cxx | 34 ++----
svx/source/svdraw/svdorect.cxx | 4
svx/source/svdraw/svdotext.cxx | 119 ++++------------------
svx/source/svdraw/svdotextdecomposition.cxx | 8 -
svx/source/svdraw/svdotextpathdecomposition.cxx | 2
svx/source/svdraw/svdotxat.cxx | 21 ---
svx/source/svdraw/svdotxdr.cxx | 13 --
svx/source/svdraw/svdotxed.cxx | 39 -------
svx/source/svdraw/svdotxln.cxx | 39 -------
svx/source/svdraw/svdotxtr.cxx | 27 ----
svx/source/svdraw/svdouno.cxx | 9 -
svx/source/svdraw/svdoutl.cxx | 26 ----
svx/source/svdraw/svdoutlinercache.cxx | 4
svx/source/svdraw/svdovirt.cxx | 4
svx/source/svdraw/svdpage.cxx | 45 ++------
svx/source/svdraw/svdpagv.cxx | 36 +-----
svx/source/svdraw/svdpntv.cxx | 16 --
svx/source/svdraw/svdpoev.cxx | 2
svx/source/svdraw/svdsnpv.cxx | 34 ------
svx/source/svdraw/svdstr.src | 31 -----
svx/source/svdraw/svdtext.cxx | 4
svx/source/svdraw/svdtrans.cxx | 12 --
svx/source/svdraw/svdundo.cxx | 103 ++++---------------
svx/source/svdraw/svdview.cxx | 33 ------
svx/source/svdraw/svdxcgv.cxx | 15 --
44 files changed, 178 insertions(+), 954 deletions(-)
New commits:
commit adcb76379070ce53bd706c3ffe8abdb3d90fb08f
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Wed Jun 1 23:07:21 2011 +0200
Removed commented code
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 22fc9be..594cd0f 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -94,17 +94,11 @@ namespace connectivity
extern T3SQLGetEnvAttr pODBC3SQLGetEnvAttr;
extern T3SQLSetStmtAttr pODBC3SQLSetStmtAttr;
extern T3SQLGetStmtAttr pODBC3SQLGetStmtAttr;
- //extern T3SQLSetDescField pODBC3SQLSetDescField;
- //extern T3SQLGetDescField pODBC3SQLGetDescField;
- //extern T3SQLGetDescRec pODBC3SQLGetDescRec;
- //extern T3SQLSetDescRec pODBC3SQLSetDescRec;
extern T3SQLPrepare pODBC3SQLPrepare;
extern T3SQLBindParameter pODBC3SQLBindParameter;
- //extern T3SQLGetCursorName pODBC3SQLGetCursorName;
extern T3SQLSetCursorName pODBC3SQLSetCursorName;
extern T3SQLExecute pODBC3SQLExecute;
extern T3SQLExecDirect pODBC3SQLExecDirect;
- //extern T3SQLNativeSql pODBC3SQLNativeSql;
extern T3SQLDescribeParam pODBC3SQLDescribeParam;
extern T3SQLNumParams pODBC3SQLNumParams;
extern T3SQLParamData pODBC3SQLParamData;
@@ -120,7 +114,6 @@ namespace connectivity
extern T3SQLSetPos pODBC3SQLSetPos;
extern T3SQLBulkOperations pODBC3SQLBulkOperations;
extern T3SQLMoreResults pODBC3SQLMoreResults;
- //extern T3SQLGetDiagField pODBC3SQLGetDiagField;
extern T3SQLGetDiagRec pODBC3SQLGetDiagRec;
extern T3SQLColumnPrivileges pODBC3SQLColumnPrivileges;
extern T3SQLColumns pODBC3SQLColumns;
@@ -945,12 +938,6 @@ void ODriver::createDb( const TDatabaseStruct& _aInfo)
// %m_sDbRoot%\bin\xutil -d %_aInfo.sDBName% -u %CONUSR%,%CONPWD% -b %INITCMD%
::rtl::OUString aBatch2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-b "));
-// if(!bBsp && INITCMD.Len() >= 40)
-// {
-// DirEntry aTmp(INITCMD);
-// aTmp.CopyTo(aInitFile, FSYS_ACTION_COPYFILE);
-// INITCMD = aInitFile.GetFull();
-// }
// generate the init file for the database
String sInitFile = getDatabaseInitFile(_aInfo);
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx
index ab64f99..fde23e9 100644
--- a/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -54,17 +54,11 @@ T3SQLSetEnvAttr pODBC3SQLSetEnvAttr;
T3SQLGetEnvAttr pODBC3SQLGetEnvAttr;
T3SQLSetStmtAttr pODBC3SQLSetStmtAttr;
T3SQLGetStmtAttr pODBC3SQLGetStmtAttr;
-//T3SQLSetDescField pODBC3SQLSetDescField;
-//T3SQLGetDescField pODBC3SQLGetDescField;
-//T3SQLGetDescRec pODBC3SQLGetDescRec;
-//T3SQLSetDescRec pODBC3SQLSetDescRec;
T3SQLPrepare pODBC3SQLPrepare;
T3SQLBindParameter pODBC3SQLBindParameter;
-//T3SQLGetCursorName pODBC3SQLGetCursorName;
T3SQLSetCursorName pODBC3SQLSetCursorName;
T3SQLExecute pODBC3SQLExecute;
T3SQLExecDirect pODBC3SQLExecDirect;
-//T3SQLNativeSql pODBC3SQLNativeSql;
T3SQLDescribeParam pODBC3SQLDescribeParam;
T3SQLNumParams pODBC3SQLNumParams;
T3SQLParamData pODBC3SQLParamData;
@@ -80,7 +74,6 @@ T3SQLGetData pODBC3SQLGetData;
T3SQLSetPos pODBC3SQLSetPos;
T3SQLBulkOperations pODBC3SQLBulkOperations;
T3SQLMoreResults pODBC3SQLMoreResults;
-//T3SQLGetDiagField pODBC3SQLGetDiagField;
T3SQLGetDiagRec pODBC3SQLGetDiagRec;
T3SQLColumnPrivileges pODBC3SQLColumnPrivileges;
T3SQLColumns pODBC3SQLColumns;
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index e36062f..13454de 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -52,17 +52,11 @@ T3SQLSetEnvAttr pODBC3SQLSetEnvAttr;
T3SQLGetEnvAttr pODBC3SQLGetEnvAttr;
T3SQLSetStmtAttr pODBC3SQLSetStmtAttr;
T3SQLGetStmtAttr pODBC3SQLGetStmtAttr;
-//T3SQLSetDescField pODBC3SQLSetDescField;
-//T3SQLGetDescField pODBC3SQLGetDescField;
-//T3SQLGetDescRec pODBC3SQLGetDescRec;
-//T3SQLSetDescRec pODBC3SQLSetDescRec;
T3SQLPrepare pODBC3SQLPrepare;
T3SQLBindParameter pODBC3SQLBindParameter;
-//T3SQLGetCursorName pODBC3SQLGetCursorName;
T3SQLSetCursorName pODBC3SQLSetCursorName;
T3SQLExecute pODBC3SQLExecute;
T3SQLExecDirect pODBC3SQLExecDirect;
-//T3SQLNativeSql pODBC3SQLNativeSql;
T3SQLDescribeParam pODBC3SQLDescribeParam;
T3SQLNumParams pODBC3SQLNumParams;
T3SQLParamData pODBC3SQLParamData;
@@ -78,7 +72,6 @@ T3SQLGetData pODBC3SQLGetData;
T3SQLSetPos pODBC3SQLSetPos;
T3SQLBulkOperations pODBC3SQLBulkOperations;
T3SQLMoreResults pODBC3SQLMoreResults;
-//T3SQLGetDiagField pODBC3SQLGetDiagField;
T3SQLGetDiagRec pODBC3SQLGetDiagRec;
T3SQLColumnPrivileges pODBC3SQLColumnPrivileges;
T3SQLColumns pODBC3SQLColumns;
@@ -166,28 +159,16 @@ sal_Bool LoadFunctions(oslModule pODBCso)
return sal_False;
if( ( pODBC3SQLGetStmtAttr = (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetStmtAttr")).pData )) == NULL )
return sal_False;
- /*if( ( pODBC3SQLSetDescField = (T3SQLSetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetDescField")).pData )) == NULL )
- return sal_False;
- if( ( pODBC3SQLGetDescField = (T3SQLGetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDescField")).pData )) == NULL )
- return sal_False;*/
- /*if( ( pODBC3SQLGetDescRec = (T3SQLGetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDescRec")).pData )) == NULL )
- return sal_False;
- if( ( pODBC3SQLSetDescRec = (T3SQLSetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetDescRec")).pData )) == NULL )
- return sal_False;*/
if( ( pODBC3SQLPrepare = (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPrepare")).pData )) == NULL )
return sal_False;
if( ( pODBC3SQLBindParameter = (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBindParameter")).pData )) == NULL )
return sal_False;
-// if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetCursorName")).pData )) == NULL )
-// return sal_False;
if( ( pODBC3SQLSetCursorName = (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetCursorName")).pData )) == NULL )
return sal_False;
if( ( pODBC3SQLExecute = (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLExecute")).pData )) == NULL )
return sal_False;
if( ( pODBC3SQLExecDirect = (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLExecDirect")).pData )) == NULL )
return sal_False;
- /*if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNativeSql")).pData )) == NULL )
- return sal_False;*/
if( ( pODBC3SQLDescribeParam = (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDescribeParam")).pData )) == NULL )
return sal_False;
if( ( pODBC3SQLNumParams = (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNumParams")).pData )) == NULL )
@@ -218,8 +199,6 @@ sal_Bool LoadFunctions(oslModule pODBCso)
return sal_False;
if( ( pODBC3SQLMoreResults = (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLMoreResults")).pData )) == NULL )
return sal_False;
- /*if( ( pODBC3SQLGetDiagField = (T3SQLGetDiagField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDiagField")).pData )) == NULL )
- return sal_False;*/
if( ( pODBC3SQLGetDiagRec = (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDiagRec")).pData )) == NULL )
return sal_False;
if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColumnPrivileges")).pData )) == NULL )
commit 28cd8c35ad653f00ed6c395e1331fdb5109d7d3d
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Tue May 31 13:52:53 2011 +0200
Duplicate code: join ImportFrom and InsertFrom
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index c55072c..9614085 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -347,8 +347,7 @@ public:
sal_Bool bForceNonModified = sal_False );
sal_Bool SaveCompletedChildren( sal_Bool bSuccess );
- sal_Bool InsertFrom( SfxMedium &rMedium );
- virtual sal_Bool ImportFrom( SfxMedium &rMedium );
+ virtual sal_Bool ImportFrom( SfxMedium &rMedium, bool bInsert );
sal_Bool ExportTo( SfxMedium &rMedium );
// xmlsec05, check with SFX team
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 7715e71..14bada2 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -733,7 +733,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
{
bSetProperty = false;
}
- bOk = ImportFrom(*pMedium);
+ bOk = ImportFrom( *pMedium, false );
if(bSetProperty)
{
try
@@ -2150,7 +2150,7 @@ sal_Bool SfxObjectShell::ConvertFrom
return sal_False;
}
-sal_Bool SfxObjectShell::InsertFrom( SfxMedium& rMedium )
+sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert )
{
::rtl::OUString aTypeName( rMedium.GetFilter()->GetTypeName() );
::rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() );
@@ -2233,99 +2233,10 @@ sal_Bool SfxObjectShell::InsertFrom( SfxMedium& rMedium )
aArgs[nEnd-1].Value <<= rMedium.GetBaseURL();
}
- aArgs.realloc( ++nEnd );
- aArgs[nEnd-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "InsertMode" ) );
- aArgs[nEnd-1].Value <<= (sal_Bool) sal_True;
-
- return xLoader->filter( aArgs );
- }catch(const uno::Exception&)
- {}
- }
-
- return sal_False;
-}
-
-sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium )
-{
- ::rtl::OUString aTypeName( rMedium.GetFilter()->GetTypeName() );
- ::rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() );
-
- uno::Reference< lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory();
- uno::Reference < lang::XMultiServiceFactory > xFilterFact (
- xMan->createInstance( DEFINE_CONST_UNICODE( "com.sun.star.document.FilterFactory" ) ), uno::UNO_QUERY );
-
- uno::Sequence < beans::PropertyValue > aProps;
- uno::Reference < container::XNameAccess > xFilters ( xFilterFact, uno::UNO_QUERY );
- if ( xFilters->hasByName( aFilterName ) )
- {
- xFilters->getByName( aFilterName ) >>= aProps;
- rMedium.GetItemSet()->Put( SfxStringItem( SID_FILTER_NAME, aFilterName ) );
- }
-
- ::rtl::OUString aFilterImplName;
- sal_Int32 nFilterProps = aProps.getLength();
- for ( sal_Int32 nFilterProp = 0; nFilterProp<nFilterProps; nFilterProp++ )
- {
- const beans::PropertyValue& rFilterProp = aProps[nFilterProp];
- if ( rFilterProp.Name.compareToAscii("FilterService") == COMPARE_EQUAL )
- {
- rFilterProp.Value >>= aFilterImplName;
- break;
- }
- }
-
- uno::Reference< document::XFilter > xLoader;
- if ( aFilterImplName.getLength() )
- {
- try{
- xLoader = uno::Reference< document::XFilter >
- ( xFilterFact->createInstanceWithArguments( aFilterName, uno::Sequence < uno::Any >() ), uno::UNO_QUERY );
- }catch(const uno::Exception&)
- { xLoader.clear(); }
- }
- if ( xLoader.is() )
- {
- // it happens that xLoader does not support xImporter!
- try{
- uno::Reference< lang::XComponent > xComp( GetModel(), uno::UNO_QUERY_THROW );
- uno::Reference< document::XImporter > xImporter( xLoader, uno::UNO_QUERY_THROW );
- xImporter->setTargetDocument( xComp );
-
- uno::Sequence < beans::PropertyValue > lDescriptor;
- rMedium.GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, rMedium.GetName() ) );
- TransformItems( SID_OPENDOC, *rMedium.GetItemSet(), lDescriptor );
-
- com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aArgs ( lDescriptor.getLength() );
- com::sun::star::beans::PropertyValue * pNewValue = aArgs.getArray();
- const com::sun::star::beans::PropertyValue * pOldValue = lDescriptor.getConstArray();
- const OUString sInputStream ( RTL_CONSTASCII_USTRINGPARAM ( "InputStream" ) );
-
- sal_Bool bHasInputStream = sal_False;
- sal_Bool bHasBaseURL = sal_False;
- sal_Int32 i;
- sal_Int32 nEnd = lDescriptor.getLength();
-
- for ( i = 0; i < nEnd; i++ )
- {
- pNewValue[i] = pOldValue[i];
- if ( pOldValue [i].Name == sInputStream )
- bHasInputStream = sal_True;
- else if ( pOldValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "DocumentBaseURL" ) ) )
- bHasBaseURL = sal_True;
- }
-
- if ( !bHasInputStream )
- {
- aArgs.realloc ( ++nEnd );
- aArgs[nEnd-1].Name = sInputStream;
- aArgs[nEnd-1].Value <<= com::sun::star::uno::Reference < com::sun::star::io::XInputStream > ( new utl::OSeekableInputStreamWrapper ( *rMedium.GetInStream() ) );
- }
-
- if ( !bHasBaseURL )
- {
- aArgs.realloc ( ++nEnd );
- aArgs[nEnd-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "DocumentBaseURL" ) );
- aArgs[nEnd-1].Value <<= rMedium.GetBaseURL();
+ if ( bInsert ) {
+ aArgs.realloc( ++nEnd );
+ aArgs[nEnd-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "InsertMode" ) );
+ aArgs[nEnd-1].Value <<= (sal_Bool) sal_True;
}
return xLoader->filter( aArgs );
commit 254c2a687861a5cbb7754280811f2b8e77415e7c
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Thu May 26 17:09:17 2011 +0200
Removed commented lines
diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index 0edd5e5..1a8ad9c 100644
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.src
@@ -115,7 +115,6 @@ TabPage SID_REDLIN_FILTER_PAGE
MASKCOLOR
};
// IAccessibility2 implementation 2009. ------
- //QuickHelpText [ en-US ] = "Set Date/Time" ;
QuickHelpText [ en-US ] = "Set Start Date/Time" ;
// ------ IAccessibility2 implementation 2009.
};
@@ -174,7 +173,6 @@ TabPage SID_REDLIN_FILTER_PAGE
MASKCOLOR
};
// IAccessibility2 implementation 2009. ------
- //QuickHelpText [ en-US ] = "Set Date/Time" ;
QuickHelpText [ en-US ] = "Set End Date/Time" ;
// ------ IAccessibility2 implementation 2009.
};
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 2616ec5..d69709e 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -311,36 +311,6 @@ String STR_ObjNamePluralTEXTLNK
{
Text [ en-US ] = "Linked text frames" ;
};
- //String STR_ObjNameSingulXTXT {
- // Text="Textfortsetzungsrahmen";
- // Text[ENGLISH]="drawobject";
- // Text[norwegian]="Tegneobjekt";
- // Text[italian]="Disegna oggetto";
- // Text[portuguese_brazilian]="Desenhar objeto";
- // Text[portuguese]="Desenhar objecto";
- // Text[finnish]="Piirto-objekti";
- // Text[danish]="Tegneobjekt";
- // Text[french]="Drawobject";
- // Text[swedish]="Ritobjekt";
- // Text[dutch]="Tekenobject";
- // Text[spanish]="Objeto de dibujo";
- // Text[english_us]="drawobject";
- //};
- //String STR_ObjNamePluralXTXT {
- // Text="Textfortsetzungsrahmen";
- // Text[ENGLISH]="drawobjects";
- // Text[norwegian]="Tegneobjektr";
- // Text[italian]="Disegna oggetti";
- // Text[portuguese_brazilian]="Desenhar objetos";
- // Text[portuguese]="Desenhar objectos";
- // Text[finnish]="Piirto-objektit";
- // Text[danish]="Tegneobjekter";
- // Text[french]="Drawobjects";
- // Text[swedish]="Ritobjekt";
- // Text[dutch]="Tekenobjecten";
- // Text[spanish]="Objetos de dibujo";
- // Text[english_us]="drawobjects";
- //};
String STR_ObjNameSingulFITTEXT
{
Text [ en-US ] = "Fit-to-size text object" ;
@@ -2760,7 +2730,6 @@ Bitmap SIP_SA_FINE_MARKERS
File = "markers2.png";
};
-// #100499#
Bitmap BMP_SVXOLEOBJ
{
File = "oleobj.png" ;
commit 6683cdb2f16d51372df1490fc2a61e955ebc7317
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Tue May 24 12:59:31 2011 +0200
__cdecl -> SAL_CALL
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 0b68d9f..bcf0f85 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1360,11 +1360,7 @@ void SfxBindings::UpdateSlotServer_Impl()
//--------------------------------------------------------------------
-#ifdef WNT
-int __cdecl CmpUS_Impl(const void *p1, const void *p2)
-#else
-int CmpUS_Impl(const void *p1, const void *p2)
-#endif
+int SAL_CALL CmpUS_Impl(const void *p1, const void *p2)
/* [Description]
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 15f7028..c88f0ef 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -987,11 +987,7 @@ void SfxSingleTabDialog::SetInfoLink( const Link& rLink )
//--------------------------------------------------------------------
// Comparison function for qsort
-#ifdef WNT
-int __cdecl BaseDlgsCmpUS_Impl( const void* p1, const void* p2 )
-#else
-extern "C" int BaseDlgsCmpUS_Impl( const void* p1, const void* p2 )
-#endif
+extern "C" int SAL_CALL BaseDlgsCmpUS_Impl( const void* p1, const void* p2 )
{
return *(sal_uInt16*)p1 - *(sal_uInt16*)p2;
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index a9579d7..0a4825f 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1590,11 +1590,7 @@ int SfxTabDialog::FillOutputItemSet()
// -----------------------------------------------------------------------
-#ifdef WNT
-int __cdecl TabDlgCmpUS_Impl( const void* p1, const void* p2 )
-#else
-extern "C" int TabDlgCmpUS_Impl( const void* p1, const void* p2 )
-#endif
+extern "C" int SAL_CALL TabDlgCmpUS_Impl( const void* p1, const void* p2 )
/* [Description]
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index e1e9777..737aeba 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -58,11 +58,7 @@ const ::comphelper::StringSequence& getColumnTypes()
//------------------------------------------------------------------
// Vergleichen von PropertyInfo
-extern "C" int
-#if defined( WNT )
- __cdecl
-#endif
- NameCompare(const void* pFirst, const void* pSecond)
+extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond)
{
return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond);
}
commit 22387062a1ad3eda6bcdbf51e6f16dd014891005
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Thu May 12 11:03:28 2011 +0200
Removed comments/commented code
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 715dc98..2d133b3 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -93,7 +93,6 @@
#include <vcl/salbtype.hxx> // FRound
#include <svl/whiter.hxx>
-// #97849#
#include <svx/fmmodel.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/objface.hxx>
@@ -125,7 +124,7 @@
using namespace ::com::sun::star;
-// #104018# replace macros above with type-detecting methods
+// replace macros above with type-detecting methods
inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); }
inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
@@ -290,18 +289,6 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const
return pNeuPlusData;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@ @@@@@ @@@@@@ @@@@@ @@@@ @@@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@@@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@ @@@@@ @@@@ @@@@@ @@@@ @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
//////////////////////////////////////////////////////////////////////////////
// BaseProperties section
@@ -339,7 +326,7 @@ void SdrObject::RemoveObjectUser(sdr::ObjectUser& rOldUser)
}
//////////////////////////////////////////////////////////////////////////////
-// #110094# DrawContact section
+// DrawContact section
sdr::contact::ViewContact* SdrObject::CreateObjectSpecificViewContact()
{
@@ -410,9 +397,6 @@ SdrObject::SdrObject()
// #i25616#
mbSupportTextIndentingOnLineWidthChange = sal_False;
- //#110094#-1
- //bWriterFlyFrame =sal_False;
-
bNotMasterCachable=sal_False;
bIsEdge=sal_False;
bIs3DObj=sal_False;
@@ -461,7 +445,6 @@ SdrObject::~SdrObject()
mpProperties = 0L;
}
- // #110094#
if(mpViewContact)
{
delete mpViewContact;
@@ -879,7 +862,6 @@ void SdrObject::SetNavigationPosition (const sal_uInt32 nNewPosition)
-// #111111#
// To make clearer that this method may trigger RecalcBoundRect and thus may be
// expensive and somtimes problematic (inside a bigger object change You will get
// non-useful BoundRects sometimes) i rename that method from GetBoundRect() to
@@ -894,7 +876,6 @@ const Rectangle& SdrObject::GetCurrentBoundRect() const
return aOutRect;
}
-// #111111#
// To have a possibility to get the last calculated BoundRect e.g for producing
// the first rectangle for repaints (old and new need to be used) without forcing
// a RecalcBoundRect (which may be problematical and expensive sometimes) i add here
@@ -958,7 +939,6 @@ void SdrObject::BroadcastObjectChange() const
void SdrObject::SetChanged()
{
- // #110094#-11
// For test purposes, use the new ViewContact for change
// notification now.
ActionChanged();
@@ -1006,7 +986,6 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj)
mpProperties = 0L;
}
- // #110094#
if(mpViewContact)
{
delete mpViewContact;
@@ -1029,11 +1008,11 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj)
bNoPrint=rObj.bNoPrint;
mbVisible=rObj.mbVisible;
bMarkProt=rObj.bMarkProt;
- //EmptyPresObj wird nicht kopiert: nun doch! (25-07-1995, Joe)
+ //EmptyPresObj wird nicht kopiert: nun doch!
bEmptyPresObj =rObj.bEmptyPresObj;
- //NotVisibleAsMaster wird nicht kopiert: nun doch! (25-07-1995, Joe)
+ //NotVisibleAsMaster wird nicht kopiert: nun doch!
bNotVisibleAsMaster=rObj.bNotVisibleAsMaster;
- bSnapRectDirty=sal_True; //rObj.bSnapRectDirty;
+ bSnapRectDirty=sal_True;
bNotMasterCachable=rObj.bNotMasterCachable;
delete pPlusData;
pPlusData=NULL;
@@ -1542,7 +1521,6 @@ void SdrObject::Move(const Size& rSiz)
{
if (rSiz.Width()!=0 || rSiz.Height()!=0) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcMove(rSiz);
SetChanged();
BroadcastObjectChange();
@@ -1554,7 +1532,6 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction&
{
if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcResize(rRef,xFact,yFact);
SetChanged();
BroadcastObjectChange();
@@ -1566,7 +1543,6 @@ void SdrObject::Rotate(const Point& rRef, long nWink, double sn, double cs)
{
if (nWink!=0) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcRotate(rRef,nWink,sn,cs);
SetChanged();
BroadcastObjectChange();
@@ -1577,7 +1553,6 @@ void SdrObject::Rotate(const Point& rRef, long nWink, double sn, double cs)
void SdrObject::Mirror(const Point& rRef1, const Point& rRef2)
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcMirror(rRef1,rRef2);
SetChanged();
BroadcastObjectChange();
@@ -1588,7 +1563,6 @@ void SdrObject::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
{
if (nWink!=0) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcShear(rRef,nWink,tn,bVShear);
SetChanged();
BroadcastObjectChange();
@@ -1607,7 +1581,6 @@ void SdrObject::SetRelativePos(const Point& rPnt)
{
if (rPnt!=GetRelativePos()) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetRelativePos(rPnt);
SetChanged();
BroadcastObjectChange();
@@ -1631,7 +1604,6 @@ void SdrObject::SetAnchorPos(const Point& rPnt)
{
if (rPnt!=aAnchor) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetAnchorPos(rPnt);
SetChanged();
BroadcastObjectChange();
@@ -1676,7 +1648,6 @@ void SdrObject::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly
void SdrObject::SetSnapRect(const Rectangle& rRect)
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetSnapRect(rRect);
SetChanged();
BroadcastObjectChange();
@@ -1686,7 +1657,6 @@ void SdrObject::SetSnapRect(const Rectangle& rRect)
void SdrObject::SetLogicRect(const Rectangle& rRect)
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetLogicRect(rRect);
SetChanged();
BroadcastObjectChange();
@@ -1731,7 +1701,6 @@ Point SdrObject::GetPoint(sal_uInt32 /*i*/) const
void SdrObject::SetPoint(const Point& rPnt, sal_uInt32 i)
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetPoint(rPnt, i);
SetChanged();
BroadcastObjectChange();
@@ -1759,7 +1728,6 @@ void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/)
void SdrObject::SetOutlinerParaObject(OutlinerParaObject* pTextObject)
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetOutlinerParaObject(pTextObject);
SetChanged();
BroadcastObjectChange();
@@ -2127,7 +2095,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
SetResizeProtect(b);
}
- /* #67368# move protect always sets size protect */
+ /* move protect always sets size protect */
if( IsMoveProtect() )
SetResizeProtect( true );
@@ -2250,7 +2218,6 @@ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemov
if(pUserCall)
aBoundRect0 = GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
SetChanged();
BroadcastObjectChange();
@@ -2317,11 +2284,6 @@ const SdrGluePointList* SdrObject::GetGluePointList() const
return NULL;
}
-//SdrGluePointList* SdrObject::GetGluePointList()
-//{
-// if (pPlusData!=NULL) return pPlusData->pGluePoints;
-// return NULL;
-//}
SdrGluePointList* SdrObject::ForceGluePointList()
{
@@ -2498,7 +2460,6 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLin
{
if(eOldFillStyle != XFILL_NONE)
{
- // #107600# use new boolean here
bAddOriginalGeometry = true;
}
}
@@ -2755,7 +2716,6 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR
if ( pUserCall )
{
- // UserCall ausfuehren
pUserCall->Changed( *this, eUserCall, rBoundRect );
}
@@ -3081,7 +3041,6 @@ void SdrObject::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const ba
SetSnapRect(aBaseRect);
}
-// #116168#
// Give info if object is in destruction
sal_Bool SdrObject::IsInDestruction() const
{
@@ -3123,17 +3082,6 @@ void SdrObject::SetContextWritingMode( const sal_Int16 /*_nContextWritingMode*/
// this base class does not support different writing modes, so ignore the call
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@ @@@@@ @@@@@@ @@@@@ @@@@ @@@@ @@@@@@ @@@@ @@@@@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@@@ @@@@@@ @@ @@ @@ @@ @@@@@ @@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@ @@@@@ @@@@ @@ @@ @@ @@@@ @@ @@@@ @@ @@ @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel)
{
@@ -3285,6 +3233,4 @@ namespace svx
}
}
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index f41c581..088dda2 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -286,7 +286,6 @@ basegfx::B2DPolyPolygon SdrCaptionObj::TakeXorPoly() const
sal_uInt32 SdrCaptionObj::GetHdlCount() const
{
sal_uInt32 nAnz1(SdrRectObj::GetHdlCount());
- // sal_uInt32 nAnz2(aTailPoly.GetSize());
// Derzeit ist nur das Draggen des Schwanzendes implementiert
return nAnz1 + 1L;
}
@@ -660,7 +659,6 @@ void SdrCaptionObj::RecalcSnapRect()
{
SdrRectObj::RecalcSnapRect();
// #i32599#
- // maSnapRect.Union(aTailPoly.GetBoundRect());
// !!!!! fehlende Impl.
}
@@ -698,7 +696,6 @@ void SdrCaptionObj::SetTailPos(const Point& rPos)
{
if (aTailPoly.GetSize()==0 || aTailPoly[0]!=rPos) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetTailPos(rPos);
SetChanged();
BroadcastObjectChange();
@@ -756,7 +753,7 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo)
}
SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const
-{ // #42334# - Convert implementiert
+{
SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier);
SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier);
SdrObject* pRet=(pTail!=NULL) ? pTail : pRect;
@@ -848,6 +845,4 @@ basegfx::B2DPolygon SdrCaptionObj::getTailPolygon() const
return aTailPoly.getB2DPolygon();
}
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 722bbe9..c59c322 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -77,7 +77,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink)
if (nWdt!=nHgt) {
if (nWdt>nHgt) {
if (nWdt!=0) {
- // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen (Bug 23384)
+ // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen
if (Abs(nHgt)>32767 || Abs(aRetval.Y())>32767) {
aRetval.Y()=BigMulDiv(aRetval.Y(),nHgt,nWdt);
} else {
@@ -86,7 +86,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink)
}
} else {
if (nHgt!=0) {
- // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen (Bug 23384)
+ // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen
if (Abs(nWdt)>32767 || Abs(aRetval.X())>32767) {
aRetval.X()=BigMulDiv(aRetval.X(),nWdt,nHgt);
} else {
@@ -880,7 +880,6 @@ void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear
void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2)
{
- //long nWink0=aGeo.nDrehWink;
bool bFreeMirr=meCircleKind!=OBJ_CIRC;
Point aTmpPt1;
Point aTmpPt2;
@@ -1132,7 +1131,7 @@ void SdrCircObj::ImpSetCircInfoToAttr()
if(eNewKindA != eOldKindA || nStartWink != nOldStartWink || nEndWink != nOldEndWink)
{
- // #81921# since SetItem() implicitly calls ImpSetAttrToCircInfo()
+ // since SetItem() implicitly calls ImpSetAttrToCircInfo()
// setting the item directly is necessary here.
if(eNewKindA != eOldKindA)
{
@@ -1164,7 +1163,4 @@ SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier) const
return pRet;
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 42a51f5..577638e 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -135,8 +135,8 @@ bool SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rX
sal_uInt16 nIdx=ImpGetPolyIdx(eLineCode,rXP);
bool bHorz=nAngle1==0 || nAngle1==18000;
if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) {
- nIdx=rXP.GetPointCount()-nIdx; // #36314#
- bHorz=nAngle2==0 || nAngle2==18000; // #52000#
+ nIdx=rXP.GetPointCount()-nIdx;
+ bHorz=nAngle2==0 || nAngle2==18000;
}
if ((nIdx & 1)==1) bHorz=!bHorz;
return bHorz;
@@ -181,9 +181,8 @@ SdrEdgeObj::SdrEdgeObj()
nNotifyingCount(0),
bEdgeTrackDirty(sal_False),
bEdgeTrackUserDefined(sal_False),
- // #109007# Default is to allow default connects
+ // Default is to allow default connects
mbSuppressDefaultConnect(sal_False),
- // #110649#
mbBoundRectCalculationRunning(sal_False)
{
bClosedObj=sal_False;
@@ -266,7 +265,6 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo()
}
}
- // #84649#
ImpDirtyEdgeTrack();
}
@@ -325,7 +323,7 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
if(n != nValAnz || nVals[0] != nVal1 || nVals[1] != nVal2 || nVals[2] != nVal3)
{
- // #75371# Here no more notifying is necessary, just local changes are OK.
+ // Here no more notifying is necessary, just local changes are OK.
if(n != nValAnz)
{
GetProperties().SetObjectItemDirect(SdrEdgeLineDeltaAnzItem(n));
@@ -455,12 +453,12 @@ SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const
const SdrGluePointList* SdrEdgeObj::GetGluePointList() const
{
- return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder #31671#
+ return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder
}
SdrGluePointList* SdrEdgeObj::ForceGluePointList()
{
- return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder #31671#
+ return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder
}
bool SdrEdgeObj::IsEdge() const
@@ -555,7 +553,6 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
if ( bEdgeTrackUserDefined && (GetModel() && GetModel()->isLocked()) )
return;
- // #110649#
if(IsBoundRectCalculationRunning())
{
// this object is involved into another ImpRecalcEdgeTrack() call
@@ -582,18 +579,15 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
SetRectsDirty();
- // #110094#-14 if (!bEdgeTrackDirty) SendRepaintBroadcast();
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
ImpSetEdgeInfoToAttr(); // Die Werte aus aEdgeInfo in den Pool kopieren
bEdgeTrackDirty=sal_False;
// Only redraw here, no object change
ActionChanged();
- // BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
- // #110649#
((SdrEdgeObj*)this)->mbBoundRectCalculationRunning = sal_False;
}
}
@@ -729,7 +723,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
if (bCon1) {
if (rCon1.pObj==(SdrObject*)this)
{
- // sicherheitshalber Abfragen #44515#
+ // sicherheitshalber Abfragen
aBoundRect1=aOutRect;
}
else
@@ -752,7 +746,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
aBewareRect1=aBoundRect1;
}
if (bCon2) {
- if (rCon2.pObj==(SdrObject*)this) { // sicherheitshalber Abfragen #44515#
+ if (rCon2.pObj==(SdrObject*)this) { // sicherheitshalber Abfragen
aBoundRect2=aOutRect;
}
else
@@ -1536,7 +1530,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
bool bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC;
bool bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC;
if (bDying && (bObj1 || bObj2)) {
- // #35605# Dying vorher abfangen, damit AttrObj nicht
+ // Dying vorher abfangen, damit AttrObj nicht
// wg. vermeintlicher Vorlagenaenderung rumbroadcastet
if (bObj1) aCon1.pObj=NULL;
if (bObj2) aCon2.pObj=NULL;
@@ -1560,12 +1554,10 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
// Broadcasting nur, wenn auf der selben Page
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 if (!bEdgeTrackDirty) SendRepaintBroadcast();
ImpDirtyEdgeTrack();
// only redraw here, no objectchange
ActionChanged();
- // BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
}
@@ -1575,7 +1567,6 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
/** updates edges that are connected to the edges of this object
as if the connected objects send a repaint broadcast
- #103122#
*/
void SdrEdgeObj::Reformat()
{
@@ -1895,8 +1886,6 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
// save EdgeInfos and mark object as user modified
ImpSetEdgeInfoToAttr();
bEdgeTrackUserDefined = false;
- //SetRectsDirty();
- //SetChanged();
if(bOriginalEdgeModified && rDragStat.GetView())
{
@@ -2065,7 +2054,7 @@ Pointer SdrEdgeObj::GetCreatePointer() const
bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut)
{
rCon.ResetVars();
- if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); // GetWin(0);
+ if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice();
if (pOut==NULL) return sal_False;
SdrObjList* pOL=rPV.GetObjList();
const SetOfByte& rVisLayer=rPV.GetVisibleLayers();
@@ -2136,7 +2125,6 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
}
else if (bCenter && !bUserFnd && !bEdge)
{
- // #109007#
// Suppress default connect at object center
if(!pThis || !pThis->GetSuppressDefaultConnect())
{
@@ -2167,7 +2155,6 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
!bEdge &&
SdrObjectPrimitiveHit(*pObj, rPt, nBoundHitTol, rPV, &rVisLayer, false))
{
- // #109007#
// Suppress default connect at object inside bound
if(!pThis || !pThis->GetSuppressDefaultConnect())
{
@@ -2232,10 +2219,9 @@ void SdrEdgeObj::NbcResize(const Point& rRefPnt, const Fraction& aXFact, const F
SdrTextObj::NbcResize(rRefPnt,aXFact,aXFact);
ResizeXPoly(*pEdgeTrack,rRefPnt,aXFact,aYFact);
- // #75371# if resize is not from paste, forget user distances
+ // if resize is not from paste, forget user distances
if(!GetModel()->IsPasteResize())
{
- // #75735#
aEdgeInfo.aObj1Line2 = Point();
aEdgeInfo.aObj1Line3 = Point();
aEdgeInfo.aObj2Line2 = Point();
@@ -2386,7 +2372,6 @@ void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt )
void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ )
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect();
- // #110094#-14 BroadcastObjectChange();
SdrObjConnection& rConn1 = GetConnection( bTail );
@@ -2396,8 +2381,7 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */
if( nIndex > 3 )
{
-// nIndex -= 4;
- nIndex -= 3; // SJ: the start api index is 0, whereas the implementation in svx starts from 1
+ nIndex -= 3; // the start api index is 0, whereas the implementation in svx starts from 1
// for user defined glue points we have
// to get the id for this index first
@@ -2415,7 +2399,6 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */
SetChanged();
SetRectsDirty();
ImpRecalcEdgeTrack();
- // bEdgeTrackDirty=sal_True;
}
/** this method is used by the api to return a glue point id for a connection.
@@ -2428,13 +2411,12 @@ sal_Int32 SdrEdgeObj::getGluePointIndex( sal_Bool bTail )
{
nId = rConn1.GetConnectorId();
if( !rConn1.IsAutoVertex() )
-// nId += 4;
- nId += 3; // SJ: the start api index is 0, whereas the implementation in svx starts from 1
+ nId += 3; // the start api index is 0, whereas the implementation in svx starts from 1
}
return nId;
}
-// #102344# Implementation was missing; edge track needs to be invalidated additionally.
+// Implementation was missing; edge track needs to be invalidated additionally.
void SdrEdgeObj::NbcSetAnchorPos(const Point& rPnt)
{
// call parent functionality
@@ -2476,7 +2458,4 @@ void SdrEdgeObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
}
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 5dfb6c1..4f6c4f4 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -333,7 +333,6 @@ SdrGrafObj::SdrGrafObj()
pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
bNoShear = sal_True;
- // #111096#
mbGrafAnimationAllowed = sal_True;
// #i25616#
@@ -356,7 +355,6 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect)
pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
bNoShear = sal_True;
- // #111096#
mbGrafAnimationAllowed = sal_True;
// #i25616#
@@ -379,7 +377,6 @@ SdrGrafObj::SdrGrafObj( const Graphic& rGrf )
pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
bNoShear = sal_True;
- // #111096#
mbGrafAnimationAllowed = sal_True;
// #i25616#
@@ -451,7 +448,7 @@ const Graphic& SdrGrafObj::GetGraphic() const
Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
{
- // #107947# Refactored most of the code to GraphicObject, where
+ // Refactored most of the code to GraphicObject, where
// everybody can use e.g. the cropping functionality
GraphicType eType = GetGraphicType();
@@ -461,7 +458,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
const sal_Bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType );
- // #104115# Need cropping info earlier
+ // Need cropping info earlier
( (SdrGrafObj*) this )->ImpSetAttrToGrafInfo();
GraphicAttr aActAttr;
@@ -485,7 +482,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
aActAttr.SetRotation( sal_uInt16(aGeo.nDrehWink / 10) );
}
- // #107947# Delegate to moved code in GraphicObject
+ // Delegate to moved code in GraphicObject
return GetGraphicObject().GetTransformedGraphic( aDestSize, aDestMap, aActAttr );
}
@@ -652,7 +649,7 @@ void SdrGrafObj::SetGraphicLink( const String& rFileName, const String& rFilterN
ImpLinkAnmeldung();
pGraphic->SetUserData();
- // #92205# A linked graphic is per definition swapped out (has to be loaded)
+ // A linked graphic is per definition swapped out (has to be loaded)
pGraphic->SetSwapState();
}
@@ -1025,8 +1022,6 @@ void SdrGrafObj::SetModel( SdrModel* pNewModel )
void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoint*/, const Size& /*rSize*/, long /*nExtraData*/)
{
- // #111096#
- // use new graf animation
SetGrafAnimationAllowed(sal_True);
}
@@ -1034,8 +1029,6 @@ void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoin
void SdrGrafObj::StopAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/)
{
- // #111096#
- // use new graf animation
SetGrafAnimationAllowed(sal_False);
}
@@ -1294,9 +1287,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
if(mbInsidePaint && !GetViewContact().HasViewObjectContacts(true))
{
-// Rectangle aSnapRect(GetSnapRect());
-// const Rectangle aSnapRectPixel(pOutDev->LogicToPixel(aSnapRect));
-
pFilterData = new com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >( 3 );
com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
@@ -1320,7 +1310,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
pGraphic->SetGraphic( aGraphic );
pGraphic->SetUserData( aUserData );
- // #142146# Graphic successfully swapped in.
+ // Graphic successfully swapped in.
pRet = GRFMGR_AUTOSWAPSTREAM_LOADED;
}
delete pFilterData;
@@ -1357,8 +1347,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
// -----------------------------------------------------------------------------
-// #111096#
-// Access to GrafAnimationAllowed flag
sal_Bool SdrGrafObj::IsGrafAnimationAllowed() const
{
return mbGrafAnimationAllowed;
@@ -1391,9 +1379,6 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
if( pModel )
{
-// if( !pGraphic->HasUserData() )
-// pGraphic->SwapOut();
-
// kann aus dem original Doc-Stream nachgeladen werden...
if( pGraphic->HasUserData() )
{
@@ -1438,6 +1423,4 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
return xStream;
}
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index bd751c4..b016623 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -51,7 +51,7 @@
#include <svx/svdtrans.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdattrx.hxx> // NotPersistItems
-#include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten
+#include <svx/svdoedge.hxx> // Die Verbinder nach Move nochmal anbroadcasten
#include "svx/svdglob.hxx" // StringCache
#include "svx/svdstr.hrc" // Objektname
@@ -59,23 +59,11 @@
#include <svl/whiter.hxx>
#include <svx/svdpool.hxx>
#include <svx/sdr/properties/groupproperties.hxx>
-
-// #110094#
#include <svx/sdr/contact/viewcontactofgroup.hxx>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@ @@@@@ @@@@@@ @@@@ @@@@@ @@@@ @@ @@ @@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@ @@@ @@@@@ @@ @@ @@ @@ @@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@ @@@@@ @@@@ @@@@@ @@ @@ @@@@ @@@@ @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
//////////////////////////////////////////////////////////////////////////////
// BaseProperties section
@@ -85,7 +73,7 @@ sdr::properties::BaseProperties* SdrObjGroup::CreateObjectSpecificProperties()
}
//////////////////////////////////////////////////////////////////////////////
-// #110094# DrawContact section
+// DrawContact section
sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact()
{
@@ -272,7 +260,7 @@ SdrObjList* SdrObjGroup::GetSubList() const
const Rectangle& SdrObjGroup::GetCurrentBoundRect() const
{
- // <aOutRect> has to contain the bounding rectangle (#144962#)
+ // <aOutRect> has to contain the bounding rectangle
if ( pSub->GetObjCount()!=0 )
{
const_cast<SdrObjGroup*>(this)->aOutRect = pSub->GetAllObjBoundRect();
@@ -284,7 +272,7 @@ const Rectangle& SdrObjGroup::GetCurrentBoundRect() const
const Rectangle& SdrObjGroup::GetSnapRect() const
{
- // <aOutRect> has to contain the bounding rectangle (#144962#)
+ // <aOutRect> has to contain the bounding rectangle
if ( pSub->GetObjCount()!=0 )
{
return pSub->GetAllObjSnapRect();
@@ -578,7 +566,7 @@ void SdrObjGroup::Move(const Size& rSiz)
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
MovePoint(aRefPoint,rSiz);
if (pSub->GetObjCount()!=0) {
- // #32383# Erst die Verbinder verschieben, dann den Rest
+ // Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
sal_uIntPtr i;
@@ -591,7 +579,6 @@ void SdrObjGroup::Move(const Size& rSiz)
if (!pObj->IsEdgeObj()) pObj->Move(rSiz);
}
} else {
- // #110094#-14 SendRepaintBroadcast();
MoveRect(aOutRect,rSiz);
SetRectsDirty();
}
@@ -624,7 +611,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
ResizePoint(aRefPoint,rRef,xFact,yFact);
if (pSub->GetObjCount()!=0) {
- // #32383# Erst die Verbinder verschieben, dann den Rest
+ // Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
sal_uIntPtr i;
@@ -637,7 +624,6 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
if (!pObj->IsEdgeObj()) pObj->Resize(rRef,xFact,yFact);
}
} else {
- // #110094#-14 SendRepaintBroadcast();
ResizeRect(aOutRect,rRef,xFact,yFact);
SetRectsDirty();
}
@@ -656,7 +642,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
nDrehWink=NormAngle360(nDrehWink+nWink);
RotatePoint(aRefPoint,rRef,sn,cs);
- // #32383# Erst die Verbinder verschieben, dann den Rest
+ // Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
sal_uIntPtr i;
@@ -682,7 +668,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
SetGlueReallyAbsolute(sal_True);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
- // #32383# Erst die Verbinder verschieben, dann den Rest
+ // Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
sal_uIntPtr i;
@@ -709,7 +695,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
nShearWink+=nWink;
ShearPoint(aRefPoint,rRef,tn);
- // #32383# Erst die Verbinder verschieben, dann den Rest
+ // Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
sal_uIntPtr i;
@@ -737,7 +723,7 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt)
aAnchor=rPnt;
Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
MovePoint(aRefPoint,aSiz);
- // #32383# Erst die Verbinder verschieben, dann den Rest
+ // Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
sal_uIntPtr i;
@@ -800,6 +786,4 @@ SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const
return pGroup;
}
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index b893462..8226616 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -92,8 +92,6 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
bShowUnit = ((SdrMeasureShowUnitItem&)rSet.Get(SDRATTR_MEASURESHOWUNIT)).GetValue();
sal_Int16 nNumDigits = ((SdrMeasureDecimalPlacesItem&)rSet.Get(SDRATTR_MEASUREDECIMALPLACES)).GetValue();
- //SdrModel* pModel = rObj.pModel;
-
switch(eMeasureFieldKind)
{
case SDRMEASUREFIELD_VALUE:
@@ -780,7 +778,7 @@ SdrHdl* SdrMeasureObj::GetHdl(sal_uInt32 nHdlNum) const
aRec.nHelplineDist=0;
ImpCalcGeometrics(aRec,aMPol);
Point aPt;
- //SdrHdlKind eHdl=HDL_POLY;
+
switch (nHdlNum) {
case 0: aPt=aMPol.aHelpline1.aP1; break;
case 1: aPt=aMPol.aHelpline2.aP1; break;
@@ -1087,7 +1085,7 @@ long SdrMeasureObj::GetRotateAngle() const
void SdrMeasureObj::RecalcSnapRect()
{
- // #94520# Added correct implementation here.
+ // Added correct implementation here.
ImpMeasureRec aRec;
ImpMeasurePoly aMPol;
XPolyPolygon aXPP;
@@ -1194,7 +1192,6 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
// four lines, middle line with gap, so there are two lines used
// which have one arrow each
- //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
aSet.Put(XLineEndWidthItem(0L));
@@ -1225,7 +1222,6 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const
else if(nCount == 5)
{
// five lines, first two are the outer ones
- //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
aSet.Put(XLineEndWidthItem(0L));
@@ -1487,7 +1483,4 @@ void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons
}
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index bd10258..53dde8b 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -423,8 +423,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
}
}
} // for(sal_Int32 i = nCount-1 ; i >= 0;--i)
-
- //m_pClient->GetViewShell()->UIActivating( m_pClient );
}
//--------------------------------------------------------------------
@@ -575,9 +573,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
}
else
mpObj->ActionChanged();
-
- // let the window size be recalculated
- //SizeHasChanged(); // TODO: OJ
}
}
// XWindowSupplier
@@ -688,7 +683,6 @@ public:
String aPersistName; // name of object in persist
SdrLightEmbeddedClient_Impl* pLightClient; // must be registered as client only using AddOwnLightClient() call
- // #107645#
// New local var to avoid repeated loading if load of OLE2 fails
sal_Bool mbLoadingOLEObjectFailed;
sal_Bool mbConnected;
@@ -699,7 +693,6 @@ public:
SdrOle2ObjImpl()
: pGraphicObject( NULL )
, pLightClient ( NULL )
- // #107645#
// init to start situation, loading did not fail
, mbLoadingOLEObjectFailed( sal_False )
, mbConnected( sal_False )
@@ -776,7 +769,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_)
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
SetResizeProtect(sal_True);
- // #108759# For math objects, set closed state to transparent
+ // For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
SetClosedObj( false );
}
@@ -798,7 +791,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
SetResizeProtect(sal_True);
- // #108759# For math objects, set closed state to transparent
+ // For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
SetClosedObj( false );
}
@@ -821,7 +814,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStri
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
SetResizeProtect(sal_True);
- // #108759# For math objects, set closed state to transparent
+ // For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
SetClosedObj( false );
}
@@ -898,9 +891,6 @@ void SdrOle2Obj::SetGraphic_Impl(const Graphic* pGrf)
SetChanged();
BroadcastObjectChange();
-
- //if ( ppObjRef->Is() && pGrf )
- // BroadcastObjectChange();
}
void SdrOle2Obj::SetGraphic(const Graphic* pGrf)
@@ -925,7 +915,7 @@ void SdrOle2Obj::Connect()
if( mpImpl->mbConnected )
{
- // mba: currently there are situations where it seems to be unavoidable to have multiple connects
+ // currently there are situations where it seems to be unavoidable to have multiple connects
// changing this would need a larger code rewrite, so for now I remove the assertion
// OSL_FAIL("Connect() called on connected object!");
return;
@@ -1439,12 +1429,12 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
if( rNewObjRef == xObjRef.GetObject() )
return;
- // MBA: the caller of the method is responsible to control the old object, it will not be closed here
+ // the caller of the method is responsible to control the old object, it will not be closed here
// Otherwise WW8 import crashes because it tranfers control to OLENode by this method
if ( xObjRef.GetObject().is() )
xObjRef.Lock( sal_False );
- // MBA: avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)!
+ // avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)!
// This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener
xObjRef.Clear();
@@ -1461,7 +1451,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
SetResizeProtect(sal_True);
- // #108759# For math objects, set closed state to transparent
+ // For math objects, set closed state to transparent
if( ImplIsMathObj( rNewObjRef ) )
SetClosedObj( false );
@@ -1477,7 +1467,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
void SdrOle2Obj::SetClosedObj( bool bIsClosed )
{
// TODO/LATER: do we still need this hack?
- // #108759# Allow changes to the closed state of OLE objects
+ // Allow changes to the closed state of OLE objects
bClosedObj = bIsClosed;
}
@@ -1622,7 +1612,7 @@ SdrOle2Obj& SdrOle2Obj::operator=(const SdrOle2Obj& rObj)
SdrRectObj::operator=( rObj );
- // #108867# Manually copying bClosedObj attribute
+ // Manually copying bClosedObj attribute
SetClosedObj( rObj.IsClosedObj() );
mpImpl->aPersistName = rOle2Obj.mpImpl->aPersistName;
@@ -1660,30 +1650,6 @@ SdrOle2Obj& SdrOle2Obj::operator=(const SdrOle2Obj& rObj)
}
Connect();
-
- /* only needed for MSOLE-Objects, now handled inside implementation of Object
- if ( xObjRef.is() && rOle2Obj.xObjRef.is() && rOle2Obj.GetAspect() != embed::Aspects::MSOLE_ICON )
- {
- try
- {
- awt::Size aVisSize = rOle2Obj.xObjRef->getVisualAreaSize( rOle2Obj.GetAspect() );
- if( rOle2Obj.xObjRef->getMapUnit( rOle2Obj.GetAspect() ) == xObjRef->getMapUnit( GetAspect() ) )
- xObjRef->setVisualAreaSize( GetAspect(), aVisSize );
- }
- catch ( embed::WrongStateException& )
- {
- // setting of VisArea not necessary for objects that don't cache it in loaded state
- }
- catch( embed::NoVisualAreaSizeException& )
- {
- // objects my not have visual areas
- }
- catch( uno::Exception& e )
- {
- (void)e;
- OSL_FAIL( "SdrOle2Obj::operator=(), unexpected exception caught!" );
- }
- } */
}
}
}
@@ -1768,7 +1734,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
// make the new object area known to the client
// compared to the "else" branch aRect might have been changed by the object and no additional scaling was applied
- // OJ: WHY this -> OSL_ASSERT( pClient );
+ // WHY this -> OSL_ASSERT( pClient );
if( pClient )
pClient->SetObjArea(aRect);
@@ -2013,7 +1979,6 @@ void SdrOle2Obj::GetObjRef_Impl()
{
if ( !xObjRef.is() && mpImpl->aPersistName.Len() && pModel && pModel->GetPersist() )
{
- // #107645#
// Only try loading if it did not went wrong up to now
if(!mpImpl->mbLoadingOLEObjectFailed)
{
@@ -2021,7 +1986,6 @@ void SdrOle2Obj::GetObjRef_Impl()
m_bTypeAsked = false;
CheckFileLink_Impl();
- // #107645#
// If loading of OLE object failed, remember that to not invoke a endless
// loop trying to load it again and again.
if( xObjRef.is() )
@@ -2029,7 +1993,7 @@ void SdrOle2Obj::GetObjRef_Impl()
mpImpl->mbLoadingOLEObjectFailed = sal_True;
}
- // #108759# For math objects, set closed state to transparent
+ // For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
SetClosedObj( false );
}
@@ -2038,14 +2002,14 @@ void SdrOle2Obj::GetObjRef_Impl()
{
if( !IsEmptyPresObj() )
{
- // #75637# remember modified status of model
+ // remember modified status of model
const sal_Bool bWasChanged(pModel ? pModel->IsChanged() : sal_False);
// perhaps preview not valid anymore
- // #75637# This line changes the modified state of the model
+ // This line changes the modified state of the model
SetGraphic_Impl( NULL );
- // #75637# if status was not set before, force it back
+ // if status was not set before, force it back
// to not set, so that SetGraphic(0L) above does not
// set the modified state of the model.
if(!bWasChanged && pModel && pModel->IsChanged())
@@ -2115,7 +2079,6 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const
// -----------------------------------------------------------------------------
-// #109985#
sal_Bool SdrOle2Obj::IsChart() const
{
if ( !m_bTypeAsked )
@@ -2239,7 +2202,4 @@ void SdrOle2Obj::SetWindow(const com::sun::star::uno::Reference < com::sun::star
}
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 2c73c59..3d17039 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -41,8 +41,6 @@
#include <svtools/colorcfg.hxx>
#include <svl/itemset.hxx>
#include <svx/sdr/properties/pageproperties.hxx>
-
-// #111111#
#include <svx/sdr/contact/viewcontactofpageobj.hxx>
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -103,20 +101,17 @@ SdrPageObj::SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage)
SdrPageObj::~SdrPageObj()
{
- // #111111#
if(mpShownPage)
{
mpShownPage->RemovePageUser(*this);
}
}
-// #111111#
SdrPage* SdrPageObj::GetReferencedPage() const
{
return mpShownPage;
}
-// #111111#
void SdrPageObj::SetReferencedPage(SdrPage* pNewPage)
{
if(mpShownPage != pNewPage)
@@ -201,6 +196,4 @@ void SdrPageObj::TakeObjNamePlural(XubString& rName) const
rName=ImpGetResStr(STR_ObjNamePluralPAGE);
}
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 1f919ed..6ec3f87 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -61,7 +61,7 @@
#include <svx/sdr/contact/viewcontactofsdrpathobj.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-// #104018# replace macros above with type-safe methods
+// replace macros above with type-safe methods
inline sal_Int32 ImplTwipsToMM(sal_Int32 nVal) { return ((nVal * 127 + 36) / 72); }
inline sal_Int32 ImplMMToTwips(sal_Int32 nVal) { return ((nVal * 72 + 63) / 127); }
inline sal_Int64 ImplTwipsToMM(sal_Int64 nVal) { return ((nVal * 127 + 36) / 72); }
@@ -128,7 +128,6 @@ struct ImpSdrPathDragData : public SdrDragStatUserData
sal_uInt16 nNextNextPnt0;
bool bEliminate; // Punkt loeschen? (wird von MovDrag gesetzt)
- // ##
sal_Bool mbMultiPointDrag;
const XPolyPolygon maOrig;
XPolyPolygon maMove;
@@ -908,7 +907,7 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag)
// Winkel anpassen fuer Text an einfacher Linie
if (bLineGlueMirror)
- { // #40549#
+ {
Point aLinePt1_(aPathPolygon[0][0]);
Point aLinePt2_(aPathPolygon[0][1]);
bool bXMirr=(aLinePt1_.X()>aLinePt2_.X())!=(aLinePt1.X()>aLinePt2.X());
@@ -935,14 +934,6 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag)
return true;
}
-/*void ImpPathForDragAndCreate::cancelSpecialDrag( SdrDragStat& rDrag ) const
-{
- ImpSdrPathDragData* pID=(ImpSdrPathDragData*)rDrag.GetUser();
- if (pID!=NULL) {
- delete pID;
- rDrag.SetUser(NULL);
- }
-}*/
String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) const
{
@@ -1180,7 +1171,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
else
{
const XPolygon& rXP=aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()];
- if (rXP.GetPointCount()<=2) { //|| rXPoly.GetFlags(1)==XPOLY_CONTROL && rXPoly.GetPointCount()<=4
+ if (rXP.GetPointCount()<=2) {
XPolygon aXPoly(rXP);
aXPoly[(sal_uInt16)rDrag.GetHdl()->GetPointNum()]=rDrag.GetNow();
aRetval.Insert(aXPoly);
@@ -1342,7 +1333,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
rXPoly[0]=rStat.GetPos0();
} else nActPoint--;
bool bFreeHand=IsFreeHand(pU->eAktKind);
- rStat.SetNoSnap(bFreeHand /*|| (pU->bMixed && pU->eAktKind==OBJ_LINE)*/);
+ rStat.SetNoSnap(bFreeHand);
rStat.SetOrtho8Possible(pU->eAktKind!=OBJ_CARC && pU->eAktKind!=OBJ_RECT && (!pU->bMixedCreate || pU->eAktKind!=OBJ_LINE));
Point aActMerk(rXPoly[nActPoint]);
rXPoly[nActPoint]=rStat.Now();
@@ -1354,7 +1345,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
}
rXPoly[0]=aPt;
}
- OutputDevice* pOut=pView==NULL ? NULL : pView->GetFirstOutputDevice(); // GetWin(0);
+ OutputDevice* pOut=pView==NULL ? NULL : pView->GetFirstOutputDevice();
if (bFreeHand) {
if (pU->nBezierStartPoint>nActPoint) pU->nBezierStartPoint=nActPoint;
if (rStat.IsMouseDown() && nActPoint>0) {
@@ -1732,7 +1723,7 @@ void SdrPathObj::ImpForceLineWink()
aGeo.RecalcSinCos();
aGeo.RecalcTan();
- // #101412# for SdrTextObj, keep aRect up to date
+ // for SdrTextObj, keep aRect up to date
aRect = Rectangle(aPoint0, aPoint1);
aRect.Justify();
}
@@ -1776,7 +1767,7 @@ void SdrPathObj::ImpForceKind()
}
else
{
- // #i10659#, similar to #101412# but for polys with more than 2 points.
+ // #i10659#, for polys with more than 2 points.
//
// Here i again need to fix something, because when Path-Polys are Copy-Pasted
// between Apps with different measurements (e.g. 100TH_MM and TWIPS) there is
@@ -2420,7 +2411,7 @@ void SdrPathObj::NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2)
aTrans.translate(rRefPnt1.X(), rRefPnt1.Y());
maPathPolygon.transform(aTrans);
- // #97538# Do Joe's special handling for lines when mirroring, too
+ // Do Joe's special handling for lines when mirroring, too
ImpForceKind();
// #i19871# first modify locally, then call parent (to get correct SnapRect with GluePoints)
@@ -2457,12 +2448,12 @@ void SdrPathObj::NbcSetSnapRect(const Rectangle& rRect)
{
Rectangle aOld(GetSnapRect());
- // #95736# Take RECT_EMPTY into account when calculating scale factors
+ // Take RECT_EMPTY into account when calculating scale factors
long nMulX = (RECT_EMPTY == rRect.Right()) ? 0 : rRect.Right() - rRect.Left();
long nDivX = aOld.Right() - aOld.Left();
- // #95736# Take RECT_EMPTY into account when calculating scale factors
+ // Take RECT_EMPTY into account when calculating scale factors
long nMulY = (RECT_EMPTY == rRect.Bottom()) ? 0 : rRect.Bottom() - rRect.Top();
long nDivY = aOld.Bottom() - aOld.Top();
@@ -2827,7 +2818,7 @@ void SdrPathObj::SetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly)
}
}
-void SdrPathObj::ToggleClosed() // long nOpenDistance)
+void SdrPathObj::ToggleClosed()
{
Rectangle aBoundRect0;
if(pUserCall != NULL)
@@ -3119,7 +3110,4 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
SetPathPoly(aNewPolyPolygon);
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index f8bb958..3d2ddc6 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -587,7 +587,7 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius()));
- { // #40608# Nur Uebergangsweise bis zum neuen TakeContour()
+ { // Nur Uebergangsweise bis zum neuen TakeContour()
aXP.Remove(0,1);
aXP[aXP.GetPointCount()-1]=aXP[0];
}
@@ -618,6 +618,4 @@ void SdrRectObj::RestGeoData(const SdrObjGeoData& rGeo)
SetXPolyDirty();
}
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 2d58ef4..5524e3f 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -74,21 +74,10 @@
using namespace com::sun::star;
//////////////////////////////////////////////////////////////////////////////
-// #104018# replace macros above with type-safe methods
+// replace macros above with type-safe methods
inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); }
inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// BaseProperties section
@@ -124,16 +113,9 @@ SdrTextObj::SdrTextObj()
bNoMirror=sal_False;
bDisableAutoWidthOnDragging=sal_False;
- // #101684#
mbInEditMode = sal_False;
-
- // #111096#
mbTextHidden = sal_False;
-
- // #111096#
mbTextAnimationAllowed = sal_True;
-
- // #108784#
maTextEditOffset = Point(0, 0);
// #i25616#
@@ -156,17 +138,10 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
bDisableAutoWidthOnDragging=sal_False;
ImpJustifyRect(aRect);
- // #101684#
mbInEditMode = sal_False;
-
- // #111096#
mbTextHidden = sal_False;
-
- // #111096#
mbTextAnimationAllowed = sal_True;
mbInDownScale = sal_False;
-
- // #108784#
maTextEditOffset = Point(0, 0);
// #i25616#
@@ -187,17 +162,10 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
bNoMirror=sal_True;
bDisableAutoWidthOnDragging=sal_False;
- // #101684#
mbInEditMode = sal_False;
-
- // #111096#
mbTextHidden = sal_False;
-
- // #111096#
mbTextAnimationAllowed = sal_True;
mbInDownScale = sal_False;
-
- // #108784#
maTextEditOffset = Point(0, 0);
// #i25616#
@@ -220,17 +188,10 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
bDisableAutoWidthOnDragging=sal_False;
ImpJustifyRect(aRect);
- // #101684#
mbInEditMode = sal_False;
-
- // #111096#
mbTextHidden = sal_False;
-
- // #111096#
mbTextAnimationAllowed = sal_True;
mbInDownScale = sal_False;
-
- // #108784#
maTextEditOffset = Point(0, 0);
// #i25616#
@@ -255,17 +216,10 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStr
NbcSetText(rInput, rBaseURL, eFormat);
- // #101684#
mbInEditMode = sal_False;
-
- // #111096#
mbTextHidden = sal_False;
-
- // #111096#
mbTextAnimationAllowed = sal_True;
mbInDownScale = sal_False;
-
- // #108784#
maTextEditOffset = Point(0, 0);
// #i25616#
@@ -321,12 +275,10 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
{
SdrOutliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetStyleSheet( 0, GetStyleSheet());
- //OutputDevice* pRef1=rOutliner.GetRefDevice();
rOutliner.SetUpdateMode(sal_True);
rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 ));
OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
Size aSiz(rOutliner.CalcTextSize());
- //OutputDevice* pRef2=rOutliner.GetRefDevice();
rOutliner.Clear();
NbcSetOutlinerParaObject(pNewText);
aTextSize=aSiz;
@@ -336,14 +288,10 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
void SdrTextObj::SetText(const XubString& rStr)
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetText(rStr);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
- //if (GetBoundRect()!=aBoundRect0) {
- // SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
- //}
}
void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
@@ -363,7 +311,6 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16
void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcSetText(rInput,rBaseURL,eFormat);
SetChanged();
BroadcastObjectChange();
@@ -424,7 +371,6 @@ bool SdrTextObj::IsAutoGrowWidth() const
const SfxItemSet& rSet = GetObjectItemSet();
sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
- // #101684#
sal_Bool bInEditMOde = IsInEditMode();
if(!bInEditMOde && bRet)
@@ -456,7 +402,6 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co
SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
- // #101684#
sal_Bool bInEditMode = IsInEditMode();
if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK)
@@ -487,11 +432,11 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons
if(IsContourTextFrame())
return SDRTEXTVERTADJUST_TOP;
- // #103516# Take care for vertical text animation here
+ // Take care for vertical text animation here
SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
sal_Bool bInEditMode = IsInEditMode();
- // #103516# Take care for vertical text animation here
+ // Take care for vertical text animation here
if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK)
{
SdrTextAniKind eAniKind = ((SdrTextAniKindItem&)(rSet.Get(SDRATTR_TEXT_ANIKIND))).GetValue();
@@ -656,11 +601,11 @@ bool SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
{
- if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // SJ: #i44922#
+ if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // #i44922#
{
SetObjectItem(SdrTextMinFrameHeightItem(nHgt));
- // #84974# use bDisableAutoWidthOnDragging as
+ // use bDisableAutoWidthOnDragging as
// bDisableAutoHeightOnDragging if vertical.
if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
@@ -695,11 +640,11 @@ bool SdrTextObj::NbcSetAutoGrowWidth(bool bAuto)
bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
{
- if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // SJ: #i44922#
+ if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // #i44922#
{
SetObjectItem(SdrTextMinFrameWidthItem(nWdt));
- // #84974# use bDisableAutoWidthOnDragging only
+ // use bDisableAutoWidthOnDragging only
// when not vertical.
if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
@@ -753,7 +698,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
// Beim Hittest muss das unterbleiben (Performance!)
pContourPolyPolygon = new basegfx::B2DPolyPolygon();
- // #86258# test if shadow needs to be avoided for TakeContour()
+ // test if shadow needs to be avoided for TakeContour()
const SfxItemSet& rSet = GetObjectItemSet();
sal_Bool bShadowOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue();
@@ -765,7 +710,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
if(bShadowOn)
{
- // #86258# force shadow off
+ // force shadow off
SdrObject* pCopy = Clone();
pCopy->SetMergedItem(SdrShadowItem(sal_False));
*pContourPolyPolygon = pCopy->TakeContour();
@@ -811,7 +756,6 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
aAnkRect.Right()-=nRightDist;
aAnkRect.Bottom()-=nLowerDist;
- // #108816#
// Since sizes may be bigger than the object bounds it is necessary to
// justify the rect now.
ImpJustifyRect(aAnkRect);
@@ -862,7 +806,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
long nWdt=nAnkWdt;
long nHgt=nAnkHgt;
- // #101684#
sal_Bool bInEditMode = IsInEditMode();
if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
@@ -874,7 +817,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
rOutliner.SetMaxAutoPaperSize(Size(nWdt,nHgt));
}
- // #103516# New try with _BLOCK for hor and ver after completely
+ // New try with _BLOCK for hor and ver after completely
// supporting full width for vertical text.
if(SDRTEXTHORZADJUST_BLOCK == eHAdj && !IsVerticalWriting())
{
@@ -933,7 +876,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
Point aTextPos(aAnkRect.TopLeft());
Size aTextSiz(rOutliner.GetPaperSize()); // GetPaperSize() hat etwas Toleranz drauf, oder?
- // #106653#
// For draw objects containing text correct hor/ver alignment if text is bigger
// than the object itself. Without that correction, the text would always be
// formatted to the left edge (or top edge when vertical) of the draw object.
@@ -941,7 +883,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
{
if(aAnkRect.GetWidth() < aTextSiz.Width() && !IsVerticalWriting())
{
- // #110129#
// Horizontal case here. Correct only if eHAdj == SDRTEXTHORZADJUST_BLOCK,
// else the alignment is wanted.
if(SDRTEXTHORZADJUST_BLOCK == eHAdj)
@@ -952,7 +893,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
if(aAnkRect.GetHeight() < aTextSiz.Height() && IsVerticalWriting())
{
- // #110129#
// Vertical case here. Correct only if eHAdj == SDRTEXTVERTADJUST_BLOCK,
// else the alignment is wanted.
if(SDRTEXTVERTADJUST_BLOCK == eVAdj)
@@ -1008,7 +948,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
if(pOut && pOut->GetOutDevType() == OUTDEV_PRINTER)
{
- // #35762#: Checken ob CharStretching ueberhaupt moeglich
+ // Checken ob CharStretching ueberhaupt moeglich
GDIMetaFile* pMtf = pOut->GetConnectMetaFile();
UniString aTestString(sal_Unicode('J'));
@@ -1035,7 +975,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
bNoStretching = (aSize1 == aSize2);
#ifdef WNT
- // #35762# Windows vergroessert bei Size(100,500) den Font proportional
+ // Windows vergroessert bei Size(100,500) den Font proportional
// Und das finden wir nicht so schoen.
if(aSize2.Height() >= aSize1.Height() * 2)
{
@@ -1061,7 +1001,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
long nX=(nWantWdt*100) /nIsWdt; // X-Stretching berechnen
long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen
bool bChkX = true;
- if (bNoStretching) { // #35762# evtl. nur proportional moeglich
+ if (bNoStretching) { // evtl. nur proportional moeglich
if (nX>nY) { nX=nY; bChkX=sal_False; }
else { nY=nX; }
}
@@ -1082,7 +1022,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
bNoMoreLoop = true;
}
- // #87877# exception, there is no text yet (vertical case)
+ // exception, there is no text yet (vertical case)
if(nIsHgt <= 1)
{
nY = nX;
@@ -1094,7 +1034,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
Size aSiz(rOutliner.CalcTextSize());
long nXDiff=aSiz.Width()-nWantWdt;
rFitXKorreg=Fraction(nWantWdt,aSiz.Width());
- if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0/*&& Abs(nYDiff)<=nYTol*/) {
+ if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0) {
bNoMoreLoop = true;
} else {
// Stretchingfaktoren korregieren
@@ -1113,14 +1053,12 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
void SdrTextObj::StartTextAnimation(OutputDevice* /*pOutDev*/, const Point& /*rOffset*/, long /*nExtraData*/)
{
- // #111096#
// use new text animation
SetTextAnimationAllowed(sal_True);
}
void SdrTextObj::StopTextAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/)
{
- // #111096#
// use new text animation
SetTextAnimationAllowed(sal_False);
}
@@ -1160,11 +1098,11 @@ void SdrTextObj::TakeObjNameSingul(XubString& rName) const
XubString aStr2(pOutlinerParaObject->GetTextObject().GetText(0));
aStr2.EraseLeadingChars();
- // #69446# avoid non expanded text portions in object name
+ // avoid non expanded text portions in object name
// (second condition is new)
if(aStr2.Len() && aStr2.Search(sal_Unicode(255)) == STRING_NOTFOUND)
{
- // #76681# space between ResStr and content text
+ // space between ResStr and content text
aStr += sal_Unicode(' ');
aStr += sal_Unicode('\'');
@@ -1227,7 +1165,7 @@ SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj)
aTextSize=rObj.aTextSize;
bTextSizeDirty=rObj.bTextSizeDirty;
- // #101776# Not all of the necessary parameters were copied yet.
+ // Not all of the necessary parameters were copied yet.
bNoShear = rObj.bNoShear;
bNoRotate = rObj.bNoRotate;
bNoMirror = rObj.bNoMirror;
@@ -1273,7 +1211,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const
// und nun noch ggf. das BoundRect des Textes dazu
if ( pModel && GetOutlinerParaObject() && !IsFontwork() && !IsContourTextFrame() )
{
- // #80328# using Clone()-Paint() strategy inside TakeContour() leaves a destroyed
+ // using Clone()-Paint() strategy inside TakeContour() leaves a destroyed
// SdrObject as pointer in DrawOutliner. Set *this again in fetching the outliner
// in every case
SdrOutliner& rOutliner=ImpGetDrawOutliner();
@@ -1350,7 +1288,7 @@ void SdrTextObj::ImpCheckMasterCachable()
}
}
-// #101029#: Extracted from ImpGetDrawOutliner()
+// Extracted from ImpGetDrawOutliner()
void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const
{
rOutl.SetUpdateMode(sal_False);
@@ -1375,7 +1313,7 @@ SdrOutliner& SdrTextObj::ImpGetDrawOutliner() const
{
SdrOutliner& rOutl=pModel->GetDrawOutliner(this);
- // #101029#: Code extracted to ImpInitDrawOutliner()
+ // Code extracted to ImpInitDrawOutliner()
ImpInitDrawOutliner( rOutl );
return rOutl;
@@ -1388,7 +1326,7 @@ boost::shared_ptr< SdrOutliner > SdrTextObj::CreateDrawOutliner()
return xDrawOutliner;
}
-// #101029#: Extracted from Paint()
+// Extracted from Paint()
void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame,
SdrOutliner& rOutliner,
Rectangle& rTextRect,
@@ -1582,7 +1520,7 @@ void SdrTextObj::NbcReformatText()
}
SetTextSizeDirty();
ActionChanged();
- // FME, AW: i22396
+ // i22396
// Necessary here since we have no compare operator at the outliner
// para object which may detect changes regarding the combination
// of outliner para data and configuration (e.g., change of
@@ -1599,7 +1537,6 @@ void SdrTextObj::ReformatText()
if (pUserCall!=NULL)
aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
NbcReformatText();
SetChanged();
BroadcastObjectChange();
@@ -1654,7 +1591,6 @@ void SdrTextObj::ForceOutlinerParaObject()
sal_Bool SdrTextObj::IsVerticalWriting() const
{
- // #89459#
if(pEdtOutl)
{
return pEdtOutl->IsVertical();
@@ -1687,7 +1623,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical)
sal_Bool bAutoGrowWidth = ((SdrTextAutoGrowWidthItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue();
sal_Bool bAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue();
- // #103516# Also exchange hor/ver adjust items
+ // Also exchange hor/ver adjust items
SdrTextHorzAdjust eHorz = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
SdrTextVertAdjust eVert = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
@@ -1697,7 +1633,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical)
// prepare ItemSet to set exchanged width and height items
SfxItemSet aNewSet(*rSet.GetPool(),
SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
- // #103516# Expanded item ranges to also support hor and ver adjust.
+ // Expanded item ranges to also support hor and ver adjust.
SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST,
SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST,
0, 0);
@@ -1706,7 +1642,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical)
aNewSet.Put(SdrTextAutoGrowWidthItem(bAutoGrowHeight));
aNewSet.Put(SdrTextAutoGrowHeightItem(bAutoGrowWidth));
- // #103516# Exchange horz and vert adjusts
+ // Exchange horz and vert adjusts
switch(eVert)
{
case SDRTEXTVERTADJUST_TOP: aNewSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); break;
@@ -1980,7 +1916,6 @@ SdrTextAniDirection SdrTextObj::GetTextAniDirection() const
return ((SdrTextAniDirectionItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_ANIDIRECTION))).GetValue();
}
-// #111096#
// Access to thext hidden flag
sal_Bool SdrTextObj::GetTextHidden() const
{
@@ -1995,7 +1930,6 @@ void SdrTextObj::NbcSetTextHidden(sal_Bool bNew)
}
}
-// #111096#
// Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a
// painting rectangle. Rotation is excluded from the returned values.
GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
@@ -2051,7 +1985,6 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
return pRetval;
}
-// #111096#
// Access to TextAnimationAllowed flag
bool SdrTextObj::IsTextAnimationAllowed() const
{
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 621e259..bf0b03a 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -91,7 +91,7 @@ namespace
// the visible area for contour text decomposition
basegfx::B2DVector maScale;
- // #SJ# ClipRange for BlockText decomposition; only text portions completely
+ // ClipRange for BlockText decomposition; only text portions completely
// inside are to be accepted, so this is different from geometric clipping
// (which would allow e.g. upper parts of portions to remain). Only used for
// BlockText (see there)
@@ -576,7 +576,7 @@ namespace
{
if(pInfo)
{
- // #SJ# Is clipping wanted? This is text clipping; only accept a portion
+ // Is clipping wanted? This is text clipping; only accept a portion
// if it's completely in the range
if(!maClipRange.isEmpty())
{
@@ -1055,7 +1055,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
bMirrorX ? -1.0 : 1.0, bMirrorY ? -1.0 : 1.0,
fShearX, fRotate, aTranslate.getX(), aTranslate.getY()));
- // #SJ# create ClipRange (if needed)
+ // create ClipRange (if needed)
basegfx::B2DRange aClipRange;
if(rSdrBlockTextPrimitive.getClipOnBounds())
@@ -1391,7 +1391,5 @@ void SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL
}
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 4698277..3b1a479 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -821,7 +821,5 @@ void SdrTextObj::impDecomposePathTextPrimitive(
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(rTarget, aRetvalB);
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index d4b5945..d91c41b 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -62,19 +62,6 @@
#include <editeng/editeng.hxx>
#include <editeng/postitem.hxx>
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@
-//
-// Attribute, StyleSheets und AutoGrow
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bWdt) const
{
@@ -121,7 +108,6 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
if (aSiz.Width()<2) aSiz.Width()=2; // Mindestgroesse 2
if (aSiz.Height()<2) aSiz.Height()=2; // Mindestgroesse 2
- // #101684#
sal_Bool bInEditMode = IsInEditMode();
if(!bInEditMode)
@@ -231,7 +217,6 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt);
if (bRet) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- // #110094#-14 SendRepaintBroadcast();
aRect=aNeuRect;
SetRectsDirty();
if (HAS_BASE(SdrRectObj,this)) { // mal wieder 'nen Hack
@@ -397,9 +382,9 @@ void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction&
}
}
-/** #103836# iterates over the paragraphs of a given SdrObject and removes all
- hard set character attributes with the which ids contained in the
- given vector
+/** iterates over the paragraphs of a given SdrObject and removes all
+ hard set character attributes with the which ids contained in the
+ given vector
*/
void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds )
{
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 05e2bdb..a1776ce 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -42,19 +42,6 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@
-//
-// Dragging, Handles, Create
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
sal_uInt32 SdrTextObj::GetHdlCount() const
{
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index b337cb6..0123fc1 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -39,19 +39,6 @@
#include <editeng/eeitem.hxx>
#include <svx/sdtfchim.hxx>
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list