diff options
Diffstat (limited to 'sc/source/ui/unoobj')
46 files changed, 2754 insertions, 2754 deletions
diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx index ac4b8550c292..95976b1054ab 100644 --- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx +++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::Event // SfxViewShell* pSh = pFrame->GetViewShell(); // if (pSh && pSh->ISA(ScTabViewShell)) // { -// ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; +// ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; // } // pFrame = SfxViewFrame::GetNext( *pFrame, m_pDocShell ); // } diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index bd1991203887..7ac66db2d5df 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,29 +77,29 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -// ein AutoFormat hat immer 16 Eintraege +// ein AutoFormat hat immer 16 Eintraege #define SC_AF_FIELD_COUNT 16 //------------------------------------------------------------------------ -// AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs +// AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() { static SfxItemPropertyMapEntry aAutoFormatMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_INCBACK), 0, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_INCBORD), 0, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_INCFONT), 0, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_INCJUST), 0, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_INCNUM), 0, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_INCWIDTH), 0, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCBACK), 0, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCBORD), 0, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCFONT), 0, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCJUST), 0, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCNUM), 0, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCWIDTH), 0, &::getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} }; return aAutoFormatMap_Impl; } -//! Zahlformat (String/Language) ??? (in XNumberFormat nur ReadOnly) +//! Zahlformat (String/Language) ??? (in XNumberFormat nur ReadOnly) //! table::TableBorder ??!? const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() @@ -159,7 +159,7 @@ const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() //------------------------------------------------------------------------ -#define SCAUTOFORMATSOBJ_SERVICE "com.sun.star.sheet.TableAutoFormats" +#define SCAUTOFORMATSOBJ_SERVICE "com.sun.star.sheet.TableAutoFormats" SC_SIMPLE_SERVICE_INFO( ScAutoFormatFieldObj, "ScAutoFormatFieldObj", "com.sun.star.sheet.TableAutoFormatField" ) SC_SIMPLE_SERVICE_INFO( ScAutoFormatObj, "ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat" ) @@ -181,15 +181,15 @@ sal_Bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const String& rN return sal_True; } } - return sal_False; // is nich + return sal_False; // is nich } //------------------------------------------------------------------------ ScAutoFormatsObj::ScAutoFormatsObj() { - //! Dieses Objekt darf es nur einmal geben, und es muss an den Auto-Format-Daten - //! bekannt sein, damit Aenderungen gebroadcasted werden koennen + //! Dieses Objekt darf es nur einmal geben, und es muss an den Auto-Format-Daten + //! bekannt sein, damit Aenderungen gebroadcasted werden koennen } ScAutoFormatsObj::~ScAutoFormatsObj() @@ -198,7 +198,7 @@ ScAutoFormatsObj::~ScAutoFormatsObj() // stuff for exService_... -uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance( +uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { SolarMutexGuard aGuard; @@ -228,7 +228,7 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) if (pFormats && nIndex < pFormats->GetCount()) return new ScAutoFormatObj(nIndex); - return NULL; // falscher Index + return NULL; // falscher Index } ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const rtl::OUString& aName) @@ -252,12 +252,12 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const { SolarMutexGuard aGuard; sal_Bool bDone = sal_False; - // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein... + // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein... uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY); if ( xInterface.is() ) { ScAutoFormatObj* pFormatObj = ScAutoFormatObj::getImplementation( xInterface ); - if ( pFormatObj && !pFormatObj->IsInserted() ) // noch nicht eingefuegt? + if ( pFormatObj && !pFormatObj->IsInserted() ) // noch nicht eingefuegt? { String aNameStr(aName); ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); @@ -270,13 +270,13 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const if (pFormats->Insert( pNew )) { - //! Notify fuer andere Objekte - pFormats->Save(); // sofort speichern + //! Notify fuer andere Objekte + pFormats->Save(); // sofort speichern sal_uInt16 nNewIndex; if (lcl_FindAutoFormatIndex( *pFormats, aNameStr, nNewIndex )) { - pFormatObj->InitFormat( nNewIndex ); // kann jetzt benutzt werden + pFormatObj->InitFormat( nNewIndex ); // kann jetzt benutzt werden bDone = sal_True; } } @@ -296,7 +296,7 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const if (!bDone) { - // other errors are handled above + // other errors are handled above throw lang::IllegalArgumentException(); } } @@ -306,7 +306,7 @@ void SAL_CALL ScAutoFormatsObj::replaceByName( const rtl::OUString& aName, const lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; - //! zusammenfassen? + //! zusammenfassen? removeByName( aName ); insertByName( aName, aElement ); } @@ -324,8 +324,8 @@ void SAL_CALL ScAutoFormatsObj::removeByName( const rtl::OUString& aName ) { pFormats->AtFree( nIndex ); - //! Notify fuer andere Objekte - pFormats->Save(); // sofort speichern + //! Notify fuer andere Objekte + pFormats->Save(); // sofort speichern } else { @@ -368,7 +368,7 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAutoFormatsObj::getElementType() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< container::XNamed >*)0); // muss zu getByIndex passen + return ::getCppuType((const uno::Reference< container::XNamed >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException) @@ -431,13 +431,13 @@ ScAutoFormatObj::ScAutoFormatObj(sal_uInt16 nIndex) : aPropSet( lcl_GetAutoFormatMap() ), nFormatIndex( nIndex ) { - //! Listening !!! + //! Listening !!! } ScAutoFormatObj::~ScAutoFormatObj() { - // Wenn ein AutoFormat-Objekt losgelassen wird, werden eventuelle Aenderungen - // gespeichert, damit sie z.B. im Writer sichtbar sind + // Wenn ein AutoFormat-Objekt losgelassen wird, werden eventuelle Aenderungen + // gespeichert, damit sie z.B. im Writer sichtbar sind if (IsInserted()) { @@ -453,7 +453,7 @@ void ScAutoFormatObj::InitFormat( sal_uInt16 nNewIndex ) { DBG_ASSERT( nFormatIndex == SC_AFMTOBJ_INVALID, "ScAutoFormatObj::InitFormat mehrfach" ); nFormatIndex = nNewIndex; - //! Listening !!! + //! Listening !!! } // XUnoTunnel @@ -500,7 +500,7 @@ ScAutoFormatObj* ScAutoFormatObj::getImplementation( void ScAutoFormatObj::Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ ) { - // spaeter... + // spaeter... } // XTableAutoFormat @@ -528,7 +528,7 @@ sal_Int32 SAL_CALL ScAutoFormatObj::getCount() throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (IsInserted()) - return SC_AF_FIELD_COUNT; // immer 16 Elemente + return SC_AF_FIELD_COUNT; // immer 16 Elemente else return 0; } @@ -550,7 +550,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAutoFormatObj::getElementType() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); // muss zu getByIndex passen + return ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException) @@ -594,21 +594,21 @@ void SAL_CALL ScAutoFormatObj::setName( const rtl::OUString& aNewName ) pFormats->AtFree( nFormatIndex ); if (pFormats->Insert( pNew )) { - nFormatIndex = pFormats->IndexOf( pNew ); // ist evtl. anders einsortiert... + nFormatIndex = pFormats->IndexOf( pNew ); // ist evtl. anders einsortiert... - //! Notify fuer andere Objekte + //! Notify fuer andere Objekte pFormats->SetSaveLater(sal_True); } else { delete pNew; DBG_ERROR("AutoFormat konnte nicht eingefuegt werden"); - nFormatIndex = 0; //! alter Index ist ungueltig + nFormatIndex = 0; //! alter Index ist ungueltig } } else { - // not inserted or name exists + // not inserted or name exists throw uno::RuntimeException(); } } @@ -653,7 +653,7 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue( // else Fehler - //! Notify fuer andere Objekte + //! Notify fuer andere Objekte pFormats->SetSaveLater(sal_True); } } @@ -688,7 +688,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const rtl::OUString& aPrope else if (aPropString.EqualsAscii( SC_UNONAME_INCWIDTH )) bValue = pData->GetIncludeWidthHeight(); else - bError = sal_True; // unbekannte Property + bError = sal_True; // unbekannte Property if (!bError) aAny <<= bValue; @@ -706,7 +706,7 @@ ScAutoFormatFieldObj::ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField nFormatIndex( nFormat ), nFieldIndex( nField ) { - //! Listening !!! + //! Listening !!! } ScAutoFormatFieldObj::~ScAutoFormatFieldObj() @@ -715,7 +715,7 @@ ScAutoFormatFieldObj::~ScAutoFormatFieldObj() void ScAutoFormatFieldObj::Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ ) { - // spaeter... + // spaeter... } // beans::XPropertySet @@ -801,14 +801,14 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( case SC_WID_UNO_TBLBORD: { table::TableBorder aBorder; - if ( aValue >>= aBorder ) // empty = nothing to do + if ( aValue >>= aBorder ) // empty = nothing to do { SvxBoxItem aOuter(ATTR_BORDER); SvxBoxInfoItem aInner(ATTR_BORDER_INNER); ScHelperFunctions::FillBoxItems( aOuter, aInner, aBorder ); pData->PutItem( nFieldIndex, aOuter ); - //! Notify fuer andere Objekte? + //! Notify fuer andere Objekte? pFormats->SetSaveLater(sal_True); } } diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 6db804e0bb9f..21e0ac0790fc 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include "inputopt.hxx" #include "printopt.hxx" #include "userlist.hxx" -#include "sc.hrc" // VAR_ARGS +#include "sc.hrc" // VAR_ARGS #include "unonames.hxx" #include "funcdesc.hxx" #include <com/sun/star/sheet/FunctionArgument.hpp> @@ -128,22 +128,22 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_crea //------------------------------------------------------------------------ -// Anzahl der Funktionen, die als zuletzt benutzt gespeichert werden -//! Define mit funcpage.hxx und dwfunctr.hxx zusammenfassen !!! +// Anzahl der Funktionen, die als zuletzt benutzt gespeichert werden +//! Define mit funcpage.hxx und dwfunctr.hxx zusammenfassen !!! #define LRU_MAX 10 -// Spezial-Werte fuer Zoom -//! irgendwo zentral -#define SC_ZOOMVAL_OPTIMAL (-1) -#define SC_ZOOMVAL_WHOLEPAGE (-2) -#define SC_ZOOMVAL_PAGEWIDTH (-3) +// Spezial-Werte fuer Zoom +//! irgendwo zentral +#define SC_ZOOMVAL_OPTIMAL (-1) +#define SC_ZOOMVAL_WHOLEPAGE (-2) +#define SC_ZOOMVAL_PAGEWIDTH (-3) -// Anzahl der PropertyValues in einer Function-Description -#define SC_FUNCDESC_PROPCOUNT 5 +// Anzahl der PropertyValues in einer Function-Description +#define SC_FUNCDESC_PROPCOUNT 5 //------------------------------------------------------------------------ -// alles ohne Which-ID, Map nur fuer PropertySetInfo +// alles ohne Which-ID, Map nur fuer PropertySetInfo static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() { @@ -174,9 +174,9 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() //------------------------------------------------------------------------ -#define SCFUNCTIONLISTOBJ_SERVICE "com.sun.star.sheet.FunctionDescriptions" -#define SCRECENTFUNCTIONSOBJ_SERVICE "com.sun.star.sheet.RecentFunctions" -#define SCSPREADSHEETSETTINGS_SERVICE "com.sun.star.sheet.GlobalSheetSettings" +#define SCFUNCTIONLISTOBJ_SERVICE "com.sun.star.sheet.FunctionDescriptions" +#define SCRECENTFUNCTIONSOBJ_SERVICE "com.sun.star.sheet.RecentFunctions" +#define SCSPREADSHEETSETTINGS_SERVICE "com.sun.star.sheet.GlobalSheetSettings" SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "ScFunctionListObj", SCFUNCTIONLISTOBJ_SERVICE ) SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE ) @@ -480,7 +480,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( return pRet; } -} // extern C +} // extern C //------------------------------------------------------------------------ @@ -493,7 +493,7 @@ ScSpreadsheetSettings::~ScSpreadsheetSettings() { } -uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( +uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ ) { SolarMutexGuard aGuard; @@ -615,9 +615,9 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( SvxZoomType eType = SVX_ZOOM_PERCENT; switch (nVal) { - case SC_ZOOMVAL_OPTIMAL: eType = SVX_ZOOM_OPTIMAL; break; - case SC_ZOOMVAL_WHOLEPAGE: eType = SVX_ZOOM_WHOLEPAGE; break; - case SC_ZOOMVAL_PAGEWIDTH: eType = SVX_ZOOM_PAGEWIDTH; break; + case SC_ZOOMVAL_OPTIMAL: eType = SVX_ZOOM_OPTIMAL; break; + case SC_ZOOMVAL_WHOLEPAGE: eType = SVX_ZOOM_WHOLEPAGE; break; + case SC_ZOOMVAL_PAGEWIDTH: eType = SVX_ZOOM_PAGEWIDTH; break; } aAppOpt.SetZoomType( eType ); } @@ -639,20 +639,20 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( uno::Sequence<rtl::OUString> aSeq; if ( pUserList && ( aValue >>= aSeq ) ) { - // es wird direkt die "lebende" Liste veraendert, - // mehr tut ScGlobal::SetUserList auch nicht + // es wird direkt die "lebende" Liste veraendert, + // mehr tut ScGlobal::SetUserList auch nicht - pUserList->FreeAll(); // alle Eintraege raus + pUserList->FreeAll(); // alle Eintraege raus USHORT nCount = (USHORT)aSeq.getLength(); const rtl::OUString* pAry = aSeq.getConstArray(); for (USHORT i=0; i<nCount; i++) { String aEntry = pAry[i]; ScUserListData* pData = new ScUserListData(aEntry); - if (!pUserList->Insert(pData)) // hinten anhaengen - delete pData; // sollte nicht vorkommen + if (!pUserList->Insert(pData)) // hinten anhaengen + delete pData; // sollte nicht vorkommen } - bSaveApp = TRUE; // Liste wird mit den App-Optionen gespeichert + bSaveApp = TRUE; // Liste wird mit den App-Optionen gespeichert } } else if (aString.EqualsAscii( SC_UNONAME_PRALLSH )) @@ -664,9 +664,9 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( else if (aString.EqualsAscii( SC_UNONAME_PREMPTY )) { ScPrintOptions aPrintOpt(pScMod->GetPrintOptions()); - aPrintOpt.SetSkipEmpty( !ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); // reversed + aPrintOpt.SetSkipEmpty( !ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); // reversed pScMod->SetPrintOptions( aPrintOpt ); - SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) ); // update previews + SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) ); // update previews } if ( bSaveApp ) @@ -688,27 +688,27 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& ScInputOptions aInpOpt = pScMod->GetInputOptions(); // print options aren't loaded until needed - if (aString.EqualsAscii( SC_UNONAME_DOAUTOCP )) ScUnoHelpFunctions::SetBoolInAny( aRet, aAppOpt.GetAutoComplete() ); - else if (aString.EqualsAscii( SC_UNONAME_ENTERED )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetEnterEdit() ); - else if (aString.EqualsAscii( SC_UNONAME_EXPREF )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExpandRefs() ); - else if (aString.EqualsAscii( SC_UNONAME_EXTFMT )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExtendFormat() ); - else if (aString.EqualsAscii( SC_UNONAME_LINKUPD )) aRet <<= (sal_Int16) aAppOpt.GetLinkMode(); - else if (aString.EqualsAscii( SC_UNONAME_MARKHDR )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMarkHeader() ); - else if (aString.EqualsAscii( SC_UNONAME_MOVESEL )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMoveSelection() ); + if (aString.EqualsAscii( SC_UNONAME_DOAUTOCP )) ScUnoHelpFunctions::SetBoolInAny( aRet, aAppOpt.GetAutoComplete() ); + else if (aString.EqualsAscii( SC_UNONAME_ENTERED )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetEnterEdit() ); + else if (aString.EqualsAscii( SC_UNONAME_EXPREF )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExpandRefs() ); + else if (aString.EqualsAscii( SC_UNONAME_EXTFMT )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExtendFormat() ); + else if (aString.EqualsAscii( SC_UNONAME_LINKUPD )) aRet <<= (sal_Int16) aAppOpt.GetLinkMode(); + else if (aString.EqualsAscii( SC_UNONAME_MARKHDR )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMarkHeader() ); + else if (aString.EqualsAscii( SC_UNONAME_MOVESEL )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMoveSelection() ); else if (aString.EqualsAscii( SC_UNONAME_RANGEFIN )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetRangeFinder() ); else if (aString.EqualsAscii( SC_UNONAME_USETABCOL )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetUseTabCol() ); else if (aString.EqualsAscii( SC_UNONAME_PRMETRICS )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetTextWysiwyg() ); else if (aString.EqualsAscii( SC_UNONAME_REPLWARN )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetReplaceCellsWarn() ); - else if (aString.EqualsAscii( SC_UNONAME_METRIC )) aRet <<= (sal_Int16) aAppOpt.GetAppMetric(); - else if (aString.EqualsAscii( SC_UNONAME_MOVEDIR )) aRet <<= (sal_Int16) aInpOpt.GetMoveDir(); - else if (aString.EqualsAscii( SC_UNONAME_STBFUNC )) aRet <<= (sal_Int16) aAppOpt.GetStatusFunc(); + else if (aString.EqualsAscii( SC_UNONAME_METRIC )) aRet <<= (sal_Int16) aAppOpt.GetAppMetric(); + else if (aString.EqualsAscii( SC_UNONAME_MOVEDIR )) aRet <<= (sal_Int16) aInpOpt.GetMoveDir(); + else if (aString.EqualsAscii( SC_UNONAME_STBFUNC )) aRet <<= (sal_Int16) aAppOpt.GetStatusFunc(); else if (aString.EqualsAscii( SC_UNONAME_SCALE )) { INT16 nZoomVal = 0; switch ( aAppOpt.GetZoomType() ) { - case SVX_ZOOM_PERCENT: nZoomVal = aAppOpt.GetZoom(); break; - case SVX_ZOOM_OPTIMAL: nZoomVal = SC_ZOOMVAL_OPTIMAL; break; + case SVX_ZOOM_PERCENT: nZoomVal = aAppOpt.GetZoom(); break; + case SVX_ZOOM_OPTIMAL: nZoomVal = SC_ZOOMVAL_OPTIMAL; break; case SVX_ZOOM_WHOLEPAGE: nZoomVal = SC_ZOOMVAL_WHOLEPAGE; break; case SVX_ZOOM_PAGEWIDTH: nZoomVal = SC_ZOOMVAL_PAGEWIDTH; break; default: @@ -737,7 +737,7 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& else if (aString.EqualsAscii( SC_UNONAME_PRALLSH )) ScUnoHelpFunctions::SetBoolInAny( aRet, pScMod->GetPrintOptions().GetAllSheets() ); else if (aString.EqualsAscii( SC_UNONAME_PREMPTY )) - ScUnoHelpFunctions::SetBoolInAny( aRet, !pScMod->GetPrintOptions().GetSkipEmpty() ); // reversed + ScUnoHelpFunctions::SetBoolInAny( aRet, !pScMod->GetPrintOptions().GetSkipEmpty() ); // reversed return aRet; } @@ -756,7 +756,7 @@ ScRecentFunctionsObj::~ScRecentFunctionsObj() // stuff for exService_... -uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance( +uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ ) { SolarMutexGuard aGuard; @@ -808,14 +808,14 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( USHORT* pFuncs = nCount ? new USHORT[nCount] : NULL; for (USHORT i=0; i<nCount; i++) - pFuncs[i] = (USHORT)pAry[i]; //! auf gueltige Werte testen? + pFuncs[i] = (USHORT)pAry[i]; //! auf gueltige Werte testen? ScModule* pScMod = SC_MOD(); ScAppOptions aNewOpts(pScMod->GetAppOptions()); aNewOpts.SetLRUFuncList(pFuncs, nCount); pScMod->SetAppOptions(aNewOpts); - pScMod->RecentFunctionsChanged(); // update function list child window + pScMod->RecentFunctionsChanged(); // update function list child window delete[] pFuncs; } @@ -837,7 +837,7 @@ ScFunctionListObj::~ScFunctionListObj() // stuff for exService_... -uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance( +uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ ) { SolarMutexGuard aGuard; @@ -905,7 +905,7 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co String aArgDesc; if (rDesc.ppDefArgDescs[i]) aArgDesc = *rDesc.ppDefArgDescs[i]; sheet::FunctionArgument aArgument; - aArgument.Name = aArgName; + aArgument.Name = aArgName; aArgument.Description = aArgDesc; aArgument.IsOptional = rDesc.pDefArgFlags[i].bOptional; pArgAry[j++] = aArgument; @@ -937,10 +937,10 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int } } - throw lang::IllegalArgumentException(); // not found + throw lang::IllegalArgumentException(); // not found } else - throw uno::RuntimeException(); // should not happen + throw uno::RuntimeException(); // should not happen // return uno::Sequence<beans::PropertyValue>(0); } @@ -960,7 +960,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName ) for (USHORT nIndex=0; nIndex<nCount; nIndex++) { const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex); - //! Case-insensitiv ??? + //! Case-insensitiv ??? if ( pDesc && pDesc->pFuncName && aNameStr == *pDesc->pFuncName ) { uno::Sequence<beans::PropertyValue> aSeq( SC_FUNCDESC_PROPCOUNT ); @@ -969,10 +969,10 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName ) } } - throw container::NoSuchElementException(); // not found + throw container::NoSuchElementException(); // not found } else - throw uno::RuntimeException(); // should not happen + throw uno::RuntimeException(); // should not happen // return uno::Any(); } @@ -1008,10 +1008,10 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) } } - throw lang::IndexOutOfBoundsException(); // illegal index + throw lang::IndexOutOfBoundsException(); // illegal index } else - throw uno::RuntimeException(); // should not happen + throw uno::RuntimeException(); // should not happen // return uno::Any(); } @@ -1071,7 +1071,7 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const rtl::OUString& aName ) for (USHORT nIndex=0; nIndex<nCount; nIndex++) { const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex); - //! Case-insensitiv ??? + //! Case-insensitiv ??? if ( pDesc && pDesc->pFuncName && aNameStr == *pDesc->pFuncName ) return TRUE; } diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index c10fadccea7c..2c1346a32023 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -190,7 +190,7 @@ namespace calc { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellListSource" ) ); } - + //-------------------------------------------------------------------- sal_Bool SAL_CALL OCellListSource::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) { @@ -203,7 +203,7 @@ namespace calc return sal_False; } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) { @@ -250,7 +250,7 @@ namespace calc CellRangeAddress aAddress( getRangeAddress( ) ); return aAddress.EndRow - aAddress.StartRow + 1; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -264,7 +264,7 @@ namespace calc return getCellTextContent_noCheck( 0, _nPosition ); } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException) { @@ -282,7 +282,7 @@ namespace calc return aAllEntries; } - + //-------------------------------------------------------------------- void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException) { @@ -296,7 +296,7 @@ namespace calc m_aListEntryListeners.addInterface( _rxListener ); } - + //-------------------------------------------------------------------- void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException) { diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index e13ab33488ab..0b8807f61f20 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 8514810406df..eadb12a8f50b 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <rtl/uuid.h> -#include <float.h> // DBL_MIN +#include <float.h> // DBL_MIN #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/util/CellProtection.hpp> @@ -78,7 +78,7 @@ #include "editsrc.hxx" #include "notesuno.hxx" #include "fielduno.hxx" -#include "docuno.hxx" // ScTableColumnsObj etc +#include "docuno.hxx" // ScTableColumnsObj etc #include "datauno.hxx" #include "dapiuno.hxx" #include "chartuno.hxx" @@ -100,7 +100,7 @@ #include "cell.hxx" #include "undocell.hxx" #include "undotab.hxx" -#include "undoblk.hxx" // fuer lcl_ApplyBorder - nach docfunc verschieben! +#include "undoblk.hxx" // fuer lcl_ApplyBorder - nach docfunc verschieben! #include "stlsheet.hxx" #include "dbcolect.hxx" #include "attrib.hxx" @@ -136,435 +136,435 @@ using namespace com::sun::star; class ScNamedEntry { - String aName; - ScRange aRange; + String aName; + ScRange aRange; public: ScNamedEntry(const String& rN, const ScRange& rR) : aName(rN), aRange(rR) {} - const String& GetName() const { return aName; } - const ScRange& GetRange() const { return aRange; } + const String& GetName() const { return aName; } + const ScRange& GetRange() const { return aRange; } }; //------------------------------------------------------------------------ -// Die Namen in den Maps muessen (nach strcmp) sortiert sein! -//! statt Which-ID 0 special IDs verwenden, und nicht ueber Namen vergleichen !!!!!!!!! +// Die Namen in den Maps muessen (nach strcmp) sortiert sein! +//! statt Which-ID 0 special IDs verwenden, und nicht ueber Namen vergleichen !!!!!!!!! -// Left/Right/Top/BottomBorder are mapped directly to the core items, -// not collected/applied to the borders of a range -> ATTR_BORDER can be used directly +// Left/Right/Top/BottomBorder are mapped directly to the core items, +// not collected/applied to the borders of a range -> ATTR_BORDER can be used directly const SfxItemPropertySet* lcl_GetCellsPropertySet() { static SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, - {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, - {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, + {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, + {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, + {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS - {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS + {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellsPropertySet( aCellsPropertyMap_Impl ); return &aCellsPropertySet; } -// CellRange enthaelt alle Eintraege von Cells, zusaetzlich eigene Eintraege -// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt). +// CellRange enthaelt alle Eintraege von Cells, zusaetzlich eigene Eintraege +// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt). const SfxItemPropertySet* lcl_GetRangePropertySet() { static SfxItemPropertyMapEntry aRangePropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, - {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, - {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, + {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, + {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, + {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS - {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS + {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aRangePropertySet( aRangePropertyMap_Impl ); return &aRangePropertySet; } -// Cell enthaelt alle Eintraege von CellRange, zusaetzlich eigene Eintraege -// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt). +// Cell enthaelt alle Eintraege von CellRange, zusaetzlich eigene Eintraege +// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt). const SfxItemPropertySet* lcl_GetCellPropertySet() { static SfxItemPropertyMapEntry aCellPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, - {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, - {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, + {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, + {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_FORMRT), SC_WID_UNO_FORMRT, &getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, + {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FORMRT), SC_WID_UNO_FORMRT, &getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS - {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS + {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellPropertySet( aCellPropertyMap_Impl ); return &aCellPropertySet; } -// Column und Row enthalten alle Eintraege von CellRange, zusaetzlich eigene Eintraege -// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt). +// Column und Row enthalten alle Eintraege von CellRange, zusaetzlich eigene Eintraege +// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt). const SfxItemPropertySet* lcl_GetColumnPropertySet() { static SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, - {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, - {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, + {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, + {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, + {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, -// {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), SC_WID_UNO_MANPAGE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_OWIDTH), SC_WID_UNO_OWIDTH, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, +// {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), SC_WID_UNO_MANPAGE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_OWIDTH), SC_WID_UNO_OWIDTH, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS - {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS + {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLWID), SC_WID_UNO_CELLWID, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLWID), SC_WID_UNO_CELLWID, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aColumnPropertySet( aColumnPropertyMap_Impl ); @@ -575,102 +575,102 @@ const SfxItemPropertySet* lcl_GetRowPropertySet() { static SfxItemPropertyMapEntry aRowPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, - {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, - {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, + {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, + {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLHGT), SC_WID_UNO_CELLHGT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, + {MAP_CHAR_LEN(SC_UNONAME_CELLHGT), SC_WID_UNO_CELLHGT, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), SC_WID_UNO_MANPAGE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT), SC_WID_UNO_OHEIGHT, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), SC_WID_UNO_MANPAGE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT), SC_WID_UNO_OHEIGHT, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS - {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS + {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aRowPropertySet( aRowPropertyMap_Impl ); @@ -681,110 +681,110 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet() { static SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_AUTOPRINT),SC_WID_UNO_AUTOPRINT,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_BORDCOL), SC_WID_UNO_BORDCOL, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, - {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, - {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COPYBACK), SC_WID_UNO_COPYBACK,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COPYFORM), SC_WID_UNO_COPYFORM,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COPYSTYL), SC_WID_UNO_COPYSTYL,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_AUTOPRINT),SC_WID_UNO_AUTOPRINT,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_BORDCOL), SC_WID_UNO_BORDCOL, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, + {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, + {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COPYBACK), SC_WID_UNO_COPYBACK,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COPYFORM), SC_WID_UNO_COPYFORM,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COPYSTYL), SC_WID_UNO_COPYSTYL,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, + {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ISACTIVE), SC_WID_UNO_ISACTIVE,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,&getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ISACTIVE), SC_WID_UNO_ISACTIVE,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,&getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS - {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PRINTBORD),SC_WID_UNO_PRINTBORD,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PROTECT), SC_WID_UNO_PROTECT, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_SHOWBORD), SC_WID_UNO_SHOWBORD,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS + {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PRINTBORD),SC_WID_UNO_PRINTBORD,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PROTECT), SC_WID_UNO_PROTECT, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_SHOWBORD), SC_WID_UNO_SHOWBORD,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_TABLAYOUT),SC_WID_UNO_TABLAYOUT,&getCppuType((sal_Int16*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_TABLAYOUT),SC_WID_UNO_TABLAYOUT,&getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_TABCOLOR), SC_WID_UNO_TABCOLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, {0,0,0,0,0,0} @@ -800,9 +800,9 @@ const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties - {MAP_CHAR_LEN(SC_UNONAME_TEXTUSER), EE_CHAR_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_USERDEF), EE_PARA_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0}, + SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties + {MAP_CHAR_LEN(SC_UNONAME_TEXTUSER), EE_CHAR_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_USERDEF), EE_PARA_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0}, {0,0,0,0,0,0} }; return aEditPropertyMap_Impl; @@ -816,21 +816,21 @@ const SvxItemPropertySet* lcl_GetEditPropertySet() //------------------------------------------------------------------------ -//! diese Funktionen in einen allgemeinen Header verschieben -inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } -inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } +//! diese Funktionen in einen allgemeinen Header verschieben +inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } +inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } //------------------------------------------------------------------------ -#define SCCHARPROPERTIES_SERVICE "com.sun.star.style.CharacterProperties" -#define SCPARAPROPERTIES_SERVICE "com.sun.star.style.ParagraphProperties" -#define SCCELLPROPERTIES_SERVICE "com.sun.star.table.CellProperties" -#define SCCELLRANGE_SERVICE "com.sun.star.table.CellRange" -#define SCCELL_SERVICE "com.sun.star.table.Cell" -#define SCSHEETCELLRANGES_SERVICE "com.sun.star.sheet.SheetCellRanges" -#define SCSHEETCELLRANGE_SERVICE "com.sun.star.sheet.SheetCellRange" -#define SCSPREADSHEET_SERVICE "com.sun.star.sheet.Spreadsheet" -#define SCSHEETCELL_SERVICE "com.sun.star.sheet.SheetCell" +#define SCCHARPROPERTIES_SERVICE "com.sun.star.style.CharacterProperties" +#define SCPARAPROPERTIES_SERVICE "com.sun.star.style.ParagraphProperties" +#define SCCELLPROPERTIES_SERVICE "com.sun.star.table.CellProperties" +#define SCCELLRANGE_SERVICE "com.sun.star.table.CellRange" +#define SCCELL_SERVICE "com.sun.star.table.Cell" +#define SCSHEETCELLRANGES_SERVICE "com.sun.star.sheet.SheetCellRanges" +#define SCSHEETCELLRANGE_SERVICE "com.sun.star.sheet.SheetCellRange" +#define SCSPREADSHEET_SERVICE "com.sun.star.sheet.Spreadsheet" +#define SCSHEETCELL_SERVICE "com.sun.star.sheet.SheetCell" SC_SIMPLE_SERVICE_INFO( ScCellFormatsEnumeration, "ScCellFormatsEnumeration", "com.sun.star.sheet.CellFormatRangesEnumeration" ) SC_SIMPLE_SERVICE_INFO( ScCellFormatsObj, "ScCellFormatsObj", "com.sun.star.sheet.CellFormatRanges" ) @@ -849,7 +849,7 @@ SV_IMPL_PTRARR( ScNamedEntryArr_Impl, ScNamedEntryPtr ); //------------------------------------------------------------------------ -//! ScLinkListener in anderes File verschieben !!! +//! ScLinkListener in anderes File verschieben !!! ScLinkListener::~ScLinkListener() { @@ -885,7 +885,7 @@ SCTAB lcl_FirstTab( const ScRangeList& rRanges ) if (pFirst) return pFirst->aStart.Tab(); - return 0; // soll nicht sein + return 0; // soll nicht sein } BOOL lcl_WholeSheet( const ScRangeList& rRanges ) @@ -954,7 +954,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal( sheet::GeneralFunction eSummary ) const SvxBorderLine* ScHelperFunctions::GetBorderLine( SvxBorderLine& rLine, const table::BorderLine& rStruct ) { - // Calc braucht Twips, im Uno-Struct sind 1/100mm + // Calc braucht Twips, im Uno-Struct sind 1/100mm rLine.SetOutWidth( (USHORT)HMMToTwips( rStruct.OuterLineWidth ) ); rLine.SetInWidth( (USHORT)HMMToTwips( rStruct.InnerLineWidth ) ); @@ -971,18 +971,18 @@ void ScHelperFunctions::FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner { SvxBorderLine aLine; rOuter.SetDistance( (USHORT)HMMToTwips( rBorder.Distance ) ); - rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.TopLine ), BOX_LINE_TOP ); - rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.BottomLine ), BOX_LINE_BOTTOM ); - rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.LeftLine ), BOX_LINE_LEFT ); - rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.RightLine ), BOX_LINE_RIGHT ); - rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.HorizontalLine ), BOXINFO_LINE_HORI ); - rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.VerticalLine ), BOXINFO_LINE_VERT ); - rInner.SetValid( VALID_TOP, rBorder.IsTopLineValid ); - rInner.SetValid( VALID_BOTTOM, rBorder.IsBottomLineValid ); - rInner.SetValid( VALID_LEFT, rBorder.IsLeftLineValid ); - rInner.SetValid( VALID_RIGHT, rBorder.IsRightLineValid ); - rInner.SetValid( VALID_HORI, rBorder.IsHorizontalLineValid ); - rInner.SetValid( VALID_VERT, rBorder.IsVerticalLineValid ); + rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.TopLine ), BOX_LINE_TOP ); + rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.BottomLine ), BOX_LINE_BOTTOM ); + rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.LeftLine ), BOX_LINE_LEFT ); + rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.RightLine ), BOX_LINE_RIGHT ); + rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.HorizontalLine ), BOXINFO_LINE_HORI ); + rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.VerticalLine ), BOXINFO_LINE_VERT ); + rInner.SetValid( VALID_TOP, rBorder.IsTopLineValid ); + rInner.SetValid( VALID_BOTTOM, rBorder.IsBottomLineValid ); + rInner.SetValid( VALID_LEFT, rBorder.IsLeftLineValid ); + rInner.SetValid( VALID_RIGHT, rBorder.IsRightLineValid ); + rInner.SetValid( VALID_HORI, rBorder.IsHorizontalLineValid ); + rInner.SetValid( VALID_VERT, rBorder.IsVerticalLineValid ); rInner.SetValid( VALID_DISTANCE, rBorder.IsDistanceValid ); rInner.SetTable( TRUE ); } @@ -991,7 +991,7 @@ void ScHelperFunctions::FillBorderLine( table::BorderLine& rStruct, const SvxBor { if (pLine) { - rStruct.Color = pLine->GetColor().GetColor(); + rStruct.Color = pLine->GetColor().GetColor(); rStruct.InnerLineWidth = (sal_Int16)TwipsToHMM( pLine->GetInWidth() ); rStruct.OuterLineWidth = (sal_Int16)TwipsToHMM( pLine->GetOutWidth() ); rStruct.LineDistance = (sal_Int16)TwipsToHMM( pLine->GetDistance() ); @@ -1004,26 +1004,26 @@ void ScHelperFunctions::FillBorderLine( table::BorderLine& rStruct, const SvxBor void ScHelperFunctions::FillTableBorder( table::TableBorder& rBorder, const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner ) { - ScHelperFunctions::FillBorderLine( rBorder.TopLine, rOuter.GetTop() ); - ScHelperFunctions::FillBorderLine( rBorder.BottomLine, rOuter.GetBottom() ); - ScHelperFunctions::FillBorderLine( rBorder.LeftLine, rOuter.GetLeft() ); - ScHelperFunctions::FillBorderLine( rBorder.RightLine, rOuter.GetRight() ); - ScHelperFunctions::FillBorderLine( rBorder.HorizontalLine, rInner.GetHori() ); - ScHelperFunctions::FillBorderLine( rBorder.VerticalLine, rInner.GetVert() ); + ScHelperFunctions::FillBorderLine( rBorder.TopLine, rOuter.GetTop() ); + ScHelperFunctions::FillBorderLine( rBorder.BottomLine, rOuter.GetBottom() ); + ScHelperFunctions::FillBorderLine( rBorder.LeftLine, rOuter.GetLeft() ); + ScHelperFunctions::FillBorderLine( rBorder.RightLine, rOuter.GetRight() ); + ScHelperFunctions::FillBorderLine( rBorder.HorizontalLine, rInner.GetHori() ); + ScHelperFunctions::FillBorderLine( rBorder.VerticalLine, rInner.GetVert() ); - rBorder.Distance = rOuter.GetDistance(); - rBorder.IsTopLineValid = rInner.IsValid(VALID_TOP); - rBorder.IsBottomLineValid = rInner.IsValid(VALID_BOTTOM); - rBorder.IsLeftLineValid = rInner.IsValid(VALID_LEFT); - rBorder.IsRightLineValid = rInner.IsValid(VALID_RIGHT); - rBorder.IsHorizontalLineValid = rInner.IsValid(VALID_HORI); - rBorder.IsVerticalLineValid = rInner.IsValid(VALID_VERT); - rBorder.IsDistanceValid = rInner.IsValid(VALID_DISTANCE); + rBorder.Distance = rOuter.GetDistance(); + rBorder.IsTopLineValid = rInner.IsValid(VALID_TOP); + rBorder.IsBottomLineValid = rInner.IsValid(VALID_BOTTOM); + rBorder.IsLeftLineValid = rInner.IsValid(VALID_LEFT); + rBorder.IsRightLineValid = rInner.IsValid(VALID_RIGHT); + rBorder.IsHorizontalLineValid = rInner.IsValid(VALID_HORI); + rBorder.IsVerticalLineValid = rInner.IsValid(VALID_VERT); + rBorder.IsDistanceValid = rInner.IsValid(VALID_DISTANCE); } //------------------------------------------------------------------------ -//! lcl_ApplyBorder nach docfunc verschieben! +//! lcl_ApplyBorder nach docfunc verschieben! void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& rRanges, const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner ) @@ -1070,12 +1070,12 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r } //! move lcl_PutDataArray to docfunc? -//! merge loop with ScFunctionAccess::callFunction +//! merge loop with ScFunctionAccess::callFunction BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, const uno::Sequence< uno::Sequence<uno::Any> >& aData ) { -// BOOL bApi = TRUE; +// BOOL bApi = TRUE; ScDocument* pDoc = rDocShell.GetDocument(); SCTAB nTab = rRange.aStart.Tab(); @@ -1087,7 +1087,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, if ( !pDoc->IsBlockEditable( nTab, nStartCol,nStartRow, nEndCol,nEndRow ) ) { - //! error message + //! error message return FALSE; } @@ -1099,7 +1099,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, if ( nCols != nEndCol-nStartCol+1 || nRows != nEndRow-nStartRow+1 ) { - //! error message? + //! error message? return FALSE; } @@ -1139,8 +1139,8 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, eElemClass == uno::TypeClass_FLOAT || eElemClass == uno::TypeClass_DOUBLE ) { - // #87871# accept integer types because Basic passes a floating point - // variable as byte, short or long if it's an integer number. + // #87871# accept integer types because Basic passes a floating point + // variable as byte, short or long if it's an integer number. double fVal(0.0); rElement >>= fVal; pDoc->SetValue( nDocCol, nDocRow, nTab, fVal ); @@ -1153,13 +1153,13 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, pDoc->PutCell( nDocCol, nDocRow, nTab, new ScStringCell( aUStr ) ); } else - bError = TRUE; // invalid type + bError = TRUE; // invalid type ++nDocCol; } } else - bError = TRUE; // wrong size + bError = TRUE; // wrong size ++nDocRow; } @@ -1177,7 +1177,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, } if (!bHeight) - rDocShell.PostPaint( rRange, PAINT_GRID ); // AdjustRowHeight may have painted already + rDocShell.PostPaint( rRange, PAINT_GRID ); // AdjustRowHeight may have painted already rDocShell.SetDocumentModified(); @@ -1188,7 +1188,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, const uno::Sequence< uno::Sequence<rtl::OUString> >& aData, const ::rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) { -// BOOL bApi = TRUE; +// BOOL bApi = TRUE; ScDocument* pDoc = rDocShell.GetDocument(); SCTAB nTab = rRange.aStart.Tab(); @@ -1200,7 +1200,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, if ( !pDoc->IsBlockEditable( nTab, nStartCol,nStartRow, nEndCol,nEndRow ) ) { - //! error message + //! error message return FALSE; } @@ -1212,7 +1212,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, if ( nCols != nEndCol-nStartCol+1 || nRows != nEndRow-nStartRow+1 ) { - //! error message? + //! error message? return FALSE; } @@ -1226,7 +1226,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, pDoc->DeleteAreaTab( nStartCol, nStartRow, nEndCol, nEndRow, nTab, IDF_CONTENTS ); - ScDocFunc aFunc( rDocShell ); // for InterpretEnglishString + ScDocFunc aFunc( rDocShell ); // for InterpretEnglishString BOOL bError = FALSE; SCROW nDocRow = nStartRow; @@ -1248,7 +1248,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, } } else - bError = TRUE; // wrong size + bError = TRUE; // wrong size ++nDocRow; } @@ -1266,14 +1266,14 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, } if (!bHeight) - rDocShell.PostPaint( rRange, PAINT_GRID ); // AdjustRowHeight may have painted already + rDocShell.PostPaint( rRange, PAINT_GRID ); // AdjustRowHeight may have painted already rDocShell.SetDocumentModified(); return !bError; } -// used in ScCellRangeObj::getFormulaArray and ScCellObj::GetInputString_Impl +// used in ScCellRangeObj::getFormulaArray and ScCellObj::GetInputString_Impl String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bEnglish ) { String aVal; @@ -1296,14 +1296,14 @@ String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bE // LANGUAGE_ENGLISH_US the "General" format has index key 0, // we don't have to query. sal_uInt32 nNumFmt = bEnglish ? -// pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US) : +// pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US) : 0 : pDoc->GetNumberFormat( rPosition ); if ( eType == CELLTYPE_EDIT ) { - // GetString an der EditCell macht Leerzeichen aus Umbruechen, - // hier werden die Umbrueche aber gebraucht + // GetString an der EditCell macht Leerzeichen aus Umbruechen, + // hier werden die Umbrueche aber gebraucht const EditTextObject* pData = ((ScEditCell*)pCell)->GetData(); if (pData) { @@ -1315,7 +1315,7 @@ String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bE else ScCellFormat::GetInputString( pCell, nNumFmt, aVal, *pFormatter ); - // ggf. ein ' davorhaengen wie in ScTabViewShell::UpdateInputHandler + // ggf. ein ' davorhaengen wie in ScTabViewShell::UpdateInputHandler if ( eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT ) { double fDummy; @@ -1324,8 +1324,8 @@ String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bE aVal.Insert('\'',0); else if ( aVal.Len() && aVal.GetChar(0) == '\'' ) { - // if the string starts with a "'", add another one because setFormula - // strips one (like text input, except for "text" number formats) + // if the string starts with a "'", add another one because setFormula + // strips one (like text input, except for "text" number formats) if ( bEnglish || ( pFormatter->GetType(nNumFmt) != NUMBERFORMAT_TEXT ) ) aVal.Insert('\'',0); } @@ -1412,8 +1412,8 @@ ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR) : ScCellRangesBase::~ScCellRangesBase() { - // #107294# call RemoveUnoObject first, so no notification can happen - // during ForgetCurrentAttrs + // #107294# call RemoveUnoObject first, so no notification can happen + // during ForgetCurrentAttrs if (pDocShell) pDocShell->GetDocument()->RemoveUnoObject(*this); @@ -1423,8 +1423,8 @@ ScCellRangesBase::~ScCellRangesBase() delete pValueListener; - //! XChartDataChangeEventListener abmelden ?? - //! (ChartCollection haelt dann auch dieses Objekt fest!) + //! XChartDataChangeEventListener abmelden ?? + //! (ChartCollection haelt dann auch dieses Objekt fest!) } void ScCellRangesBase::ForgetCurrentAttrs() @@ -1449,7 +1449,7 @@ void ScCellRangesBase::ForgetMarkData() const ScPatternAttr* ScCellRangesBase::GetCurrentAttrsFlat() { - // get and cache direct cell attributes for this object's range + // get and cache direct cell attributes for this object's range if ( !pCurrentFlat && pDocShell ) { @@ -1461,7 +1461,7 @@ const ScPatternAttr* ScCellRangesBase::GetCurrentAttrsFlat() const ScPatternAttr* ScCellRangesBase::GetCurrentAttrsDeep() { - // get and cache cell attributes (incl. styles) for this object's range + // get and cache cell attributes (incl. styles) for this object's range if ( !pCurrentDeep && pDocShell ) { @@ -1478,7 +1478,7 @@ SfxItemSet* ScCellRangesBase::GetCurrentDataSet(bool bNoDflt) const ScPatternAttr* pPattern = GetCurrentAttrsDeep(); if ( pPattern ) { - // Dontcare durch Default ersetzen, damit man immer eine Reflection hat + // Dontcare durch Default ersetzen, damit man immer eine Reflection hat pCurrentDataSet = new SfxItemSet( pPattern->GetItemSet() ); pNoDfltCurrentDataSet = new SfxItemSet( pPattern->GetItemSet() ); pCurrentDataSet->ClearInvalidItems(); @@ -1543,11 +1543,11 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( nId == SFX_HINT_DYING ) { ForgetCurrentAttrs(); - pDocShell = NULL; // invalid + pDocShell = NULL; // invalid if ( aValueListeners.Count() != 0 ) { - // dispose listeners + // dispose listeners lang::EventObject aEvent; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); @@ -1556,8 +1556,8 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) aValueListeners.DeleteAndDestroy( 0, aValueListeners.Count() ); - // The listeners can't have the last ref to this, as it's still held - // by the DocShell. + // The listeners can't have the last ref to this, as it's still held + // by the DocShell. } } else if ( nId == SFX_HINT_DATACHANGED ) @@ -1567,13 +1567,13 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( bGotDataChangedHint && pDocShell ) { - // This object was notified of content changes, so one call - // for each listener is generated now. - // The calls can't be executed directly because the document's - // UNO broadcaster list must not be modified. - // Instead, add to the document's list of listener calls, - // which will be executed directly after the broadcast of - // SFX_HINT_DATACHANGED. + // This object was notified of content changes, so one call + // for each listener is generated now. + // The calls can't be executed directly because the document's + // UNO broadcaster list must not be modified. + // Instead, add to the document's list of listener calls, + // which will be executed directly after the broadcast of + // SFX_HINT_DATACHANGED. lang::EventObject aEvent; aEvent.Source.set((cppu::OWeakObject*)this); @@ -1614,7 +1614,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) void ScCellRangesBase::RefChanged() { - //! adjust XChartDataChangeEventListener + //! adjust XChartDataChangeEventListener if ( pValueListener && aValueListeners.Count() != 0 ) { @@ -1651,7 +1651,7 @@ void ScCellRangesBase::InitInsertRange(ScDocShell* pDocSh, const ScRange& rR) pDocShell->GetDocument()->AddUnoObject(*this); - RefChanged(); // Range im Range-Objekt anpassen + RefChanged(); // Range im Range-Objekt anpassen } } @@ -1682,8 +1682,8 @@ void ScCellRangesBase::SetNewRanges(const ScRangeList& rNew) void ScCellRangesBase::SetCursorOnly( BOOL bSet ) { - // set for a selection object that is created from the cursor position - // without anything selected (may contain several sheets) + // set for a selection object that is created from the cursor position + // without anything selected (may contain several sheets) bCursorOnly = bSet; } @@ -1775,15 +1775,15 @@ double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunct ScMarkData aMark(*GetMarkData()); aMark.MarkToSimple(); if (!aMark.IsMarked()) - aMark.SetMarkNegative(TRUE); // um Dummy Position angeben zu koennen + aMark.SetMarkNegative(TRUE); // um Dummy Position angeben zu koennen - ScAddress aDummy; // wenn nicht Marked, ignoriert wegen Negative + ScAddress aDummy; // wenn nicht Marked, ignoriert wegen Negative double fVal; ScSubTotalFunc eFunc = lcl_SummaryToSubTotal( nFunction ); ScDocument* pDoc = pDocShell->GetDocument(); if ( !pDoc->GetSelectionFunction( eFunc, aDummy, aMark, fVal ) ) { - throw uno::RuntimeException(); //! own exception? + throw uno::RuntimeException(); //! own exception? } return fVal; @@ -1812,11 +1812,11 @@ const SfxItemPropertyMap* ScCellRangesBase::GetItemPropertyMap() return pPropSet->getPropertyMap(); } -void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry, +void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry, USHORT& rItemWhich ) { - // Which-ID des betroffenen Items, auch wenn das Item die Property - // nicht alleine behandeln kann + // Which-ID des betroffenen Items, auch wenn das Item die Property + // nicht alleine behandeln kann if ( pEntry ) { if ( IsScItemWid( pEntry->nWID ) ) @@ -1845,12 +1845,12 @@ void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry, beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, const SfxItemPropertySimpleEntry* pEntry ) { beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE; - if ( nItemWhich ) // item wid (from map or special case) + if ( nItemWhich ) // item wid (from map or special case) { - // For items that contain several properties (like background), - // "ambiguous" is returned too often here + // For items that contain several properties (like background), + // "ambiguous" is returned too often here - // for PropertyState, don't look at styles + // for PropertyState, don't look at styles const ScPatternAttr* pPattern = GetCurrentAttrsFlat(); if ( pPattern ) { @@ -1882,7 +1882,7 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, c eRet = beans::PropertyState_DIRECT_VALUE; else if ( pEntry->nWID == SC_WID_UNO_CELLSTYL ) { - // a style is always set, there's no default state + // a style is always set, there's no default state const ScStyleSheet* pStyle = pDocShell->GetDocument()->GetSelectionStyle(*GetMarkData()); if (pStyle) eRet = beans::PropertyState_DIRECT_VALUE; @@ -1890,7 +1890,7 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, c eRet = beans::PropertyState_AMBIGUOUS_VALUE; } else if ( pEntry->nWID == SC_WID_UNO_NUMRULES ) - eRet = beans::PropertyState_DEFAULT_VALUE; // numbering rules are always default + eRet = beans::PropertyState_DEFAULT_VALUE; // numbering rules are always default } return eRet; } @@ -1939,14 +1939,14 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp USHORT nItemWhich = 0; const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyName ); lcl_GetPropertyWhich( pEntry, nItemWhich ); - if ( nItemWhich ) // item wid (from map or special case) + if ( nItemWhich ) // item wid (from map or special case) { - if ( aRanges.Count() ) // leer = nichts zu tun + if ( aRanges.Count() ) // leer = nichts zu tun { ScDocFunc aFunc(*pDocShell); - //! Bei Items, die mehrere Properties enthalten (z.B. Hintergrund) - //! wird hier zuviel zurueckgesetzt + //! Bei Items, die mehrere Properties enthalten (z.B. Hintergrund) + //! wird hier zuviel zurueckgesetzt // //! for ATTR_ROTATE_VALUE, also reset ATTR_ORIENTATION? @@ -1954,7 +1954,7 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp aWIDs[0] = nItemWhich; if ( nItemWhich == ATTR_VALUE_FORMAT ) { - aWIDs[1] = ATTR_LANGUAGE_FORMAT; // #67847# language for number formats + aWIDs[1] = ATTR_LANGUAGE_FORMAT; // #67847# language for number formats aWIDs[2] = 0; } else @@ -1981,7 +1981,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - //! mit getPropertyValue zusammenfassen + //! mit getPropertyValue zusammenfassen SolarMutexGuard aGuard; uno::Any aAny; @@ -2003,7 +2003,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr switch ( pEntry->nWID ) // fuer Item-Spezial-Behandlungen { case ATTR_VALUE_FORMAT: - // default has no language set + // default has no language set aAny <<= (sal_Int32)( ((const SfxUInt32Item&)rSet.Get(pEntry->nWID)).GetValue() ); break; case ATTR_INDENT: @@ -2128,7 +2128,7 @@ void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::A if ( nNewMod == ( nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET ) && nNewMod <= SV_MAX_ANZ_STANDARD_FORMATE ) { - rFirstItemId = 0; // don't use ATTR_VALUE_FORMAT value + rFirstItemId = 0; // don't use ATTR_VALUE_FORMAT value } rSecondItemId = ATTR_LANGUAGE_FORMAT; @@ -2152,7 +2152,7 @@ void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::A sal_Int32 nRotVal = 0; if ( rValue >>= nRotVal ) { - // stored value is always between 0 and 360 deg. + // stored value is always between 0 and 360 deg. nRotVal %= 36000; if ( nRotVal < 0 ) nRotVal += 36000; @@ -2227,17 +2227,17 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE { if ( IsScItemWid( pEntry->nWID ) ) { - if ( aRanges.Count() ) // leer = nichts zu tun + if ( aRanges.Count() ) // leer = nichts zu tun { ScDocument* pDoc = pDocShell->GetDocument(); ScDocFunc aFunc(*pDocShell); - // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund) - // muss vorher das alte Item aus dem Dokument geholt werden - //! Das kann hier aber nicht erkannt werden - //! -> eigenes Flag im PropertyMap-Eintrag, oder was ??? - //! Item direkt von einzelner Position im Bereich holen? - // ClearInvalidItems, damit auf jeden Fall ein Item vom richtigen Typ da ist + // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund) + // muss vorher das alte Item aus dem Dokument geholt werden + //! Das kann hier aber nicht erkannt werden + //! -> eigenes Flag im PropertyMap-Eintrag, oder was ??? + //! Item direkt von einzelner Position im Bereich holen? + // ClearInvalidItems, damit auf jeden Fall ein Item vom richtigen Typ da ist ScPatternAttr aPattern( *GetCurrentAttrsDeep() ); SfxItemSet& rSet = aPattern.GetItemSet(); @@ -2253,7 +2253,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE aFunc.ApplyAttributes( *GetMarkData(), aPattern, TRUE, TRUE ); } } - else // implemented here + else // implemented here switch ( pEntry->nWID ) { case SC_WID_UNO_CHCOLHDR: @@ -2276,13 +2276,13 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE case SC_WID_UNO_TBLBORD: { table::TableBorder aBorder; - if ( aRanges.Count() && ( aValue >>= aBorder ) ) // empty = nothing to do + if ( aRanges.Count() && ( aValue >>= aBorder ) ) // empty = nothing to do { SvxBoxItem aOuter(ATTR_BORDER); SvxBoxInfoItem aInner(ATTR_BORDER_INNER); ScHelperFunctions::FillBoxItems( aOuter, aInner, aBorder ); - ScHelperFunctions::ApplyBorder( pDocShell, aRanges, aOuter, aInner ); //! docfunc + ScHelperFunctions::ApplyBorder( pDocShell, aRanges, aOuter, aInner ); //! docfunc } } break; @@ -2291,7 +2291,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE case SC_WID_UNO_CONDXML: { uno::Reference<sheet::XSheetConditionalEntries> xInterface(aValue, uno::UNO_QUERY); - if ( aRanges.Count() && xInterface.is() ) // leer = nichts zu tun + if ( aRanges.Count() && xInterface.is() ) // leer = nichts zu tun { ScTableConditionalFormat* pFormat = ScTableConditionalFormat::getImplementation( xInterface ); @@ -2304,7 +2304,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE formula::FormulaGrammar::GRAM_UNSPECIFIED : formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML)); - ScConditionalFormat aNew( 0, pDoc ); // Index wird beim Einfuegen gesetzt + ScConditionalFormat aNew( 0, pDoc ); // Index wird beim Einfuegen gesetzt pFormat->FillFormat( aNew, pDoc, eGrammar ); ULONG nIndex = pDoc->AddCondFormat( aNew ); @@ -2322,7 +2322,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE case SC_WID_UNO_VALIXML: { uno::Reference<beans::XPropertySet> xInterface(aValue, uno::UNO_QUERY); - if ( aRanges.Count() && xInterface.is() ) // leer = nichts zu tun + if ( aRanges.Count() && xInterface.is() ) // leer = nichts zu tun { ScTableValidationObj* pValidObj = ScTableValidationObj::getImplementation( xInterface ); @@ -2415,7 +2415,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE } } } - else // implemented here + else // implemented here switch ( pEntry->nWID ) { case SC_WID_UNO_CHCOLHDR: @@ -2436,7 +2436,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE break; case SC_WID_UNO_TBLBORD: { - //! loop throgh all ranges + //! loop throgh all ranges const ScRange* pFirst = aRanges.GetObject(0); if (pFirst) { @@ -2619,12 +2619,12 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS pNewPattern = new ScPatternAttr( pDoc->GetPool() ); } - // collect items in pNewPattern, apply with one call after the loop + // collect items in pNewPattern, apply with one call after the loop USHORT nFirstItem, nSecondItem; lcl_SetCellProperty( *pEntry, pValues[i], *pOldPattern, pDoc, nFirstItem, nSecondItem ); - // put only affected items into new set + // put only affected items into new set if ( nFirstItem ) pNewPattern->GetItemSet().Put( pOldPattern->GetItemSet().Get( nFirstItem ) ); if ( nSecondItem ) @@ -2632,7 +2632,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS } else if ( pEntry->nWID != SC_WID_UNO_CELLSTYL ) // CellStyle is handled above { - // call virtual method to set a single property + // call virtual method to set a single property SetOnePropertyValue( pEntry, pValues[i] ); } } @@ -2693,9 +2693,9 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, SfxHint*, pHint ) if ( pDocShell && pHint && pHint->ISA( SfxSimpleHint ) && ((const SfxSimpleHint*)pHint)->GetId() & (SC_HINT_DATACHANGED | SC_HINT_DYING) ) { - // This may be called several times for a single change, if several formulas - // in the range are notified. So only a flag is set that is checked when - // SFX_HINT_DATACHANGED is received. + // This may be called several times for a single change, if several formulas + // in the range are notified. So only a flag is set that is checked when + // SFX_HINT_DATACHANGED is received. bGotDataChangedHint = TRUE; } @@ -2770,14 +2770,14 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set pNewPattern = new ScPatternAttr( pDoc->GetPool() ); } - // collect items in pNewPattern, apply with one call after the loop + // collect items in pNewPattern, apply with one call after the loop USHORT nFirstItem, nSecondItem; try { lcl_SetCellProperty( *pEntry, pValues[i], *pOldPattern, pDoc, nFirstItem, nSecondItem ); - // put only affected items into new set + // put only affected items into new set if ( nFirstItem ) pNewPattern->GetItemSet().Put( pOldPattern->GetItemSet().Get( nFirstItem ) ); if ( nSecondItem ) @@ -2791,7 +2791,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set } else if ( pEntry->nWID != SC_WID_UNO_CELLSTYL ) // CellStyle is handled above { - // call virtual method to set a single property + // call virtual method to set a single property try { SetOnePropertyValue( pEntry, pValues[i] ); @@ -2903,7 +2903,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun + if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun { ScDocFunc aFunc(*pDocShell); //#97041#; put only MultiMarked ScMarkData in ChangeIndent @@ -2916,7 +2916,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::R void SAL_CALL ScCellRangesBase::incrementIndent() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun + if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun { ScDocFunc aFunc(*pDocShell); //#97041#; put only MultiMarked ScMarkData in ChangeIndent @@ -2935,9 +2935,9 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const ScRangeListRef xChartRanges; if ( aRanges.Count() == 1 ) { - // ganze Tabelle sinnvoll begrenzen (auf belegten Datenbereich) - // (nur hier, Listener werden auf den ganzen Bereich angemeldet) - //! direkt testen, ob es ein ScTableSheetObj ist? + // ganze Tabelle sinnvoll begrenzen (auf belegten Datenbereich) + // (nur hier, Listener werden auf den ganzen Bereich angemeldet) + //! direkt testen, ob es ein ScTableSheetObj ist? ScRange* pRange = aRanges.GetObject(0); if ( pRange->aStart.Col() == 0 && pRange->aEnd.Col() == MAXCOL && @@ -2965,7 +2965,7 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const xChartRanges->Append( ScRange( nStartX, nStartY, nTab, nEndX, nEndY, nTab ) ); } } - if (!xChartRanges.Is()) // sonst Ranges direkt uebernehmen + if (!xChartRanges.Is()) // sonst Ranges direkt uebernehmen xChartRanges = new ScRangeList(aRanges); ScChartArray aArr( pDocShell->GetDocument(), xChartRanges, String() ); @@ -3014,7 +3014,7 @@ ScRangeListRef ScCellRangesBase::GetLimitedChartRanges_Impl( long nDataColumns, if ( pRange->aStart.Col() == 0 && pRange->aEnd.Col() == MAXCOL && pRange->aStart.Row() == 0 && pRange->aEnd.Row() == MAXROW ) { - // if aRanges is a complete sheet, limit to given size + // if aRanges is a complete sheet, limit to given size SCTAB nTab = pRange->aStart.Tab(); @@ -3036,7 +3036,7 @@ ScRangeListRef ScCellRangesBase::GetLimitedChartRanges_Impl( long nDataColumns, } } - return new ScRangeList(aRanges); // as-is + return new ScRangeList(aRanges); // as-is } void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<double> >& aData ) @@ -3051,7 +3051,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub { ScDocument* pDoc = pDocShell->GetDocument(); ScChartArray aArr( pDoc, xChartRanges, String() ); - aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders + aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders const ScChartPositionMap* pPosMap = aArr.GetPositionMap(); if (pPosMap) { @@ -3072,17 +3072,17 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub { double fVal = pArray[nCol]; if ( fVal == DBL_MIN ) - pDoc->PutCell( *pPos, NULL ); // empty cell + pDoc->PutCell( *pPos, NULL ); // empty cell else pDoc->SetValue( pPos->Col(), pPos->Row(), pPos->Tab(), pArray[nCol] ); } } } - //! undo + //! undo PaintRanges_Impl( PAINT_GRID ); pDocShell->SetDocumentModified(); - ForceChartListener_Impl(); // call listeners for this object synchronously + ForceChartListener_Impl(); // call listeners for this object synchronously bDone = TRUE; } } @@ -3125,7 +3125,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( { ScDocument* pDoc = pDocShell->GetDocument(); ScChartArray aArr( pDoc, xChartRanges, String() ); - aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders + aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders const ScChartPositionMap* pPosMap = aArr.GetPositionMap(); if (pPosMap) { @@ -3142,14 +3142,14 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( if ( aStr.Len() ) pDoc->PutCell( *pPos, new ScStringCell( aStr ) ); else - pDoc->PutCell( *pPos, NULL ); // empty cell + pDoc->PutCell( *pPos, NULL ); // empty cell } } - //! undo + //! undo PaintRanges_Impl( PAINT_GRID ); pDocShell->SetDocumentModified(); - ForceChartListener_Impl(); // call listeners for this object synchronously + ForceChartListener_Impl(); // call listeners for this object synchronously bDone = TRUE; } } @@ -3193,7 +3193,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions( { ScDocument* pDoc = pDocShell->GetDocument(); ScChartArray aArr( pDoc, xChartRanges, String() ); - aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders + aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders const ScChartPositionMap* pPosMap = aArr.GetPositionMap(); if (pPosMap) { @@ -3210,14 +3210,14 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions( if ( aStr.Len() ) pDoc->PutCell( *pPos, new ScStringCell( aStr ) ); else - pDoc->PutCell( *pPos, NULL ); // empty cell + pDoc->PutCell( *pPos, NULL ); // empty cell } } - //! undo + //! undo PaintRanges_Impl( PAINT_GRID ); pDocShell->SetDocumentModified(); - ForceChartListener_Impl(); // call listeners for this object synchronously + ForceChartListener_Impl(); // call listeners for this object synchronously bDone = TRUE; } } @@ -3230,8 +3230,8 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions( void ScCellRangesBase::ForceChartListener_Impl() { - // call Update immediately so the caller to setData etc. can - // regognize the listener call + // call Update immediately so the caller to setData etc. can + // regognize the listener call if ( pDocShell ) { @@ -3279,7 +3279,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe SolarMutexGuard aGuard; if ( pDocShell && aRanges.Count() ) { - //! auf doppelte testen? + //! auf doppelte testen? ScDocument* pDoc = pDocShell->GetDocument(); ScRangeListRef aRangesRef( new ScRangeList(aRanges) ); @@ -3306,15 +3306,15 @@ void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::R } } -double SAL_CALL ScCellRangesBase::getNotANumber() throw(::com::sun::star::uno::RuntimeException) +double SAL_CALL ScCellRangesBase::getNotANumber() throw(::com::sun::star::uno::RuntimeException) { - // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will + // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will return DBL_MIN; } sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) throw(uno::RuntimeException) { - // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will + // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will return (nNumber == DBL_MIN); } @@ -3341,7 +3341,7 @@ void SAL_CALL ScCellRangesBase::addModifyListener( const uno::Reference<util::XM for (ULONG i=0; i<nCount; i++) pDoc->StartListeningArea( *aRanges.GetObject(i), pValueListener ); - acquire(); // don't lose this object (one ref for all listeners) + acquire(); // don't lose this object (one ref for all listeners) } } @@ -3353,7 +3353,7 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util: if ( aRanges.Count() == 0 ) throw uno::RuntimeException(); - acquire(); // in case the listeners have the last ref - released below + acquire(); // in case the listeners have the last ref - released below USHORT nCount = aValueListeners.Count(); for ( USHORT n=nCount; n--; ) @@ -3368,14 +3368,14 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util: if (pValueListener) pValueListener->EndListeningAll(); - release(); // release the ref for the listeners + release(); // release the ref for the listeners } break; } } - release(); // might delete this object + release(); // might delete this object } // XCellRangesQuery @@ -3386,7 +3386,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC SolarMutexGuard aGuard; if (pDocShell) { - //! fuer alle Tabellen getrennt, wenn Markierungen pro Tabelle getrennt sind! + //! fuer alle Tabellen getrennt, wenn Markierungen pro Tabelle getrennt sind! SCTAB nTab = lcl_FirstTab(aRanges); ScMarkData aMarkData(*GetMarkData()); @@ -3430,7 +3430,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel ScMarkData aMarkData(*GetMarkData()); - // belegte Zellen wegmarkieren + // belegte Zellen wegmarkieren ULONG nCount = aRanges.Count(); for (ULONG i=0; i<nCount; i++) { @@ -3440,7 +3440,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel ScBaseCell* pCell = aIter.GetFirst(); while (pCell) { - // Notizen zaehlen als nicht-leer + // Notizen zaehlen als nicht-leer if ( !pCell->IsBlank() ) aMarkData.SetMultiMarkArea( ScRange( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() ), @@ -3451,11 +3451,11 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel } ScRangeList aNewRanges; - // IsMultiMarked reicht hier nicht (wird beim deselektieren nicht zurueckgesetzt) + // IsMultiMarked reicht hier nicht (wird beim deselektieren nicht zurueckgesetzt) if (aMarkData.HasAnyMultiMarks()) aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE ); - return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein + return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein } return NULL; @@ -3472,7 +3472,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC ScMarkData aMarkData; - // passende Zellen selektieren + // passende Zellen selektieren ULONG nCount = aRanges.Count(); for (ULONG i=0; i<nCount; i++) { @@ -3506,7 +3506,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC bAdd = TRUE; else { - // Date/Time Erkennung + // Date/Time Erkennung ULONG nIndex = (ULONG)((SfxUInt32Item*)pDoc->GetAttr( aIter.GetCol(), aIter.GetRow(), aIter.GetTab(), @@ -3544,7 +3544,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC if (aMarkData.IsMultiMarked()) aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE ); - return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein + return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein } return NULL; @@ -3561,7 +3561,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC ScMarkData aMarkData; - // passende Zellen selektieren + // passende Zellen selektieren ULONG nCount = aRanges.Count(); for (ULONG i=0; i<nCount; i++) { @@ -3585,7 +3585,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC if ( nResultFlags & sheet::FormulaResult::VALUE ) bAdd = TRUE; } - else // String + else // String { if ( nResultFlags & sheet::FormulaResult::STRING ) bAdd = TRUE; @@ -3605,7 +3605,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC if (aMarkData.IsMultiMarked()) aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE ); - return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein + return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein } return NULL; @@ -3623,10 +3623,10 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl( SCCOLROW nCmpPos = bColumnDiff ? (SCCOLROW)aCompare.Row : (SCCOLROW)aCompare.Column; - // zuerst alles selektieren, wo ueberhaupt etwas in der Vergleichsspalte steht - // (fuer gleiche Zellen wird die Selektion im zweiten Schritt aufgehoben) + // zuerst alles selektieren, wo ueberhaupt etwas in der Vergleichsspalte steht + // (fuer gleiche Zellen wird die Selektion im zweiten Schritt aufgehoben) - SCTAB nTab = lcl_FirstTab(aRanges); //! fuer alle Tabellen, wenn Markierungen pro Tabelle! + SCTAB nTab = lcl_FirstTab(aRanges); //! fuer alle Tabellen, wenn Markierungen pro Tabelle! ScRange aCmpRange, aCellRange; if (bColumnDiff) aCmpRange = ScRange( 0,nCmpPos,nTab, MAXCOL,nCmpPos,nTab ); @@ -3667,8 +3667,8 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl( pCmpCell = aCmpIter.GetNext(); } - // alle nichtleeren Zellen mit der Vergleichsspalte vergleichen und entsprechend - // selektieren oder aufheben + // alle nichtleeren Zellen mit der Vergleichsspalte vergleichen und entsprechend + // selektieren oder aufheben ScAddress aCmpAddr; for (i=0; i<nRangeCount; i++) @@ -3699,7 +3699,7 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl( if (aMarkData.IsMultiMarked()) aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE ); - return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein + return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein } return NULL; } @@ -3739,7 +3739,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersec Min( aTemp.aEnd.Tab(), aMask.aEnd.Tab() ) ) ); } - return new ScCellRangesObj( pDocShell, aNew ); // kann leer sein + return new ScCellRangesObj( pDocShell, aNew ); // kann leer sein } // XFormulaQuery @@ -3758,10 +3758,10 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden { bFound = FALSE; - // #97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used + // #97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used ScMarkData aMarkData; aMarkData.MarkFromRangeList( aNewRanges, FALSE ); - aMarkData.MarkToMulti(); // needed for IsAllMarked + aMarkData.MarkToMulti(); // needed for IsAllMarked ULONG nCount = aNewRanges.Count(); for (ULONG nR=0; nR<nCount; nR++) @@ -3813,12 +3813,12 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen bFound = FALSE; ULONG nRangesCount = aNewRanges.Count(); - // #97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used + // #97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used ScMarkData aMarkData; aMarkData.MarkFromRangeList( aNewRanges, FALSE ); - aMarkData.MarkToMulti(); // needed for IsAllMarked + aMarkData.MarkToMulti(); // needed for IsAllMarked - SCTAB nTab = lcl_FirstTab(aNewRanges); //! alle Tabellen + SCTAB nTab = lcl_FirstTab(aNewRanges); //! alle Tabellen ScCellIterator aCellIter( pDoc, 0,0, nTab, MAXCOL,MAXROW, nTab ); ScBaseCell* pCell = aCellIter.GetFirst(); @@ -3835,7 +3835,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen { ScRange aRange(*aNewRanges.GetObject(nR)); if (aRange.Intersects(aRefRange)) - bMark = TRUE; // von Teil des Ranges abhaengig + bMark = TRUE; // von Teil des Ranges abhaengig } } if (bMark) @@ -3874,7 +3874,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll( const uno::Reference<util::XSearchDescriptor>& xDesc ) throw(uno::RuntimeException) { - // Wenn nichts gefunden wird, soll Null zurueckgegeben werden (?) + // Wenn nichts gefunden wird, soll Null zurueckgegeben werden (?) uno::Reference<container::XIndexAccess> xRet; if ( pDocShell && xDesc.is() ) { @@ -3886,7 +3886,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll( { ScDocument* pDoc = pDocShell->GetDocument(); pSearchItem->SetCommand( SVX_SEARCHCMD_FIND_ALL ); - // immer nur innerhalb dieses Objekts + // immer nur innerhalb dieses Objekts pSearchItem->SetSelection( !lcl_WholeSheet(aRanges) ); ScMarkData aMark(*GetMarkData()); @@ -3901,7 +3901,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll( { ScRangeList aNewRanges; aMark.FillRangeListWithMarks( &aNewRanges, TRUE ); - // bei findAll immer CellRanges, egal wieviel gefunden wurde + // bei findAll immer CellRanges, egal wieviel gefunden wurde xRet.set(new ScCellRangesObj( pDocShell, aNewRanges )); } } @@ -3925,7 +3925,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl( { ScDocument* pDoc = pDocShell->GetDocument(); pSearchItem->SetCommand( SVX_SEARCHCMD_FIND ); - // immer nur innerhalb dieses Objekts + // immer nur innerhalb dieses Objekts pSearchItem->SetSelection( !lcl_WholeSheet(aRanges) ); ScMarkData aMark(*GetMarkData()); @@ -3937,7 +3937,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl( pLastPos->GetVars( nCol, nRow, nTab ); else { - nTab = lcl_FirstTab(aRanges); //! mehrere Tabellen? + nTab = lcl_FirstTab(aRanges); //! mehrere Tabellen? ScDocument::GetSearchAndReplaceStart( *pSearchItem, nCol, nRow ); } @@ -4010,7 +4010,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea ScDocument* pDoc = pDocShell->GetDocument(); BOOL bUndo(pDoc->IsUndoEnabled()); pSearchItem->SetCommand( SVX_SEARCHCMD_REPLACE_ALL ); - // immer nur innerhalb dieses Objekts + // immer nur innerhalb dieses Objekts pSearchItem->SetSelection( !lcl_WholeSheet(aRanges) ); ScMarkData aMark(*GetMarkData()); @@ -4022,11 +4022,11 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea bProtected = TRUE; if (bProtected) { - //! Exception, oder was? + //! Exception, oder was? } else { - SCTAB nTab = aMark.GetFirstSelected(); // bei SearchAndReplace nicht benutzt + SCTAB nTab = aMark.GetFirstSelected(); // bei SearchAndReplace nicht benutzt SCCOL nCol = 0; SCROW nRow = 0; @@ -4128,7 +4128,7 @@ void ScCellRangesObj::RefChanged() { ScCellRangesBase::RefChanged(); - // nix weiter... + // nix weiter... } uno::Any SAL_CALL ScCellRangesObj::queryInterface( const uno::Type& rType ) @@ -4172,7 +4172,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::Runtime pPtr[nParentLen + 2] = getCppuType((const uno::Reference<container::XEnumerationAccess>*)0); for (long i=0; i<nParentLen; i++) - pPtr[i] = pParentPtr[i]; // parent types first + pPtr[i] = pParentPtr[i]; // parent types first } return aTypes; } @@ -4204,7 +4204,7 @@ ScCellRangeObj* ScCellRangesObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const return new ScCellRangeObj( pDocSh, aRange ); } - return NULL; // keine DocShell oder falscher Index + return NULL; // keine DocShell oder falscher Index } uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddresses() @@ -4227,7 +4227,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddress return aSeq; } - return uno::Sequence<table::CellRangeAddress>(0); // leer ist moeglich + return uno::Sequence<table::CellRangeAddress>(0); // leer ist moeglich } uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells() @@ -4235,10 +4235,10 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells { SolarMutexGuard aGuard; - // getCells with empty range list is possible (no exception), - // the resulting enumeration just has no elements - // (same behaviour as a valid range with no cells) - // This is handled in ScCellsEnumeration ctor. + // getCells with empty range list is possible (no exception), + // the resulting enumeration just has no elements + // (same behaviour as a valid range with no cells) + // This is handled in ScCellsEnumeration ctor. const ScRangeList& rRanges = GetRangeList(); ScDocShell* pDocSh = GetDocShell(); @@ -4358,7 +4358,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table:: ::com::sun::star::uno::RuntimeException) { // with this implementation not needed -// SolarMutexGuard aGuard; +// SolarMutexGuard aGuard; // use sometimes a better/faster implementation @@ -4391,7 +4391,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u ScDocShell* pDocSh = GetDocShell(); BOOL bDone = FALSE; - //! Type of aElement can be some specific interface instead of XInterface + //! Type of aElement can be some specific interface instead of XInterface uno::Reference<uno::XInterface> xInterface(aElement, uno::UNO_QUERY); if ( pDocSh && xInterface.is() ) @@ -4399,7 +4399,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xInterface ); if ( pRangesImp && pRangesImp->GetDocShell() == pDocSh ) { - // if explicit name is given and already existing, throw exception + // if explicit name is given and already existing, throw exception String aNamStr(aName); if ( aNamStr.Len() ) @@ -4420,9 +4420,9 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u if ( aName.getLength() && nAddCount == 1 ) { - // if a name is given, also insert into list of named entries - // (only possible for a single range) - // name is not in aNamedEntries (tested above) + // if a name is given, also insert into list of named entries + // (only possible for a single range) + // name is not in aNamedEntries (tested above) ScNamedEntry* pEntry = new ScNamedEntry( aNamStr, *rAddRanges.GetObject(0) ); aNamedEntries.Insert( pEntry, aNamedEntries.Count() ); @@ -4432,7 +4432,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u if (!bDone) { - // invalid element - double names are handled above + // invalid element - double names are handled above throw lang::IllegalArgumentException(); } } @@ -4455,14 +4455,14 @@ BOOL lcl_FindRangeByName( const ScRangeList& rRanges, ScDocShell* pDocSh, } } } - return FALSE; // nicht gefunden + return FALSE; // nicht gefunden } BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, const ScRangeList& rRanges, ScDocShell* pDocSh, const String& rName, ScRange& rFound ) { - // exact range in list? + // exact range in list? ULONG nIndex = 0; if ( lcl_FindRangeByName( rRanges, pDocSh, rName, nIndex ) ) @@ -4471,7 +4471,7 @@ BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, return TRUE; } - // range contained in selection? (sheet must be specified) + // range contained in selection? (sheet must be specified) ScRange aCellRange; USHORT nParse = aCellRange.ParseAny( rName, pDocSh->GetDocument() ); @@ -4479,7 +4479,7 @@ BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, { ScMarkData aMarkData; aMarkData.MarkFromRangeList( rRanges, FALSE ); - aMarkData.MarkToMulti(); // needed for IsAllMarked + aMarkData.MarkToMulti(); // needed for IsAllMarked if ( aMarkData.IsAllMarked( aCellRange ) ) { rFound = aCellRange; @@ -4487,19 +4487,19 @@ BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, } } - // named entry in this object? + // named entry in this object? if ( rNamedEntries.Count() ) { for ( USHORT n=0; n<rNamedEntries.Count(); n++ ) if ( rNamedEntries[n]->GetName() == rName ) { - // test if named entry is contained in rRanges + // test if named entry is contained in rRanges const ScRange& rComp = rNamedEntries[n]->GetRange(); ScMarkData aMarkData; aMarkData.MarkFromRangeList( rRanges, FALSE ); - aMarkData.MarkToMulti(); // needed for IsAllMarked + aMarkData.MarkToMulti(); // needed for IsAllMarked if ( aMarkData.IsAllMarked( rComp ) ) { rFound = rComp; @@ -4508,7 +4508,7 @@ BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, } } - return FALSE; // not found + return FALSE; // not found } void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) @@ -4523,7 +4523,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) ULONG nIndex = 0; if ( lcl_FindRangeByName( rRanges, pDocSh, aNameStr, nIndex ) ) { - // einzelnen Range weglassen + // einzelnen Range weglassen ScRangeList aNew; ULONG nCount = rRanges.Count(); for (ULONG i=0; i<nCount; i++) @@ -4534,7 +4534,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) } else if (pDocSh) { - // deselect any ranges (parsed or named entry) + // deselect any ranges (parsed or named entry) ScRangeList aDiff; BOOL bValid = ( aDiff.Parse( aNameStr, pDocSh->GetDocument() ) & SCA_VALID ) != 0; if ( !bValid && aNamedEntries.Count() ) @@ -4565,15 +4565,15 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) aMarkData.FillRangeListWithMarks( &aNew, FALSE ); SetNewRanges(aNew); - bDone = TRUE; //! error if range was not selected before? + bDone = TRUE; //! error if range was not selected before? } } if (aNamedEntries.Count()) - lcl_RemoveNamedEntry( aNamedEntries, aNameStr ); // remove named entry + lcl_RemoveNamedEntry( aNamedEntries, aNameStr ); // remove named entry if (!bDone) - throw container::NoSuchElementException(); // not found + throw container::NoSuchElementException(); // not found } // XNameReplace @@ -4583,7 +4583,7 @@ void SAL_CALL ScCellRangesObj::replaceByName( const rtl::OUString& aName, const lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; - //! zusammenfassen? + //! zusammenfassen? removeByName( aName ); insertByName( aName, aElement ); } @@ -4645,7 +4645,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames() rtl::OUString* pAry = aSeq.getArray(); for (ULONG i=0; i<nCount; i++) { - // use given name if for exactly this range, otherwise just format + // use given name if for exactly this range, otherwise just format ScRange aRange = *rRanges.GetObject(i); if ( !aNamedEntries.Count() || !lcl_FindEntryName( aNamedEntries, aRange, aRangeStr ) ) aRange.Format( aRangeStr, SCA_VALID | SCA_TAB_3D, pDoc ); @@ -4758,7 +4758,7 @@ ScCellRangeObj::ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR) : pRangePropSet( lcl_GetRangePropertySet() ), aRange( rR ) { - aRange.Justify(); // Anfang / Ende richtig + aRange.Justify(); // Anfang / Ende richtig } ScCellRangeObj::~ScCellRangeObj() @@ -4845,7 +4845,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeE pPtr[nParentLen +16] = getCppuType((const uno::Reference<sheet::XUniqueCellFormatRangesSupplier>*)0); for (long i=0; i<nParentLen; i++) - pPtr[i] = pParentPtr[i]; // parent types first + pPtr[i] = pParentPtr[i]; // parent types first } return aTypes; } @@ -4864,8 +4864,8 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangeObj::getImplementationId() // XCellRange -// ColumnCount / RowCount sind weggefallen -//! werden im Writer fuer Tabellen noch gebraucht ??? +// ColumnCount / RowCount sind weggefallen +//! werden im Writer fuer Tabellen noch gebraucht ??? uno::Reference<table::XCell> ScCellRangeObj::GetCellByPosition_Impl( sal_Int32 nColumn, sal_Int32 nRow ) @@ -4940,8 +4940,8 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName( uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( const rtl::OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException) { - // name refers to the whole document (with the range's table as default), - // valid only if the range is within this range + // name refers to the whole document (with the range's table as default), + // valid only if the range is within this range SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -4956,7 +4956,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( USHORT nParse = aCellRange.ParseAny( aString, pDoc, rDetails ); if ( nParse & SCA_VALID ) { - if ( !(nParse & SCA_TAB_3D) ) // keine Tabelle angegeben -> auf dieser Tabelle + if ( !(nParse & SCA_TAB_3D) ) // keine Tabelle angegeben -> auf dieser Tabelle { aCellRange.aStart.SetTab(nTab); aCellRange.aEnd.SetTab(nTab); @@ -4971,7 +4971,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( bFound = TRUE; } - if (bFound) // valid only if within this object's range + if (bFound) // valid only if within this object's range { if (!aRange.In(aCellRange)) bFound = FALSE; @@ -5046,9 +5046,9 @@ rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeExcep { SolarMutexGuard aGuard; - // Matrix-Formel, wenn eindeutig Teil einer Matrix, - // also wenn Anfang und Ende des Blocks zur selben Matrix gehoeren. - // Sonst Leerstring. + // Matrix-Formel, wenn eindeutig Teil einer Matrix, + // also wenn Anfang und Ende des Blocks zur selben Matrix gehoeren. + // Sonst Leerstring. String aFormula; ScDocShell* pDocSh = GetDocShell(); @@ -5066,8 +5066,8 @@ rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeExcep ScAddress aStart2; if ( pFCell1->GetMatrixOrigin( aStart1 ) && pFCell2->GetMatrixOrigin( aStart2 ) ) { - if ( aStart1 == aStart2 ) // beides dieselbe Matrix - pFCell1->GetFormula( aFormula ); // egal, von welcher Zelle + if ( aStart1 == aStart2 ) // beides dieselbe Matrix + pFCell1->GetFormula( aFormula ); // egal, von welcher Zelle } } } @@ -5085,7 +5085,7 @@ void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula, { if ( ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ) ) { - // #74681# don't set array formula for sheet object + // #74681# don't set array formula for sheet object throw uno::RuntimeException(); } @@ -5093,7 +5093,7 @@ void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula, } else { - // empty string -> erase array formula + // empty string -> erase array formula ScMarkData aMark; aMark.SetMarkArea( aRange ); aMark.SelectTable( aRange.aStart.Tab(), TRUE ); @@ -5196,7 +5196,7 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray() if ( ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ) ) { - // don't create a data array for the sheet + // don't create a data array for the sheet throw uno::RuntimeException(); } @@ -5209,11 +5209,11 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray() { uno::Sequence< uno::Sequence<uno::Any> > aSeq; if ( aAny >>= aSeq ) - return aSeq; // success + return aSeq; // success } } - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified // return uno::Sequence< uno::Sequence<uno::Any> >(0); } @@ -5232,7 +5232,7 @@ void SAL_CALL ScCellRangeObj::setDataArray( } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } // XCellRangeFormula @@ -5244,7 +5244,7 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul if ( ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ) ) { - // don't create a data array for the sheet + // don't create a data array for the sheet throw uno::RuntimeException(); } @@ -5275,7 +5275,7 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul return aRowSeq; } - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified // return uno::Sequence< uno::Sequence<rtl::OUString> >(0); } @@ -5296,7 +5296,7 @@ void SAL_CALL ScCellRangeObj::setFormulaArray( } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } // XMultipleOperation @@ -5319,10 +5319,10 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress& aParam.aRefFormulaEnd = ScRefAddress( (SCCOL)aFormulaRange.EndColumn, (SCROW)aFormulaRange.EndRow, aFormulaRange.Sheet, FALSE, FALSE, FALSE ); - aParam.aRefRowCell = ScRefAddress( (SCCOL)aRowCell.Column, + aParam.aRefRowCell = ScRefAddress( (SCCOL)aRowCell.Column, (SCROW)aRowCell.Row, aRowCell.Sheet, FALSE, FALSE, FALSE ); - aParam.aRefColCell = ScRefAddress( (SCCOL)aColumnCell.Column, + aParam.aRefColCell = ScRefAddress( (SCCOL)aColumnCell.Column, (SCROW)aColumnCell.Row, aColumnCell.Sheet, FALSE, FALSE, FALSE ); switch (nMode) @@ -5366,7 +5366,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti else aFunc.UnmergeCells( aMergeOption, TRUE, TRUE ); - //! Fehler abfangen? + //! Fehler abfangen? } } @@ -5389,7 +5389,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection, { BOOL bError = FALSE; - FillDir eDir = FILL_TO_BOTTOM; + FillDir eDir = FILL_TO_BOTTOM; switch (nFillDirection) { case sheet::FillDirection_TO_BOTTOM: @@ -5430,7 +5430,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection, bError = TRUE; } - FillDateCmd eDateCmd = FILL_DAY; + FillDateCmd eDateCmd = FILL_DAY; switch ( nFillDateMode ) { case sheet::FillDateMode_FILL_DATE_DAY: @@ -5522,7 +5522,7 @@ void SAL_CALL ScCellRangeObj::autoFormat( const rtl::OUString& aName ) for (nIndex=0; nIndex<nCount; nIndex++) { (*pAutoFormat)[nIndex]->GetName(aCompare); - if ( aCompare == aNameString ) //! Case-insensitiv ??? + if ( aCompare == aNameString ) //! Case-insensitiv ??? break; } if (nIndex<nCount) @@ -5551,7 +5551,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescripto { pData->GetSortParam(aParam); - // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt ScRange aDBRange; pData->GetArea(aDBRange); SCCOLROW nFieldStart = aParam.bByRow ? @@ -5577,10 +5577,10 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a { USHORT i; ScSortParam aParam; - ScDBData* pData = pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen + ScDBData* pData = pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen if (pData) { - // alten Einstellungen holen, falls nicht alles neu gesetzt wird + // alten Einstellungen holen, falls nicht alles neu gesetzt wird pData->GetSortParam(aParam); SCCOLROW nOldStart = aParam.bByRow ? static_cast<SCCOLROW>(aRange.aStart.Col()) : @@ -5592,8 +5592,8 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a ScSortDescriptor::FillSortParam( aParam, aDescriptor ); - // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt - // ByRow kann bei FillSortParam umgesetzt worden sein + // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // ByRow kann bei FillSortParam umgesetzt worden sein SCCOLROW nFieldStart = aParam.bByRow ? static_cast<SCCOLROW>(aRange.aStart.Col()) : static_cast<SCCOLROW>(aRange.aStart.Row()); @@ -5606,9 +5606,9 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a aParam.nCol2 = aRange.aEnd.Col(); aParam.nRow2 = aRange.aEnd.Row(); - pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen + pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen - ScDBDocFunc aFunc(*pDocSh); // Bereich muss angelegt sein + ScDBDocFunc aFunc(*pDocSh); // Bereich muss angelegt sein aFunc.Sort( nTab, aParam, TRUE, TRUE, TRUE ); } } @@ -5629,7 +5629,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil { ScQueryParam aParam; pData->GetQueryParam(aParam); - // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt ScRange aDBRange; pData->GetArea(aDBRange); SCCOLROW nFieldStart = aParam.bByRow ? @@ -5653,10 +5653,10 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe { SolarMutexGuard aGuard; - // das koennte theoretisch ein fremdes Objekt sein, also nur das - // oeffentliche XSheetFilterDescriptor Interface benutzen, um - // die Daten in ein ScFilterDescriptor Objekt zu kopieren: - //! wenn es schon ein ScFilterDescriptor ist, direkt per getImplementation? + // das koennte theoretisch ein fremdes Objekt sein, also nur das + // oeffentliche XSheetFilterDescriptor Interface benutzen, um + // die Daten in ein ScFilterDescriptor Objekt zu kopieren: + //! wenn es schon ein ScFilterDescriptor ist, direkt per getImplementation? ScDocShell* pDocSh = GetDocShell(); ScFilterDescriptor aImpl(pDocSh); @@ -5669,20 +5669,20 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe { aImpl.setFilterFields( xDescriptor->getFilterFields() ); } - // Rest sind jetzt Properties... + // Rest sind jetzt Properties... uno::Reference<beans::XPropertySet> xPropSet( xDescriptor, uno::UNO_QUERY ); if (xPropSet.is()) lcl_CopyProperties( aImpl, *(beans::XPropertySet*)xPropSet.get() ); // - // ausfuehren... + // ausfuehren... // if (pDocSh) { ScQueryParam aParam = aImpl.GetParam(); - // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt SCCOLROW nFieldStart = aParam.bByRow ? static_cast<SCCOLROW>(aRange.aStart.Col()) : static_cast<SCCOLROW>(aRange.aStart.Row()); @@ -5693,7 +5693,7 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe if (rEntry.bDoQuery) { rEntry.nField += nFieldStart; - // Im Dialog wird immer der String angezeigt -> muss zum Wert passen + // Im Dialog wird immer der String angezeigt -> muss zum Wert passen if ( !rEntry.bQueryByString ) pDocSh->GetDocument()->GetFormatTable()-> GetInputLineString( rEntry.nVal, 0, *rEntry.pStr ); @@ -5706,17 +5706,17 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe aParam.nCol2 = aRange.aEnd.Col(); aParam.nRow2 = aRange.aEnd.Row(); - pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen + pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen - //! keep source range in filter descriptor - //! if created by createFilterDescriptorByObject ??? + //! keep source range in filter descriptor + //! if created by createFilterDescriptorByObject ??? ScDBDocFunc aFunc(*pDocSh); - aFunc.Query( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein + aFunc.Query( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein } } -//! get/setAutoFilter als Properties!!! +//! get/setAutoFilter als Properties!!! // XAdvancedFilterSource @@ -5726,17 +5726,17 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil { SolarMutexGuard aGuard; - // this ist hier nicht der Bereich, der gefiltert wird, sondern der - // Bereich mit der Abfrage... + // this ist hier nicht der Bereich, der gefiltert wird, sondern der + // Bereich mit der Abfrage... uno::Reference<sheet::XCellRangeAddressable> xAddr( xObject, uno::UNO_QUERY ); ScDocShell* pDocSh = GetDocShell(); if ( pDocSh && xAddr.is() ) { - //! Test, ob xObject im selben Dokument ist + //! Test, ob xObject im selben Dokument ist - ScFilterDescriptor* pNew = new ScFilterDescriptor(pDocSh); //! stattdessen vom Objekt? + ScFilterDescriptor* pNew = new ScFilterDescriptor(pDocSh); //! stattdessen vom Objekt? //XSheetFilterDescriptorRef xNew = xObject->createFilterDescriptor(TRUE); ScQueryParam aParam = pNew->GetParam(); @@ -5756,7 +5756,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil aRange.aStart.Tab(), aParam ); if ( bOk ) { - // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt SCCOLROW nFieldStart = aParam.bByRow ? static_cast<SCCOLROW>(aDataAddress.StartColumn) : static_cast<SCCOLROW>(aDataAddress.StartRow); @@ -5774,7 +5774,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil else { delete pNew; - return NULL; // ungueltig -> null + return NULL; // ungueltig -> null } } @@ -5798,7 +5798,7 @@ uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTot { ScSubTotalParam aParam; pData->GetSubTotalParam(aParam); - // im SubTotalDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im SubTotalDescriptor sind die Fields innerhalb des Bereichs gezaehlt ScRange aDBRange; pData->GetArea(aDBRange); SCCOL nFieldStart = aDBRange.aStart.Col(); @@ -5834,9 +5834,9 @@ void SAL_CALL ScCellRangeObj::applySubTotals( if (pDocSh && pImp) { ScSubTotalParam aParam; - pImp->GetData(aParam); // virtuelle Methode der Basisklasse + pImp->GetData(aParam); // virtuelle Methode der Basisklasse - // im SubTotalDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im SubTotalDescriptor sind die Fields innerhalb des Bereichs gezaehlt SCCOL nFieldStart = aRange.aStart.Col(); for (USHORT i=0; i<MAXSUBTOTAL; i++) { @@ -5856,10 +5856,10 @@ void SAL_CALL ScCellRangeObj::applySubTotals( aParam.nCol2 = aRange.aEnd.Col(); aParam.nRow2 = aRange.aEnd.Row(); - pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen + pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen ScDBDocFunc aFunc(*pDocSh); - aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein + aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein } } @@ -5873,7 +5873,7 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException) ScSubTotalParam aParam; ScDBData* pData = pDocSh->GetDBData( aRange, SC_DB_OLD, SC_DBSEL_FORCE_MARK ); if (pData) - pData->GetSubTotalParam(aParam); // auch bei Remove die Feld-Eintraege behalten + pData->GetSubTotalParam(aParam); // auch bei Remove die Feld-Eintraege behalten aParam.bRemoveOnly = TRUE; @@ -5883,10 +5883,10 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException) aParam.nCol2 = aRange.aEnd.Col(); aParam.nRow2 = aRange.aEnd.Row(); - pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen + pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen ScDBDocFunc aFunc(*pDocSh); - aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein + aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein } } @@ -5928,10 +5928,10 @@ void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue //! TODO: could we get passed a valid result set by any means? uno::Reference< sdbc::XResultSet > xResultSet; - pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen + pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen - ScDBDocFunc aFunc(*pDocSh); // Bereich muss angelegt sein - aFunc.DoImport( nTab, aParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag als Parameter + ScDBDocFunc aFunc(*pDocSh); // Bereich muss angelegt sein + aFunc.DoImport( nTab, aParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag als Parameter } } @@ -5973,8 +5973,8 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetI void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - // Range has only Position and Size in addition to ScCellRangesBase, both are ReadOnly - // -> nothing to do here + // Range has only Position and Size in addition to ScCellRangesBase, both are ReadOnly + // -> nothing to do here ScCellRangesBase::SetOnePropertyValue( pEntry, aValue ); } @@ -5990,7 +5990,7 @@ void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEnt ScDocShell* pDocSh = GetDocShell(); if (pDocSh) { - // GetMMRect converts using HMM_PER_TWIPS, like the DrawingLayer + // GetMMRect converts using HMM_PER_TWIPS, like the DrawingLayer Rectangle aMMRect(pDocSh->GetDocument()->GetMMRect( aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row(), aRange.aStart.Tab() )); @@ -6003,7 +6003,7 @@ void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEnt ScDocShell* pDocSh = GetDocShell(); if (pDocSh) { - // GetMMRect converts using HMM_PER_TWIPS, like the DrawingLayer + // GetMMRect converts using HMM_PER_TWIPS, like the DrawingLayer Rectangle aMMRect = pDocSh->GetDocument()->GetMMRect( aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row(), aRange.aStart.Tab() ); @@ -6072,11 +6072,11 @@ ScCellObj::ScCellObj(ScDocShell* pDocSh, const ScAddress& rP) : aCellPos( rP ), nActionLockCount( 0 ) { - // pUnoText is allocated on demand (GetUnoText) - // can't be aggregated because getString/setString is handled here + // pUnoText is allocated on demand (GetUnoText) + // can't be aggregated because getString/setString is handled here } -SvxUnoText& ScCellObj::GetUnoText() +SvxUnoText& ScCellObj::GetUnoText() { if (!pUnoText) { @@ -6158,7 +6158,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeExcept pPtr[nParentLen + 7] = getCppuType((const uno::Reference<sheet::XFormulaTokens>*)0); for (long i=0; i<nParentLen; i++) - pPtr[i] = pParentPtr[i]; // parent types first + pPtr[i] = pParentPtr[i]; // parent types first } return aTypes; } @@ -6174,9 +6174,9 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId() throw(uno::Run return aId; } -// Hilfsfunktionen +// Hilfsfunktionen -String ScCellObj::GetInputString_Impl(BOOL bEnglish) const // fuer getFormula / FormulaLocal +String ScCellObj::GetInputString_Impl(BOOL bEnglish) const // fuer getFormula / FormulaLocal { if (GetDocShell()) return lcl_GetInputString( GetDocShell()->GetDocument(), aCellPos, bEnglish ); @@ -6193,8 +6193,8 @@ String ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aCellP { if ( pCell->GetCellType() == CELLTYPE_EDIT ) { - // GetString an der EditCell macht Leerzeichen aus Umbruechen, - // hier werden die Umbrueche aber gebraucht + // GetString an der EditCell macht Leerzeichen aus Umbruechen, + // hier werden die Umbrueche aber gebraucht const EditTextObject* pData = ((ScEditCell*)pCell)->GetData(); if (pData) { @@ -6202,12 +6202,12 @@ String ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aCellP rEngine.SetText( *pData ); aVal = rEngine.GetText( LINEEND_LF ); } - // Edit-Zellen auch nicht per NumberFormatter formatieren - // (passend zur Ausgabe) + // Edit-Zellen auch nicht per NumberFormatter formatieren + // (passend zur Ausgabe) } else { - // wie in GetString am Dokument (column) + // wie in GetString am Dokument (column) Color* pColor; ULONG nNumFmt = pDoc->GetNumberFormat( aCellPos ); ScCellFormat::GetString( pCell, nNumFmt, aVal, &pColor, *pDoc->GetFormatTable() ); @@ -6291,7 +6291,7 @@ void ScCellObj::SetFormulaWithGrammar( const ::rtl::OUString& rFormula, } } -// XText +// XText uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor() throw(uno::RuntimeException) @@ -6333,7 +6333,7 @@ void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::Runt { SolarMutexGuard aGuard; String aString(aText); - SetString_Impl(aString, FALSE, FALSE); // immer Text + SetString_Impl(aString, FALSE, FALSE); // immer Text // don't create pUnoText here if not there if (pUnoText) @@ -6378,7 +6378,7 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang if (!bAbsorb) { - // nicht ersetzen -> hinten anhaengen + // nicht ersetzen -> hinten anhaengen aSelection.Adjust(); aSelection.nStartPara = aSelection.nEndPara; aSelection.nStartPos = aSelection.nEndPos; @@ -6390,14 +6390,14 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang pForwarder->QuickInsertField( aItem, aSelection ); pEditSource->UpdateData(); - // neue Selektion: ein Zeichen + // neue Selektion: ein Zeichen aSelection.Adjust(); aSelection.nEndPara = aSelection.nStartPara; aSelection.nEndPos = aSelection.nStartPos + 1; pCellField->InitDoc( pDocSh, aCellPos, aSelection ); - // #91431# for bAbsorb=FALSE, the new selection must be behind the inserted content - // (the xml filter relies on this) + // #91431# for bAbsorb=FALSE, the new selection must be behind the inserted content + // (the xml filter relies on this) if (!bAbsorb) aSelection.nStartPos = aSelection.nEndPos; @@ -6418,7 +6418,7 @@ void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextCont ScCellFieldObj* pCellField = ScCellFieldObj::getImplementation( xContent ); if ( pCellField && pCellField->IsInserted() ) { - //! Testen, ob das Feld in dieser Zelle ist + //! Testen, ob das Feld in dieser Zelle ist pCellField->DeleteField(); return; } @@ -6463,12 +6463,12 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException) return GetUnoText().hasElements(); } -// XCell +// XCell rtl::OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // TRUE = englisch + // TRUE = englisch return GetInputString_Impl(TRUE); } @@ -6476,7 +6476,7 @@ void SAL_CALL ScCellObj::setFormula( const rtl::OUString& aFormula ) throw(uno:: { SolarMutexGuard aGuard; String aString(aFormula); - SetString_Impl(aString, TRUE, TRUE); // englisch interpretieren + SetString_Impl(aString, TRUE, TRUE); // englisch interpretieren } double SAL_CALL ScCellObj::getValue() throw(uno::RuntimeException) @@ -6517,7 +6517,7 @@ table::CellContentType SAL_CALL ScCellObj::getType() throw(uno::RuntimeException } else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + DBG_ERROR("keine DocShell"); //! Exception oder so? } return eRet; @@ -6535,7 +6535,7 @@ table::CellContentType ScCellObj::GetResultType_Impl() return bValue ? table::CellContentType_VALUE : table::CellContentType_TEXT; } } - return getType(); // wenn keine Formel + return getType(); // wenn keine Formel } sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException) @@ -6552,7 +6552,7 @@ sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException) } else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + DBG_ERROR("keine DocShell"); //! Exception oder so? } return nError; @@ -6601,9 +6601,9 @@ table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeExcept { SolarMutexGuard aGuard; table::CellAddress aAdr; - aAdr.Sheet = aCellPos.Tab(); - aAdr.Column = aCellPos.Col(); - aAdr.Row = aCellPos.Row(); + aAdr.Sheet = aCellPos.Tab(); + aAdr.Column = aCellPos.Col(); + aAdr.Row = aCellPos.Row(); return aAdr; } @@ -6637,7 +6637,7 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellObj::getTextFields( uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters() throw(uno::RuntimeException) { - // sowas gibts nicht im Calc (?) + // sowas gibts nicht im Calc (?) return NULL; } @@ -6662,12 +6662,12 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c rtl::OUString aStrVal; aValue >>= aStrVal; String aString(aStrVal); - SetString_Impl(aString, TRUE, FALSE); // lokal interpretieren + SetString_Impl(aString, TRUE, FALSE); // lokal interpretieren } else if ( pEntry->nWID == SC_WID_UNO_FORMRT ) { - // Read-Only - //! Exception oder so... + // Read-Only + //! Exception oder so... } else ScCellRangeObj::SetOnePropertyValue( pEntry, aValue ); @@ -6710,9 +6710,9 @@ rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeExce sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName ) throw(uno::RuntimeException) { - // CellRange/SheetCellRange are not in SheetCell service description, - // but ScCellObj is used instead of ScCellRangeObj in CellRanges collections, - // so it must support them + // CellRange/SheetCellRange are not in SheetCell service description, + // but ScCellObj is used instead of ScCellRangeObj in CellRanges collections, + // so it must support them String aServiceStr(rServiceName); return aServiceStr.EqualsAscii( SCSHEETCELL_SERVICE ) || @@ -6904,7 +6904,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::Runtime pPtr[nParentLen +17] = getCppuType((const uno::Reference<document::XEventsSupplier>*)0); for (long i=0; i<nParentLen; i++) - pPtr[i] = pParentPtr[i]; // parent types first + pPtr[i] = pParentPtr[i]; // parent types first } return aTypes; } @@ -6920,7 +6920,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId() throw(un return aId; } -// Hilfsfunktionen +// Hilfsfunktionen SCTAB ScTableSheetObj::GetTab_Impl() const { @@ -6930,7 +6930,7 @@ SCTAB ScTableSheetObj::GetTab_Impl() const if (pFirst) return pFirst->aStart.Tab(); - return 0; // soll nicht sein + return 0; // soll nicht sein } // former XSheet @@ -6997,7 +6997,7 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor() ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { - //! einzelne Zelle oder ganze Tabelle??????? + //! einzelne Zelle oder ganze Tabelle??????? SCTAB nTab = GetTab_Impl(); return new ScCellCursorObj( pDocSh, ScRange( 0,0,nTab, MAXCOL,MAXROW,nTab ) ); } @@ -7029,7 +7029,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return this; //!??? + return this; //!??? } // XCellRange @@ -7061,11 +7061,11 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage SCTAB nTab = GetTab_Impl(); Size aSize(pDoc->GetPageSize( nTab )); - if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt? + if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt? pDoc->UpdatePageBreaks( nTab ); else { - // Umbrueche updaten wie in ScDocShell::PageStyleModified: + // Umbrueche updaten wie in ScDocShell::PageStyleModified: ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab ); aPrintFunc.UpdatePages(); } @@ -7085,7 +7085,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab); if (nBreak) { - aData.Position = nCol; + aData.Position = nCol; aData.ManualBreak = (nBreak & BREAK_MANUAL); pAry[nPos] = aData; ++nPos; @@ -7107,11 +7107,11 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre SCTAB nTab = GetTab_Impl(); Size aSize(pDoc->GetPageSize( nTab )); - if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt? + if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt? pDoc->UpdatePageBreaks( nTab ); else { - // Umbrueche updaten wie in ScDocShell::PageStyleModified: + // Umbrueche updaten wie in ScDocShell::PageStyleModified: ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab ); aPrintFunc.UpdatePages(); } @@ -7126,7 +7126,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { - //! docfunc Funktion, auch fuer ScViewFunc::RemoveManualBreaks + //! docfunc Funktion, auch fuer ScViewFunc::RemoveManualBreaks ScDocument* pDoc = pDocSh->GetDocument(); BOOL bUndo (pDoc->IsUndoEnabled()); @@ -7193,8 +7193,8 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage() if (pPage) return uno::Reference<drawing::XDrawPage> (pPage->getUnoPage(), uno::UNO_QUERY); - // Das DrawPage-Objekt meldet sich als Listener am SdrModel an - // und sollte von dort alle Aktionen mitbekommen + // Das DrawPage-Objekt meldet sich als Listener am SdrModel an + // und sollte von dort alle Aktionen mitbekommen } return NULL; } @@ -7212,11 +7212,11 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang InsCellCmd eCmd = INS_NONE; switch (nMode) { - case sheet::CellInsertMode_NONE: bDo = FALSE; break; - case sheet::CellInsertMode_DOWN: eCmd = INS_CELLSDOWN; break; - case sheet::CellInsertMode_RIGHT: eCmd = INS_CELLSRIGHT; break; - case sheet::CellInsertMode_ROWS: eCmd = INS_INSROWS; break; - case sheet::CellInsertMode_COLUMNS: eCmd = INS_INSCOLS; break; + case sheet::CellInsertMode_NONE: bDo = FALSE; break; + case sheet::CellInsertMode_DOWN: eCmd = INS_CELLSDOWN; break; + case sheet::CellInsertMode_RIGHT: eCmd = INS_CELLSRIGHT; break; + case sheet::CellInsertMode_ROWS: eCmd = INS_INSROWS; break; + case sheet::CellInsertMode_COLUMNS: eCmd = INS_INSCOLS; break; default: DBG_ERROR("insertCells: falscher Mode"); bDo = FALSE; @@ -7244,11 +7244,11 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang DelCellCmd eCmd = DEL_NONE; switch (nMode) { - case sheet::CellDeleteMode_NONE: bDo = FALSE; break; - case sheet::CellDeleteMode_UP: eCmd = DEL_CELLSUP; break; - case sheet::CellDeleteMode_LEFT: eCmd = DEL_CELLSLEFT; break; - case sheet::CellDeleteMode_ROWS: eCmd = DEL_DELROWS; break; - case sheet::CellDeleteMode_COLUMNS: eCmd = DEL_DELCOLS; break; + case sheet::CellDeleteMode_NONE: bDo = FALSE; break; + case sheet::CellDeleteMode_UP: eCmd = DEL_CELLSUP; break; + case sheet::CellDeleteMode_LEFT: eCmd = DEL_CELLSLEFT; break; + case sheet::CellDeleteMode_ROWS: eCmd = DEL_DELROWS; break; + case sheet::CellDeleteMode_COLUMNS: eCmd = DEL_DELCOLS; break; default: DBG_ERROR("deleteCells: falscher Mode"); bDo = FALSE; @@ -7303,7 +7303,7 @@ void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& aDestination void ScTableSheetObj::PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ) { - // Umbrueche und Undo + // Umbrueche und Undo ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -7387,7 +7387,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas( } } - PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. + PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. } } @@ -7418,18 +7418,18 @@ void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns if ( bPrintTitleColumns ) { - if ( !pDoc->GetRepeatColRange( nTab ) ) // keinen bestehenden Bereich veraendern + if ( !pDoc->GetRepeatColRange( nTab ) ) // keinen bestehenden Bereich veraendern { - ScRange aNew( 0, 0, nTab, 0, 0, nTab ); // Default - pDoc->SetRepeatColRange( nTab, &aNew ); // einschalten + ScRange aNew( 0, 0, nTab, 0, 0, nTab ); // Default + pDoc->SetRepeatColRange( nTab, &aNew ); // einschalten } } else - pDoc->SetRepeatColRange( nTab, NULL ); // abschalten + pDoc->SetRepeatColRange( nTab, NULL ); // abschalten - PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. + PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. - //! zuletzt gesetzten Bereich beim Abschalten merken und beim Einschalten wiederherstellen ??? + //! zuletzt gesetzten Bereich beim Abschalten merken und beim Einschalten wiederherstellen ??? } } @@ -7466,9 +7466,9 @@ void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& a ScRange aNew; ScUnoConversion::FillScRange( aNew, aTitleColumns ); - pDoc->SetRepeatColRange( nTab, &aNew ); // immer auch einschalten + pDoc->SetRepeatColRange( nTab, &aNew ); // immer auch einschalten - PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. + PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. } } @@ -7499,18 +7499,18 @@ void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows ) if ( bPrintTitleRows ) { - if ( !pDoc->GetRepeatRowRange( nTab ) ) // keinen bestehenden Bereich veraendern + if ( !pDoc->GetRepeatRowRange( nTab ) ) // keinen bestehenden Bereich veraendern { - ScRange aNew( 0, 0, nTab, 0, 0, nTab ); // Default - pDoc->SetRepeatRowRange( nTab, &aNew ); // einschalten + ScRange aNew( 0, 0, nTab, 0, 0, nTab ); // Default + pDoc->SetRepeatRowRange( nTab, &aNew ); // einschalten } } else - pDoc->SetRepeatRowRange( nTab, NULL ); // abschalten + pDoc->SetRepeatRowRange( nTab, NULL ); // abschalten - PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. + PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. - //! zuletzt gesetzten Bereich beim Abschalten merken und beim Einschalten wiederherstellen ??? + //! zuletzt gesetzten Bereich beim Abschalten merken und beim Einschalten wiederherstellen ??? } } @@ -7547,9 +7547,9 @@ void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTit ScRange aNew; ScUnoConversion::FillScRange( aNew, aTitleRows ); - pDoc->SetRepeatRowRange( nTab, &aNew ); // immer auch einschalten + pDoc->SetRepeatRowRange( nTab, &aNew ); // immer auch einschalten - PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. + PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. } } @@ -7576,7 +7576,7 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) { SolarMutexGuard aGuard; - //! Filter und Options aus altem Link suchen + //! Filter und Options aus altem Link suchen rtl::OUString aUrl(getLinkUrl()); rtl::OUString aSheet(getLinkSheetName()); @@ -7600,7 +7600,7 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl ) { SolarMutexGuard aGuard; - //! Filter und Options aus altem Link suchen + //! Filter und Options aus altem Link suchen sheet::SheetLinkMode eMode = getLinkMode(); rtl::OUString aSheet(getLinkSheetName()); @@ -7624,7 +7624,7 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const rtl::OUString& aLinkSheet { SolarMutexGuard aGuard; - //! Filter und Options aus altem Link suchen + //! Filter und Options aus altem Link suchen sheet::SheetLinkMode eMode = getLinkMode(); rtl::OUString aUrl(getLinkUrl()); @@ -7644,17 +7644,17 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - String aFileString (aUrl); + String aFileString (aUrl); String aFilterString (aFilterName); - String aOptString (aFilterOptions); - String aSheetString (aSheetName); + String aOptString (aFilterOptions); + String aSheetString (aSheetName); aFileString = ScGlobal::GetAbsDocName( aFileString, pDocSh ); if ( !aFilterString.Len() ) ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, TRUE, FALSE ); - // remove application prefix from filter name here, so the filter options - // aren't reset when the filter name is changed in ScTableLink::DataChanged + // remove application prefix from filter name here, so the filter options + // aren't reset when the filter name is changed in ScTableLink::DataChanged ScDocumentLoader::RemoveAppPrefix( aFilterString ); BYTE nLinkMode = SC_LINK_NONE; @@ -7666,17 +7666,17 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr ULONG nRefresh = 0; pDoc->SetLink( nTab, nLinkMode, aFileString, aFilterString, aOptString, aSheetString, nRefresh ); - pDocSh->UpdateLinks(); // ggf. Link eintragen oder loeschen + pDocSh->UpdateLinks(); // ggf. Link eintragen oder loeschen SfxBindings* pBindings = pDocSh->GetViewBindings(); if (pBindings) pBindings->Invalidate(SID_LINKS); - //! Undo fuer Link-Daten an der Table + //! Undo fuer Link-Daten an der Table - if ( nLinkMode != SC_LINK_NONE && pDoc->IsExecuteLinkEnabled() ) // Link updaten + if ( nLinkMode != SC_LINK_NONE && pDoc->IsExecuteLinkEnabled() ) // Link updaten { - // Update immer, auch wenn der Link schon da war - //! Update nur fuer die betroffene Tabelle??? + // Update immer, auch wenn der Link schon da war + //! Update nur fuer die betroffene Tabelle??? sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); USHORT nCount = pLinkManager->GetLinks().Count(); @@ -7687,14 +7687,14 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr { ScTableLink* pTabLink = (ScTableLink*)pBase; if ( pTabLink->GetFileName() == aFileString ) - pTabLink->Update(); // inkl. Paint&Undo + pTabLink->Update(); // inkl. Paint&Undo - //! Der Dateiname sollte nur einmal vorkommen (?) + //! Der Dateiname sollte nur einmal vorkommen (?) } } } - //! Notify fuer ScSheetLinkObj Objekte!!! + //! Notify fuer ScSheetLinkObj Objekte!!! } } @@ -7943,7 +7943,7 @@ sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException) if ( pDocSh ) return pDocSh->GetDocument()->IsTabProtected( GetTab_Impl() ); - DBG_ERROR("keine DocShell"); //! Exception oder so? + DBG_ERROR("keine DocShell"); //! Exception oder so? return FALSE; } @@ -8026,7 +8026,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd } } - // Szenario-Ranges sind durch Attribut gekennzeichnet + // Szenario-Ranges sind durch Attribut gekennzeichnet ScPatternAttr aPattern( pDoc->GetPool() ); aPattern.GetItemSet().Put( ScMergeFlagAttr( SC_MF_SCENARIO ) ); aPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) ); @@ -8035,7 +8035,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd } // don't use. We should use therefor a private interface, so we can also set the flags. -/* else if (nTab > 0 && pDoc->IsImportingXML()) // make this sheet as an scenario and only if it is not the first sheet and only if it is ImportingXML, +/* else if (nTab > 0 && pDoc->IsImportingXML()) // make this sheet as an scenario and only if it is not the first sheet and only if it is ImportingXML, // because than no UNDO and repaint is necessary. { USHORT nRangeCount = (USHORT)rScenRanges.getLength(); @@ -8044,7 +8044,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd pDoc->SetScenario( nTab, TRUE ); // default flags - Color aColor( COL_LIGHTGRAY ); // Default + Color aColor( COL_LIGHTGRAY ); // Default USHORT nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY; String aComment; @@ -8088,7 +8088,7 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException) ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); String aName; - pDoc->GetName( nTab, aName ); // Name dieses Szenarios + pDoc->GetName( nTab, aName ); // Name dieses Szenarios SCTAB nDestTab = nTab; while ( nDestTab > 0 && pDoc->IsScenario(nDestTab) ) @@ -8097,7 +8097,7 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException) if ( !pDoc->IsScenario(nDestTab) ) pDocSh->UseScenario( nDestTab, aName ); - //! sonst Fehler oder so + //! sonst Fehler oder so } } @@ -8777,7 +8777,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::Runtim pPtr[nParentLen + 0] = getCppuType((const uno::Reference<container::XNamed>*)0); for (long i=0; i<nParentLen; i++) - pPtr[i] = pParentPtr[i]; // parent types first + pPtr[i] = pParentPtr[i]; // parent types first } return aTypes; } @@ -8803,14 +8803,14 @@ rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) DBG_ASSERT(rRange.aStart.Col() == rRange.aEnd.Col(), "too many columns"); SCCOL nCol = rRange.aStart.Col(); - return ScColToAlpha( nCol ); // from global.hxx + return ScColToAlpha( nCol ); // from global.hxx } void SAL_CALL ScTableColumnObj::setName( const rtl::OUString& /* aNewName */ ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; - throw uno::RuntimeException(); // read-only + throw uno::RuntimeException(); // read-only } // XPropertySet erweitert fuer Spalten-Properties @@ -8831,16 +8831,16 @@ void ScTableColumnObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE { if ( IsScItemWid( pEntry->nWID ) ) { - // for Item WIDs, call ScCellRangesBase directly + // for Item WIDs, call ScCellRangesBase directly ScCellRangesBase::SetOnePropertyValue(pEntry, aValue); return; } - // own properties + // own properties ScDocShell* pDocSh = GetDocShell(); if (!pDocSh) - return; //! Exception oder so? + return; //! Exception oder so? const ScRange& rRange = GetRange(); DBG_ASSERT(rRange.aStart.Col() == rRange.aEnd.Col(), "zuviele Spalten"); SCCOL nCol = rRange.aStart.Col(); @@ -8855,7 +8855,7 @@ void ScTableColumnObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE sal_Int32 nNewWidth = 0; if ( aValue >>= nNewWidth ) { - // property is 1/100mm, column width is twips + // property is 1/100mm, column width is twips nNewWidth = HMMToTwips(nNewWidth); aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, SC_SIZE_ORIGINAL, (USHORT)nNewWidth, TRUE, TRUE ); @@ -8866,7 +8866,7 @@ void ScTableColumnObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue ); ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT; aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, eMode, 0, TRUE, TRUE ); - // SC_SIZE_DIRECT mit Groesse 0 blendet aus + // SC_SIZE_DIRECT mit Groesse 0 blendet aus } else if ( pEntry->nWID == SC_WID_UNO_OWIDTH ) { @@ -8909,7 +8909,7 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE { // for hidden column, return original height USHORT nWidth = pDoc->GetOriginalWidth( nCol, nTab ); - // property is 1/100mm, column width is twips + // property is 1/100mm, column width is twips nWidth = (USHORT) TwipsToHMM(nWidth); rAny <<= (sal_Int32)( nWidth ); } @@ -8921,7 +8921,7 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE } else if ( pEntry->nWID == SC_WID_UNO_OWIDTH ) { - //! momentan immer gesetzt ??!?! + //! momentan immer gesetzt ??!?! BOOL bOpt = !(pDoc->GetColFlags( nCol, nTab ) & CR_MANUALSIZE); ScUnoHelpFunctions::SetBoolInAny( rAny, bOpt ); } @@ -8975,16 +8975,16 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr { if ( IsScItemWid( pEntry->nWID ) ) { - // for Item WIDs, call ScCellRangesBase directly + // for Item WIDs, call ScCellRangesBase directly ScCellRangesBase::SetOnePropertyValue(pEntry, aValue); return; } - // own properties + // own properties ScDocShell* pDocSh = GetDocShell(); if (!pDocSh) - return; //! Exception oder so? + return; //! Exception oder so? ScDocument* pDoc = pDocSh->GetDocument(); const ScRange& rRange = GetRange(); DBG_ASSERT(rRange.aStart.Row() == rRange.aEnd.Row(), "zuviele Zeilen"); @@ -9000,7 +9000,7 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr sal_Int32 nNewHeight = 0; if ( aValue >>= nNewHeight ) { - // property is 1/100mm, row height is twips + // property is 1/100mm, row height is twips nNewHeight = HMMToTwips(nNewHeight); aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_ORIGINAL, (USHORT)nNewHeight, TRUE, TRUE ); @@ -9011,14 +9011,14 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue ); ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT; aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE ); - // SC_SIZE_DIRECT mit Groesse 0 blendet aus + // SC_SIZE_DIRECT mit Groesse 0 blendet aus } else if ( pEntry->nWID == SC_WID_UNO_CELLFILT ) { BOOL bFil = ScUnoHelpFunctions::GetBoolFromAny( aValue ); -// ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT; -// aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE ); - // SC_SIZE_DIRECT mit Groesse 0 blendet aus +// ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT; +// aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE ); + // SC_SIZE_DIRECT mit Groesse 0 blendet aus pDoc->SetRowFiltered(nRow, nRow, nTab, bFil); } else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT ) @@ -9028,7 +9028,7 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_OPTIMAL, 0, TRUE, TRUE ); else { - // set current height again manually + // set current height again manually USHORT nHeight = pDoc->GetOriginalHeight( nRow, nTab ); aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_ORIGINAL, nHeight, TRUE, TRUE ); } @@ -9065,7 +9065,7 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr { // for hidden row, return original height USHORT nHeight = pDoc->GetOriginalHeight( nRow, nTab ); - // property is 1/100mm, row height is twips + // property is 1/100mm, row height is twips nHeight = (USHORT) TwipsToHMM(nHeight); rAny <<= (sal_Int32)( nHeight ); } @@ -9131,7 +9131,7 @@ void ScCellsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -9158,7 +9158,7 @@ sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException) BOOL bHas = FALSE; if ( pDocShell ) { - //! schneller selber testen? + //! schneller selber testen? uno::Reference<container::XEnumeration> xEnum(new ScCellsEnumeration( pDocShell, aRanges )); bHas = xEnum->hasMoreElements(); @@ -9186,7 +9186,7 @@ ScCellsEnumeration::ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR if (pFirst) nTab = pFirst->aStart.Tab(); aPos = ScAddress(0,0,nTab); - CheckPos_Impl(); // aPos auf erste passende Zelle setzen + CheckPos_Impl(); // aPos auf erste passende Zelle setzen } } @@ -9203,7 +9203,7 @@ void ScCellsEnumeration::CheckPos_Impl() { pMark = new ScMarkData; pMark->MarkFromRangeList( aRanges, FALSE ); - pMark->MarkToMulti(); // needed for GetNextMarkedCell + pMark->MarkToMulti(); // needed for GetNextMarkedCell } bFound = pMark->IsCellMarked( aPos.Col(), aPos.Row() ); } @@ -9226,7 +9226,7 @@ void ScCellsEnumeration::Advance_Impl() { pMark = new ScMarkData; pMark->MarkFromRangeList( aRanges, FALSE ); - pMark->MarkToMulti(); // needed for GetNextMarkedCell + pMark->MarkToMulti(); // needed for GetNextMarkedCell } SCCOL nCol = aPos.Col(); @@ -9236,7 +9236,7 @@ void ScCellsEnumeration::Advance_Impl() if (bFound) aPos.Set( nCol, nRow, nTab ); else - bAtEnd = TRUE; // kommt nix mehr + bAtEnd = TRUE; // kommt nix mehr } void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) @@ -9249,10 +9249,10 @@ void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) aRanges.UpdateReference( rRef.GetMode(), pDocShell->GetDocument(), rRef.GetRange(), rRef.GetDx(), rRef.GetDy(), rRef.GetDz() ); - delete pMark; // aus verschobenen Bereichen neu erzeugen + delete pMark; // aus verschobenen Bereichen neu erzeugen pMark = NULL; - if (!bAtEnd) // aPos anpassen + if (!bAtEnd) // aPos anpassen { ScRangeList aNew; aNew.Append(ScRange(aPos)); @@ -9269,7 +9269,7 @@ void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -9294,7 +9294,7 @@ uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchEleme return uno::makeAny(uno::Reference<table::XCell>(new ScCellObj( pDocShell, aTempPos ))); } - throw container::NoSuchElementException(); // no more elements + throw container::NoSuchElementException(); // no more elements // return uno::Any(); } @@ -9320,18 +9320,18 @@ void ScCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA( ScUpdateRefHint ) ) { - //! aTotalRange... + //! aTotalRange... } else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } ScCellRangeObj* ScCellFormatsObj::GetObjectByIndex_Impl(long nIndex) const { - //! direkt auf die AttrArrays zugreifen !!!! + //! direkt auf die AttrArrays zugreifen !!!! ScCellRangeObj* pRet = NULL; if (pDocShell) @@ -9367,7 +9367,7 @@ sal_Int32 SAL_CALL ScCellFormatsObj::getCount() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - //! direkt auf die AttrArrays zugreifen !!!! + //! direkt auf die AttrArrays zugreifen !!!! long nCount = 0; if (pDocShell) @@ -9407,7 +9407,7 @@ uno::Type SAL_CALL ScCellFormatsObj::getElementType() throw(uno::RuntimeExceptio sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return ( getCount() != 0 ); //! immer groesser 0 ?? + return ( getCount() != 0 ); //! immer groesser 0 ?? } // XEnumerationAccess @@ -9457,7 +9457,7 @@ void ScCellFormatsEnumeration::Advance_Impl() { if ( bDirty ) { - pIter->DataChanged(); // AttrArray-Index neu suchen + pIter->DataChanged(); // AttrArray-Index neu suchen bDirty = FALSE; } @@ -9466,10 +9466,10 @@ void ScCellFormatsEnumeration::Advance_Impl() if ( pIter->GetNext( nCol1, nCol2, nRow1, nRow2 ) ) aNext = ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ); else - bAtEnd = TRUE; // kommt nix mehr + bAtEnd = TRUE; // kommt nix mehr } else - bAtEnd = TRUE; // Dok weggekommen oder so + bAtEnd = TRUE; // Dok weggekommen oder so } ScCellRangeObj* ScCellFormatsEnumeration::NextObject_Impl() @@ -9490,20 +9490,20 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA( ScUpdateRefHint ) ) { - //! und nun ??? + //! und nun ??? } else if ( rHint.ISA( SfxSimpleHint ) ) { ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden delete pIter; pIter = NULL; } else if ( nId == SFX_HINT_DATACHANGED ) { - bDirty = TRUE; // AttrArray-Index evtl. ungueltig geworden + bDirty = TRUE; // AttrArray-Index evtl. ungueltig geworden } } } @@ -9522,7 +9522,7 @@ uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuc SolarMutexGuard aGuard; if ( bAtEnd || !pDocShell ) - throw container::NoSuchElementException(); // no more elements + throw container::NoSuchElementException(); // no more elements // Interface-Typ muss zu ScCellFormatsObj::getElementType passen @@ -9553,13 +9553,13 @@ void ScUniqueCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA( ScUpdateRefHint ) ) { - //! aTotalRange... + //! aTotalRange... } else if ( rHint.ISA( SfxSimpleHint ) ) { ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -9820,13 +9820,13 @@ void ScUniqueCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHi { if ( rHint.ISA( ScUpdateRefHint ) ) { - //! und nun ??? + //! und nun ??? } else if ( rHint.ISA( SfxSimpleHint ) ) { ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -9844,7 +9844,7 @@ uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement() throw(container: SolarMutexGuard aGuard; if ( !hasMoreElements() || !pDocShell ) - throw container::NoSuchElementException(); // no more elements + throw container::NoSuchElementException(); // no more elements // Interface-Typ muss zu ScCellFormatsObj::getElementType passen diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 9e3cae0756c1..8301557757ba 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -209,7 +209,7 @@ namespace calc return aTypes; } - + //-------------------------------------------------------------------- sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException) { @@ -227,7 +227,7 @@ namespace calc return sal_False; } - + //-------------------------------------------------------------------- Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException) { @@ -314,7 +314,7 @@ namespace calc } return aReturn; } - + //-------------------------------------------------------------------- void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException) { @@ -485,7 +485,7 @@ namespace calc return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellValueBinding" ) ); } - + //-------------------------------------------------------------------- sal_Bool SAL_CALL OCellValueBinding::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) { @@ -500,7 +500,7 @@ namespace calc return sal_False; } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException) { @@ -520,7 +520,7 @@ namespace calc if ( _rxListener.is() ) m_aModifyListeners.addInterface( _rxListener ); } - + //-------------------------------------------------------------------- void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException) { diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 85334cd33c3b..012c11ece7e5 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 227869efe48e..b228cee7897a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap() { static SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} }; return aDataProviderPropertyMap_Impl; @@ -102,9 +102,9 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() { static SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_HIDDENVALUES), 0, &getCppuType((uno::Sequence<sal_Int32>*)0 ), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ROLE), 0, &getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HIDDENVALUES), 0, &getCppuType((uno::Sequence<sal_Int32>*)0 ), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ROLE), 0, &getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} }; return aDataSequencePropertyMap_Impl; @@ -188,7 +188,7 @@ struct TokenTable { ::std::for_each(maTokens.begin(), maTokens.end(), DeleteInstance()); } - + void push_back( FormulaToken* pToken ) { maTokens.push_back( pToken ); @@ -834,7 +834,7 @@ void Chart2Positioner::createPositionMap() // ============================================================================ -/** +/** * Function object to create a range string from a token list. */ class Tokens2RangeString : public unary_function<ScSharedTokenRef, void> @@ -851,7 +851,7 @@ public: Tokens2RangeString(const Tokens2RangeString& r) : mpRangeStr(r.mpRangeStr), - mpDoc(r.mpDoc), + mpDoc(r.mpDoc), meGrammar(r.meGrammar), mcRangeSep(r.mcRangeSep), mbFirst(r.mbFirst) @@ -887,12 +887,12 @@ private: bool mbFirst; }; -/** +/** * Function object to convert a list of tokens into a string form suitable * for ODF export. In ODF, a range is expressed as - * + * * (start cell address):(end cell address) - * + * * and each address doesn't include any '$' symbols. */ class Tokens2RangeStringXML : public unary_function<ScSharedTokenRef, void> @@ -1076,13 +1076,13 @@ ScChart2LabeledDataSequence* lcl_createScChart2DataSequenceFromTokens( auto_ptr< } //---------------------------------------------------- -/** - * Check the current list of reference tokens, and add the upper left - * corner of the minimum range that encloses all ranges if certain - * conditions are met. +/** + * Check the current list of reference tokens, and add the upper left + * corner of the minimum range that encloses all ranges if certain + * conditions are met. * * @param rRefTokens list of reference tokens - * + * * @return true if the corner was added, false otherwise. */ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, @@ -1200,7 +1200,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, break; case svExternalSingleRef: { - if (!bExternal) + if (!bExternal) return false; if (nFileId != pToken->GetIndex() || aExtTabName != pToken->GetString()) @@ -1216,7 +1216,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, break; case svExternalDoubleRef: { - if (!bExternal) + if (!bExternal) return false; if (nFileId != pToken->GetIndex() || aExtTabName != pToken->GetString()) @@ -1240,7 +1240,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, } } - if (nMinRow >= nMaxRow || nMinCol >= nMaxCol || + if (nMinRow >= nMaxRow || nMinCol >= nMaxCol || nMinRow >= MAXROWCOUNT || nMinCol >= MAXCOLCOUNT || nMaxRow >= MAXROWCOUNT || nMaxCol >= MAXCOLCOUNT) { @@ -1249,7 +1249,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, } // Check if the following conditions are met: - // + // // 1) The upper-left corner cell is not included. // 2) The three adjacent cells of that corner cell are included. @@ -1354,7 +1354,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, ScRefTokenHelper::join(rRefTokens, pCorner); } } - + return true; } @@ -1509,7 +1509,7 @@ ScChart2DataProvider::createDataSource( namespace { -/** +/** * Function object to create a list of table numbers from a token list. */ class InsertTabNumber : public unary_function<ScSharedTokenRef, void> @@ -1587,7 +1587,7 @@ void RangeAnalyzer::initRangeAnalyzer( const vector<ScSharedTokenRef>& rTokens ) return; } mbEmpty=false; - + vector<ScSharedTokenRef>::const_iterator itr = rTokens.begin(), itrEnd = rTokens.end(); for (; itr != itrEnd ; ++itr) { @@ -1654,7 +1654,7 @@ void RangeAnalyzer::analyzeRange( sal_Int32& rnDataInRows, bool RangeAnalyzer::inSameSingleRow( RangeAnalyzer& rOther ) { - if( mnStartRow==rOther.mnStartRow && + if( mnStartRow==rOther.mnStartRow && mnRowCount==1 && rOther.mnRowCount==1 ) return true; return false; @@ -1662,13 +1662,13 @@ bool RangeAnalyzer::inSameSingleRow( RangeAnalyzer& rOther ) bool RangeAnalyzer::inSameSingleColumn( RangeAnalyzer& rOther ) { - if( mnStartColumn==rOther.mnStartColumn && + if( mnStartColumn==rOther.mnStartColumn && mnColumnCount==1 && rOther.mnColumnCount==1 ) return true; return false; } -} //end anonymous namespace +} //end anonymous namespace uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArguments( const uno::Reference< chart2::data::XDataSource >& xDataSource ) @@ -1683,7 +1683,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum bool bHasCategoriesLabels = false; vector<ScSharedTokenRef> aAllCategoriesValuesTokens; vector<ScSharedTokenRef> aAllSeriesLabelTokens; - + chart::ChartDataRowSource eRowSource = chart::ChartDataRowSource_COLUMNS; vector<ScSharedTokenRef> aAllTokens; @@ -1698,7 +1698,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum sal_Int32 nDataInRows = 0; sal_Int32 nDataInCols = 0; bool bRowSourceAmbiguous = false; - + Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences( xDataSource->getDataSequences()); const sal_Int32 nCount( aSequences.getLength()); RangeAnalyzer aPrevLabel,aPrevValues; @@ -1785,7 +1785,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum aPrevLabel=aLabel; } } - + if (!bRowSourceAmbiguous) { bRowSourceDetected = true; @@ -1965,7 +1965,7 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL if(!m_pDocument || (aRangeRepresentation.getLength() == 0)) return xResult; - // Note: the range representation must be in Calc A1 format. The import + // Note: the range representation must be in Calc A1 format. The import // filters use this method to pass data ranges, and they have no idea what // the current formula syntax is. In the future we should add another // method to allow the client code to directly pass tokens representing @@ -2037,7 +2037,7 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS { // #i74062# When loading flat XML, this is called before the referenced sheets are in the document, // so the conversion has to take place directly with the strings, without looking up the sheets. - + rtl::OUStringBuffer sRet; sal_Int32 nOffset = 0; while( nOffset >= 0 ) @@ -2047,23 +2047,23 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS if( nOffset >= 0 ) { // convert one address (remove dots) - + String aUIString(sToken); - + sal_Int32 nIndex = ScRangeStringConverter::IndexOf( sToken, ':', 0, cQuote ); if ( nIndex >= 0 && nIndex < aUIString.Len() - 1 && aUIString.GetChar((xub_StrLen)nIndex + 1) == (sal_Unicode) '.' ) aUIString.Erase( (xub_StrLen)nIndex + 1, 1 ); - + if ( aUIString.GetChar(0) == (sal_Unicode) '.' ) aUIString.Erase( 0, 1 ); - + if( sRet.getLength() ) sRet.append( (sal_Unicode) ';' ); sRet.append( aUIString ); } } - + return sRet.makeStringAndClear(); } @@ -2407,7 +2407,7 @@ void ScChart2DataSequence::HiddenRangeListener::notify() } ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, - const uno::Reference < chart2::data::XDataProvider >& xDP, + const uno::Reference < chart2::data::XDataProvider >& xDP, vector<ScSharedTokenRef>* pTokens, bool bIncludeHiddenCells ) : m_bIncludeHiddenCells( bIncludeHiddenCells) @@ -2434,8 +2434,8 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, // Reuse ScChartListener? // BM: don't use names of named ranges but the UI range strings -// String aStr; -// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); +// String aStr; +// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); // m_aIdentifier = ::rtl::OUString( aStr ); // m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_"); @@ -2509,7 +2509,7 @@ void ScChart2DataSequence::BuildDataCache() ::std::list<sal_Int32> aHiddenValues; sal_Int32 nDataCount = 0; sal_Int32 nHiddenValueCount = 0; - + for (vector<ScSharedTokenRef>::const_iterator itr = m_pTokens->begin(), itrEnd = m_pTokens->end(); itr != itrEnd; ++itr) { @@ -2547,21 +2547,21 @@ void ScChart2DataSequence::BuildDataCache() m_aDataArray.push_back(Item()); Item& rItem = m_aDataArray.back(); ++nDataCount; - + ScAddress aAdr(nCol, nRow, nTab); ScBaseCell* pCell = m_pDocument->GetCell(aAdr); if (!pCell) continue; - + if (pCell->HasStringData()) rItem.maString = pCell->GetStringData(); else - { + { String aStr; m_pDocument->GetString(nCol, nRow, nTab, aStr); rItem.maString = aStr; } - + switch (pCell->GetCellType()) { case CELLTYPE_VALUE: @@ -2574,7 +2574,7 @@ void ScChart2DataSequence::BuildDataCache() USHORT nErr = pFCell->GetErrCode(); if (nErr) break; - + if (pFCell->HasValueData()) { rItem.mfValue = pFCell->GetValue(); @@ -2644,14 +2644,14 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScSharedTokenRef& sal_Int32 nDataCount = 0; for (FormulaToken* p = pArray->First(); p; p = pArray->Next()) { - // Cached external range is always represented as a single + // Cached external range is always represented as a single // matrix token, although that might change in the future when // we introduce a new token type to store multi-table range // data. if (p->GetType() != svMatrix) { - DBG_ERROR("Cached array is not a matrix token."); + DBG_ERROR("Cached array is not a matrix token."); continue; } @@ -2798,7 +2798,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint // delayed broadcast as in ScCellRangesBase if ( m_bGotDataChangedHint && m_pDocument ) - { + { m_aDataArray.clear(); lang::EventObject aEvent; aEvent.Source.set((cppu::OWeakObject*)this); @@ -2841,7 +2841,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint } } - DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()), + DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()), "range list and range index list have different sizes."); auto_ptr<ScRangeList> pUndoRanges; @@ -2854,7 +2854,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint if (bChanged) { - DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()), + DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()), "range list and range index list have different sizes after the reference update."); // Bring the change back from the range list to the token list. @@ -2890,7 +2890,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint DBG_ERROR("range count and range index count differ."); break; } - + UpdateTokensFromRanges(rRanges); } while (false); @@ -3052,7 +3052,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) namespace { -/** +/** * This function object is used to accumulatively count the numbers of * columns and rows in all reference tokens. */ @@ -3082,7 +3082,7 @@ private: SCROW mnRows; }; -/** +/** * This function object is used to generate label strings from a list of * reference tokens. */ @@ -3090,14 +3090,14 @@ class GenerateLabelStrings : public unary_function<ScSharedTokenRef, void> { public: GenerateLabelStrings(sal_Int32 nSize, chart2::data::LabelOrigin eOrigin, bool bColumn) : - mpLabels(new Sequence<OUString>(nSize)), - meOrigin(eOrigin), - mnCount(0), + mpLabels(new Sequence<OUString>(nSize)), + meOrigin(eOrigin), + mnCount(0), mbColumn(bColumn) {} GenerateLabelStrings(const GenerateLabelStrings& r) : - mpLabels(r.mpLabels), - meOrigin(r.meOrigin), + mpLabels(r.mpLabels), + meOrigin(r.meOrigin), mnCount(r.mnCount), mbColumn(r.mbColumn) {} @@ -3348,7 +3348,7 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti } } - acquire(); // don't lose this object (one ref for all listeners) + acquire(); // don't lose this object (one ref for all listeners) } } @@ -3361,7 +3361,7 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< if (!m_pTokens.get() || m_pTokens->empty()) return; - acquire(); // in case the listeners have the last ref - released below + acquire(); // in case the listeners have the last ref - released below USHORT nCount = m_aValueListeners.Count(); for ( USHORT n=nCount; n--; ) @@ -3383,14 +3383,14 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< pCLC->EndListeningHiddenRange(m_pHiddenListener.get()); } - release(); // release the ref for the listeners + release(); // release the ref for the listeners } break; } } - release(); // might delete this object + release(); // might delete this object } // DataSequence XPropertySet ------------------------------------------------- @@ -3443,7 +3443,7 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue( aRet <<= m_bIncludeHiddenCells; else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SC_UNONAME_HIDDENVALUES))) { - // This property is read-only thus cannot be set externally via + // This property is read-only thus cannot be set externally via // setPropertyValue(...). BuildDataCache(); aRet <<= m_aHiddenValues; @@ -3510,42 +3510,42 @@ void ScChart2DataSequence::setDataChangedHint(bool b) // XUnoTunnel // sal_Int64 SAL_CALL ScChart2DataSequence::getSomething( -// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) +// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) // { -// if ( rId.getLength() == 16 && +// if ( rId.getLength() == 16 && // 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), -// rId.getConstArray(), 16 ) ) -// { -// return (sal_Int64)this; -// } -// return 0; +// rId.getConstArray(), 16 ) ) +// { +// return (sal_Int64)this; +// } +// return 0; // } // // static // const uno::Sequence<sal_Int8>& ScChart2DataSequence::getUnoTunnelId() // { -// static uno::Sequence<sal_Int8> * pSeq = 0; -// if( !pSeq ) -// { -// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); -// if( !pSeq ) -// { -// static uno::Sequence< sal_Int8 > aSeq( 16 ); -// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); -// pSeq = &aSeq; -// } -// } -// return *pSeq; +// static uno::Sequence<sal_Int8> * pSeq = 0; +// if( !pSeq ) +// { +// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); +// if( !pSeq ) +// { +// static uno::Sequence< sal_Int8 > aSeq( 16 ); +// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); +// pSeq = &aSeq; +// } +// } +// return *pSeq; // } // // static // ScChart2DataSequence* ScChart2DataSequence::getImplementation( const uno::Reference<uno::XInterface> xObj ) // { -// ScChart2DataSequence* pRet = NULL; -// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); -// if (xUT.is()) -// pRet = (ScChart2DataSequence*) xUT->getSomething( getUnoTunnelId() ); -// return pRet; +// ScChart2DataSequence* pRet = NULL; +// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); +// if (xUT.is()) +// pRet = (ScChart2DataSequence*) xUT->getSomething( getUnoTunnelId() ); +// return pRet; // } #if USE_CHART2_EMPTYDATASEQUENCE @@ -3568,8 +3568,8 @@ ScChart2EmptyDataSequence::ScChart2EmptyDataSequence( ScDocument* pDoc, // Reuse ScChartListener? // BM: don't use names of named ranges but the UI range strings -// String aStr; -// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); +// String aStr; +// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); // m_aIdentifier = ::rtl::OUString( aStr ); // m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_"); @@ -3656,7 +3656,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::getTextualDat throw ( uno::RuntimeException) { SolarMutexGuard aGuard; - String aStr; + String aStr; DBG_ASSERT( m_pDocument, "No Document -> no SourceRangeRepresentation" ); if( m_pDocument ) m_xRanges->Format( aStr, SCR_ABS_3D, m_pDocument, m_pDocument->GetAddressConvention() ); @@ -3823,42 +3823,42 @@ void SAL_CALL ScChart2EmptyDataSequence::removeVetoableChangeListener( // XUnoTunnel // sal_Int64 SAL_CALL ScChart2EmptyDataSequence::getSomething( -// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) +// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) // { -// if ( rId.getLength() == 16 && +// if ( rId.getLength() == 16 && // 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), -// rId.getConstArray(), 16 ) ) -// { -// return (sal_Int64)this; -// } -// return 0; +// rId.getConstArray(), 16 ) ) +// { +// return (sal_Int64)this; +// } +// return 0; // } // // static // const uno::Sequence<sal_Int8>& ScChart2EmptyDataSequence::getUnoTunnelId() // { -// static uno::Sequence<sal_Int8> * pSeq = 0; -// if( !pSeq ) -// { -// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); -// if( !pSeq ) -// { -// static uno::Sequence< sal_Int8 > aSeq( 16 ); -// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); -// pSeq = &aSeq; -// } -// } -// return *pSeq; +// static uno::Sequence<sal_Int8> * pSeq = 0; +// if( !pSeq ) +// { +// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); +// if( !pSeq ) +// { +// static uno::Sequence< sal_Int8 > aSeq( 16 ); +// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); +// pSeq = &aSeq; +// } +// } +// return *pSeq; // } // // static // ScChart2DataSequence* ScChart2EmptyDataSequence::getImplementation( const uno::Reference<uno::XInterface> xObj ) // { -// ScChart2DataSequence* pRet = NULL; -// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); -// if (xUT.is()) -// pRet = (ScChart2EmptyDataSequence*) xUT->getSomething( getUnoTunnelId() ); -// return pRet; +// ScChart2DataSequence* pRet = NULL; +// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); +// if (xUT.is()) +// pRet = (ScChart2EmptyDataSequence*) xUT->getSomething( getUnoTunnelId() ); +// return pRet; // } #endif diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 0212ea15dff3..f5e7db756f4d 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,12 +120,12 @@ ScChartsObj::~ScChartsObj() void ScChartsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! Referenz-Update + //! Referenz-Update if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -154,7 +154,7 @@ ScChartObj* ScChartsObj::GetObjectByIndex_Impl(long nIndex) const uno::Reference < embed::XEmbeddedObject > xObj = ((SdrOle2Obj*)pObject)->GetObjRef(); if ( xObj.is() ) aName = pDocShell->GetEmbeddedObjectContainer().GetEmbeddedObjectName( xObj ); - break; // nicht weitersuchen + break; // nicht weitersuchen } ++nPos; } @@ -196,14 +196,14 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, if (!pPage || !pDoc) return; - // chart can't be inserted if any ole object with that name exists on any table - // (empty string: generate valid name) + // chart can't be inserted if any ole object with that name exists on any table + // (empty string: generate valid name) String aNameString(aName); SCTAB nDummy; if ( aNameString.Len() && pModel->GetNamedObject( aNameString, OBJ_OLE2, nDummy ) ) { - // object exists - only RuntimeException is specified + // object exists - only RuntimeException is specified throw uno::RuntimeException(); } @@ -229,13 +229,13 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, { String aObjName = aTmp; // wirklich eingefuegter Name... - // Rechteck anpassen - //! Fehler/Exception, wenn leer/ungueltig ??? + // Rechteck anpassen + //! Fehler/Exception, wenn leer/ungueltig ??? Point aRectPos( aRect.X, aRect.Y ); if (aRectPos.X() < 0) aRectPos.X() = 0; if (aRectPos.Y() < 0) aRectPos.Y() = 0; Size aRectSize( aRect.Width, aRect.Height ); - if (aRectSize.Width() <= 0) aRectSize.Width() = 5000; // Default-Groesse + if (aRectSize.Width() <= 0) aRectSize.Width() = 5000; // Default-Groesse if (aRectSize.Height() <= 0) aRectSize.Height() = 5000; Rectangle aInsRect( aRectPos, aRectSize ); @@ -298,7 +298,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, xObj->setVisualAreaSize( nAspect, aSz ); pPage->InsertObject( pObj ); - pModel->AddUndo( new SdrUndoInsertObj( *pObj ) ); //! Undo-Kommentar? + pModel->AddUndo( new SdrUndoInsertObj( *pObj ) ); //! Undo-Kommentar? // Dies veranlaesst Chart zum sofortigen Update //SvData aEmpty; @@ -315,13 +315,13 @@ void SAL_CALL ScChartsObj::removeByName( const rtl::OUString& aName ) if (pObj) { ScDocument* pDoc = pDocShell->GetDocument(); - ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0 + ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0 SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab)); // ist nicht 0 - pModel->AddUndo( new SdrUndoRemoveObj( *pObj ) ); //! Undo-Kommentar? + pModel->AddUndo( new SdrUndoRemoveObj( *pObj ) ); //! Undo-Kommentar? pPage->RemoveObject( pObj->GetOrdNum() ); - //! Notify etc.??? + //! Notify etc.??? } } @@ -479,12 +479,12 @@ ScChartObj::~ScChartObj() void ScChartObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! Referenz-Update + //! Referenz-Update if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -734,11 +734,11 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(un { ScRange aRange(*xRanges->GetObject(i)); - aRangeAddress.Sheet = aRange.aStart.Tab(); + aRangeAddress.Sheet = aRange.aStart.Tab(); aRangeAddress.StartColumn = aRange.aStart.Col(); - aRangeAddress.StartRow = aRange.aStart.Row(); - aRangeAddress.EndColumn = aRange.aEnd.Col(); - aRangeAddress.EndRow = aRange.aEnd.Row(); + aRangeAddress.StartRow = aRange.aStart.Row(); + aRangeAddress.EndColumn = aRange.aEnd.Col(); + aRangeAddress.EndRow = aRange.aEnd.Row(); pAry[i] = aRangeAddress; } @@ -801,7 +801,7 @@ rtl::OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException) void SAL_CALL ScChartObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; - throw uno::RuntimeException(); // name cannot be changed + throw uno::RuntimeException(); // name cannot be changed } // XPropertySet diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index a00d65061007..a9021c102955 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ using namespace com::sun::star; -#define SCCOMPSCPREADSHEETSETTINGS_SERVICE "com.sun.star.comp.SpreadsheetSettings" -#define SCDOCUMENTSETTINGS_SERVICE "com.sun.star.document.Settings" -#define SCSAVEVERSION "SaveVersionOnClose" +#define SCCOMPSCPREADSHEETSETTINGS_SERVICE "com.sun.star.comp.SpreadsheetSettings" +#define SCDOCUMENTSETTINGS_SERVICE "com.sun.star.document.Settings" +#define SCSAVEVERSION "SaveVersionOnClose" const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() @@ -112,12 +112,12 @@ ScDocumentConfiguration::~ScDocumentConfiguration() void ScDocumentConfiguration::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -239,7 +239,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( } else if ( aPropertyName.compareToAscii( SC_UNO_FORBIDDEN ) == 0 ) { - // read-only - should not be set + // read-only - should not be set } else if ( aPropertyName.compareToAscii( SC_UNO_CHARCOMP ) == 0 ) { @@ -283,7 +283,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( { uno::Sequence< beans::PropertyValue > aInfo; if ( !( aValue >>= aInfo ) ) - throw lang::IllegalArgumentException( + throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value of type Sequence<PropertyValue> expected!" ) ), uno::Reference< uno::XInterface >(), 2 ); @@ -318,7 +318,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( if ( bUpdateHeights && !pDoc->IsImportingXML() ) { - // update automatic row heights and repaint + // update automatic row heights and repaint SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) if ( !pDocShell->AdjustRowHeight( 0, MAXROW, nTab ) ) diff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxx index 7781ecf6ac4a..eca685afa290 100644 --- a/sc/source/ui/unoobj/convuno.cxx +++ b/sc/source/ui/unoobj/convuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,17 +41,17 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -// everything is static... +// everything is static... LanguageType ScUnoConversion::GetLanguage( const lang::Locale& rLocale ) { - // empty language -> LANGUAGE_SYSTEM + // empty language -> LANGUAGE_SYSTEM if ( rLocale.Language.getLength() == 0 ) return LANGUAGE_SYSTEM; LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale ); if ( eRet == LANGUAGE_NONE ) - eRet = LANGUAGE_SYSTEM; //! or throw an exception? + eRet = LANGUAGE_SYSTEM; //! or throw an exception? return eRet; } diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index 4685a4137c15..dd37d32040d8 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -#define SCSHEETCELLCURSOR_SERVICE "com.sun.star.sheet.SheetCellCursor" -#define SCCELLCURSOR_SERVICE "com.sun.star.table.CellCursor" +#define SCSHEETCELLCURSOR_SERVICE "com.sun.star.sheet.SheetCellCursor" +#define SCCELLCURSOR_SERVICE "com.sun.star.table.CellCursor" //------------------------------------------------------------------------ @@ -98,7 +98,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::Runtime pPtr[nParentLen + 2] = getCppuType((const uno::Reference<table::XCellCursor>*)0); for (long i=0; i<nParentLen; i++) - pPtr[i] = pParentPtr[i]; // parent types first + pPtr[i] = pParentPtr[i]; // parent types first } return aTypes; } @@ -149,7 +149,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray() throw(uno::RuntimeExcept ScRange aOneRange(*rRanges.GetObject(0)); aOneRange.Justify(); - ScAddress aCursor(aOneRange.aStart); // use the start address of the range + ScAddress aCursor(aOneRange.aStart); // use the start address of the range ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -169,7 +169,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray() throw(uno::RuntimeExcept /*if (!bFound) { DBG_ERROR("keine Matrix"); - //! Exception, oder was? + //! Exception, oder was? }*/ } @@ -185,7 +185,7 @@ void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeExceptio ScDocument* pDoc = pDocSh->GetDocument(); pDoc->ExtendOverlapped( aNewRange ); - pDoc->ExtendMerge( aNewRange ); // after ExtendOverlapped! + pDoc->ExtendMerge( aNewRange ); // after ExtendOverlapped! SetNewRange( aNewRange ); } @@ -224,7 +224,7 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo if ( nColumns <= 0 || nRows <= 0 ) { DBG_ERROR("leerer Range geht nicht"); - //! und dann? + //! und dann? } else { @@ -232,20 +232,20 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aNewRange(*rRanges.GetObject(0)); - aNewRange.Justify(); //! wirklich? + aNewRange.Justify(); //! wirklich? long nEndX = aNewRange.aStart.Col() + nColumns - 1; long nEndY = aNewRange.aStart.Row() + nRows - 1; - if ( nEndX < 0 ) nEndX = 0; + if ( nEndX < 0 ) nEndX = 0; if ( nEndX > MAXCOL ) nEndX = MAXCOL; - if ( nEndY < 0 ) nEndY = 0; + if ( nEndY < 0 ) nEndY = 0; if ( nEndY > MAXROW ) nEndY = MAXROW; - //! Fehler/Exception oder so, wenn zu gross/zu klein? + //! Fehler/Exception oder so, wenn zu gross/zu klein? aNewRange.aEnd.SetCol((SCCOL)nEndX); aNewRange.aEnd.SetRow((SCROW)nEndY); - aNewRange.Justify(); //! wirklich? + aNewRange.Justify(); //! wirklich? SetNewRange( aNewRange ); } @@ -265,7 +265,7 @@ void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea( sal_Bool bExpand ) ScRange aNewRange(*rRanges.GetObject(0)); SCTAB nTab = aNewRange.aStart.Tab(); - SCCOL nUsedX = 0; // Anfang holen + SCCOL nUsedX = 0; // Anfang holen SCROW nUsedY = 0; if (!pDocSh->GetDocument()->GetDataStart( nTab, nUsedX, nUsedY )) { @@ -293,7 +293,7 @@ void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand ) ScRange aNewRange(*rRanges.GetObject(0)); SCTAB nTab = aNewRange.aStart.Tab(); - SCCOL nUsedX = 0; // Ende holen + SCCOL nUsedX = 0; // Ende holen SCROW nUsedY = 0; if (!pDocSh->GetDocument()->GetTableArea( nTab, nUsedX, nUsedY )) { @@ -313,8 +313,8 @@ void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand ) void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException) { - // this is similar to collapseToCurrentRegion - //! something like gotoEdge with 4 possible directions is needed + // this is similar to collapseToCurrentRegion + //! something like gotoEdge with 4 possible directions is needed SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -341,8 +341,8 @@ void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException) void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException) { - // this is similar to collapseToCurrentRegion - //! something like gotoEdge with 4 possible directions is needed + // this is similar to collapseToCurrentRegion + //! something like gotoEdge with 4 possible directions is needed SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -375,16 +375,16 @@ void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException) ScRange aOneRange(*rRanges.GetObject(0)); aOneRange.Justify(); - ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen + ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen - ScMarkData aMark; // not used with bMarked=FALSE + ScMarkData aMark; // not used with bMarked=FALSE SCCOL nNewX = aCursor.Col(); SCROW nNewY = aCursor.Row(); SCTAB nTab = aCursor.Tab(); ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, 1,0, FALSE,TRUE, aMark ); - //! sonst Exception oder so + //! sonst Exception oder so SetNewRange( ScRange( nNewX, nNewY, nTab ) ); } @@ -397,16 +397,16 @@ void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException) ScRange aOneRange(*rRanges.GetObject(0)); aOneRange.Justify(); - ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen + ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen - ScMarkData aMark; // not used with bMarked=FALSE + ScMarkData aMark; // not used with bMarked=FALSE SCCOL nNewX = aCursor.Col(); SCROW nNewY = aCursor.Row(); SCTAB nTab = aCursor.Tab(); ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, -1,0, FALSE,TRUE, aMark ); - //! sonst Exception oder so + //! sonst Exception oder so SetNewRange( ScRange( nNewX, nNewY, nTab ) ); } @@ -488,18 +488,18 @@ sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServic uno::Sequence<rtl::OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() throw(uno::RuntimeException) { - // get all service names from cell range + // get all service names from cell range uno::Sequence<rtl::OUString> aParentSeq(ScCellRangeObj::getSupportedServiceNames()); sal_Int32 nParentLen = aParentSeq.getLength(); const rtl::OUString* pParentArr = aParentSeq.getConstArray(); - // SheetCellCursor should be first (?) + // SheetCellCursor should be first (?) uno::Sequence<rtl::OUString> aTotalSeq( nParentLen + 2 ); rtl::OUString* pTotalArr = aTotalSeq.getArray(); pTotalArr[0] = rtl::OUString::createFromAscii( SCSHEETCELLCURSOR_SERVICE ); pTotalArr[1] = rtl::OUString::createFromAscii( SCCELLCURSOR_SERVICE ); - // append cell range services + // append cell range services for (long i=0; i<nParentLen; i++) pTotalArr[i+2] = pParentArr[i]; diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index fc3aa7583552..81d8423e7fad 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -222,7 +222,7 @@ GeneralFunction ScDataPilotConversion::FirstFunc( USHORT nBits ) USHORT ScDataPilotConversion::FunctionBit( GeneralFunction eFunc ) { - USHORT nRet = PIVOT_FUNC_NONE; // 0 + USHORT nRet = PIVOT_FUNC_NONE; // 0 switch (eFunc) { case GeneralFunction_SUM: nRet = PIVOT_FUNC_SUM; break; @@ -275,7 +275,7 @@ ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const String& rN } } } - return NULL; // nicht gefunden + return NULL; // nicht gefunden } String lcl_CreatePivotName( ScDocShell* pDocShell ) @@ -287,7 +287,7 @@ String lcl_CreatePivotName( ScDocShell* pDocShell ) if ( pColl ) return pColl->CreateNewName(); } - return String(); // sollte nicht vorkommen + return String(); // sollte nicht vorkommen } sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier& rFieldId ) @@ -324,12 +324,12 @@ ScDataPilotTablesObj::~ScDataPilotTablesObj() void ScDataPilotTablesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! Referenz-Update + //! Referenz-Update if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -343,9 +343,9 @@ ScDataPilotTableObj* ScDataPilotTablesObj::GetObjectByIndex_Impl( sal_Int32 nInd ScDPCollection* pColl = pDoc->GetDPCollection(); if ( pColl ) { - // count tables on this sheet - // api only handles sheet data at this time - //! allow all data sources!!! + // count tables on this sheet + // api only handles sheet data at this time + //! allow all data sources!!! sal_Int32 nFound = 0; USHORT nCount = pColl->GetCount(); for (USHORT i=0; i<nCount; i++) @@ -469,7 +469,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) if (pDPObj && pDocShell) { ScDBDocFunc aFunc(*pDocShell); - aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, TRUE ); // remove - incl. undo etc. + aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, TRUE ); // remove - incl. undo etc. } else throw RuntimeException(); // no other exceptions specified @@ -494,9 +494,9 @@ sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException) ScDPCollection* pColl = pDoc->GetDPCollection(); if ( pColl ) { - // count tables on this sheet - // api only handles sheet data at this time - //! allow all data sources!!! + // count tables on this sheet + // api only handles sheet data at this time + //! allow all data sources!!! USHORT nFound = 0; USHORT nCount = pColl->GetCount(); @@ -557,9 +557,9 @@ Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames() ScDPCollection* pColl = pDoc->GetDPCollection(); if ( pColl ) { - // count tables on this sheet - // api only handles sheet data at this time - //! allow all data sources!!! + // count tables on this sheet + // api only handles sheet data at this time + //! allow all data sources!!! USHORT nFound = 0; USHORT nCount = pColl->GetCount(); @@ -601,8 +601,8 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName ) USHORT nCount = pColl->GetCount(); for (USHORT i=0; i<nCount; i++) { - // api only handles sheet data at this time - //! allow all data sources!!! + // api only handles sheet data at this time + //! allow all data sources!!! ScDPObject* pDPObj = (*pColl)[i]; if ( pDPObj->GetOutRange().aStart.Tab() == nTab && @@ -685,12 +685,12 @@ Sequence<sal_Int8> SAL_CALL ScDataPilotDescriptorBase::getImplementationId() void ScDataPilotDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! Referenz-Update? + //! Referenz-Update? if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -1221,13 +1221,13 @@ void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName ) ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); if (pDPObj) { - //! test for existing names !!! + //! test for existing names !!! String aString(aNewName); - pDPObj->SetName( aString ); //! Undo - DBDocFunc ??? + pDPObj->SetName( aString ); //! Undo - DBDocFunc ??? aName = aString; - // DataPilotUpdate would do too much (output table is not changed) + // DataPilotUpdate would do too much (output table is not changed) GetDocShell()->SetDocumentModified(); } } @@ -1249,9 +1249,9 @@ void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag ) if (pDPObj) { String aString(aNewTag); - pDPObj->SetTag( aString ); //! Undo - DBDocFunc ??? + pDPObj->SetTag( aString ); //! Undo - DBDocFunc ??? - // DataPilotUpdate would do too much (output table is not changed) + // DataPilotUpdate would do too much (output table is not changed) GetDocShell()->SetDocumentModified(); } } @@ -1266,11 +1266,11 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeExc if (pDPObj) { ScRange aRange(pDPObj->GetOutRange()); - aRet.Sheet = aRange.aStart.Tab(); + aRet.Sheet = aRange.aStart.Tab(); aRet.StartColumn = aRange.aStart.Col(); - aRet.StartRow = aRange.aStart.Row(); - aRet.EndColumn = aRange.aEnd.Col(); - aRet.EndRow = aRange.aEnd.Row(); + aRet.StartRow = aRange.aStart.Row(); + aRet.EndColumn = aRange.aEnd.Col(); + aRet.EndRow = aRange.aEnd.Row(); } return aRet; } @@ -1284,10 +1284,10 @@ void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException) RefreshDPObject( pDPObj, NULL, GetDocShell(), TRUE, TRUE ); //if (pDPObj) //{ - // ScDPObject* pNew = new ScDPObject(*pDPObj); - // ScDBDocFunc aFunc(*GetDocShell()); - // aFunc.DataPilotUpdate( pDPObj, pNew, TRUE, TRUE ); - // delete pNew; // DataPilotUpdate copies settings from "new" object + // ScDPObject* pNew = new ScDPObject(*pDPObj); + // ScDBDocFunc aFunc(*GetDocShell()); + // aFunc.DataPilotUpdate( pDPObj, pNew, TRUE, TRUE ); + // delete pNew; // DataPilotUpdate copies settings from "new" object //} } @@ -1851,12 +1851,12 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException) if( pDim->IsDataLayout() ) aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) ); else - { + { const rtl::OUString* pLayoutName = pDim->GetLayoutName(); - if (pLayoutName) - aName = *pLayoutName; - else - aName = pDim->GetName(); + if (pLayoutName) + aName = *pLayoutName; + else + aName = pDim->GetName(); } } return aName; } @@ -1905,7 +1905,7 @@ void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyNa } else if ( aNameString.EqualsAscii( SC_UNONAME_ORIENT ) ) { - //! test for correct enum type? + //! test for correct enum type? DataPilotFieldOrientation eOrient = (DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumFromAny( aValue ); setOrientation( eOrient ); diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 8cc00f714eab..ec9e6add155b 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ SV_IMPL_PTRARR( XDBRefreshListenerArr_Impl, XDBRefreshListenerPtr ); //------------------------------------------------------------------------ -// alles ohne Which-ID, Map nur fuer PropertySetInfo +// alles ohne Which-ID, Map nur fuer PropertySetInfo const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() { @@ -140,7 +140,7 @@ const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() //------------------------------------------------------------------------ -#define SCDATABASERANGEOBJ_SERVICE "com.sun.star.sheet.DatabaseRange" +#define SCDATABASERANGEOBJ_SERVICE "com.sun.star.sheet.DatabaseRange" SC_SIMPLE_SERVICE_INFO( ScConsolidationDescriptor, "ScConsolidationDescriptor", "com.sun.star.sheet.ConsolidationDescriptor" ) SC_SIMPLE_SERVICE_INFO( ScDatabaseRangesObj, "ScDatabaseRangesObj", "com.sun.star.sheet.DatabaseRanges" ) @@ -157,18 +157,18 @@ ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eS ScSubTotalFunc eSubTotal; switch (eSummary) { - case sheet::GeneralFunction_NONE: eSubTotal = SUBTOTAL_FUNC_NONE; break; - case sheet::GeneralFunction_SUM: eSubTotal = SUBTOTAL_FUNC_SUM; break; - case sheet::GeneralFunction_COUNT: eSubTotal = SUBTOTAL_FUNC_CNT2; break; - case sheet::GeneralFunction_AVERAGE: eSubTotal = SUBTOTAL_FUNC_AVE; break; - case sheet::GeneralFunction_MAX: eSubTotal = SUBTOTAL_FUNC_MAX; break; - case sheet::GeneralFunction_MIN: eSubTotal = SUBTOTAL_FUNC_MIN; break; - case sheet::GeneralFunction_PRODUCT: eSubTotal = SUBTOTAL_FUNC_PROD; break; - case sheet::GeneralFunction_COUNTNUMS: eSubTotal = SUBTOTAL_FUNC_CNT; break; - case sheet::GeneralFunction_STDEV: eSubTotal = SUBTOTAL_FUNC_STD; break; - case sheet::GeneralFunction_STDEVP: eSubTotal = SUBTOTAL_FUNC_STDP; break; - case sheet::GeneralFunction_VAR: eSubTotal = SUBTOTAL_FUNC_VAR; break; - case sheet::GeneralFunction_VARP: eSubTotal = SUBTOTAL_FUNC_VARP; break; + case sheet::GeneralFunction_NONE: eSubTotal = SUBTOTAL_FUNC_NONE; break; + case sheet::GeneralFunction_SUM: eSubTotal = SUBTOTAL_FUNC_SUM; break; + case sheet::GeneralFunction_COUNT: eSubTotal = SUBTOTAL_FUNC_CNT2; break; + case sheet::GeneralFunction_AVERAGE: eSubTotal = SUBTOTAL_FUNC_AVE; break; + case sheet::GeneralFunction_MAX: eSubTotal = SUBTOTAL_FUNC_MAX; break; + case sheet::GeneralFunction_MIN: eSubTotal = SUBTOTAL_FUNC_MIN; break; + case sheet::GeneralFunction_PRODUCT: eSubTotal = SUBTOTAL_FUNC_PROD; break; + case sheet::GeneralFunction_COUNTNUMS: eSubTotal = SUBTOTAL_FUNC_CNT; break; + case sheet::GeneralFunction_STDEV: eSubTotal = SUBTOTAL_FUNC_STD; break; + case sheet::GeneralFunction_STDEVP: eSubTotal = SUBTOTAL_FUNC_STDP; break; + case sheet::GeneralFunction_VAR: eSubTotal = SUBTOTAL_FUNC_VAR; break; + case sheet::GeneralFunction_VARP: eSubTotal = SUBTOTAL_FUNC_VARP; break; case sheet::GeneralFunction_AUTO: default: DBG_ERROR("GeneralToSubTotal: falscher enum"); @@ -178,23 +178,23 @@ ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eS } // static -sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc eSubTotal ) +sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc eSubTotal ) { sheet::GeneralFunction eGeneral; switch (eSubTotal) { - case SUBTOTAL_FUNC_NONE: eGeneral = sheet::GeneralFunction_NONE; break; - case SUBTOTAL_FUNC_AVE: eGeneral = sheet::GeneralFunction_AVERAGE; break; + case SUBTOTAL_FUNC_NONE: eGeneral = sheet::GeneralFunction_NONE; break; + case SUBTOTAL_FUNC_AVE: eGeneral = sheet::GeneralFunction_AVERAGE; break; case SUBTOTAL_FUNC_CNT: eGeneral = sheet::GeneralFunction_COUNTNUMS; break; - case SUBTOTAL_FUNC_CNT2: eGeneral = sheet::GeneralFunction_COUNT; break; - case SUBTOTAL_FUNC_MAX: eGeneral = sheet::GeneralFunction_MAX; break; - case SUBTOTAL_FUNC_MIN: eGeneral = sheet::GeneralFunction_MIN; break; - case SUBTOTAL_FUNC_PROD: eGeneral = sheet::GeneralFunction_PRODUCT; break; - case SUBTOTAL_FUNC_STD: eGeneral = sheet::GeneralFunction_STDEV; break; - case SUBTOTAL_FUNC_STDP: eGeneral = sheet::GeneralFunction_STDEVP; break; - case SUBTOTAL_FUNC_SUM: eGeneral = sheet::GeneralFunction_SUM; break; - case SUBTOTAL_FUNC_VAR: eGeneral = sheet::GeneralFunction_VAR; break; - case SUBTOTAL_FUNC_VARP: eGeneral = sheet::GeneralFunction_VARP; break; + case SUBTOTAL_FUNC_CNT2: eGeneral = sheet::GeneralFunction_COUNT; break; + case SUBTOTAL_FUNC_MAX: eGeneral = sheet::GeneralFunction_MAX; break; + case SUBTOTAL_FUNC_MIN: eGeneral = sheet::GeneralFunction_MIN; break; + case SUBTOTAL_FUNC_PROD: eGeneral = sheet::GeneralFunction_PRODUCT; break; + case SUBTOTAL_FUNC_STD: eGeneral = sheet::GeneralFunction_STDEV; break; + case SUBTOTAL_FUNC_STDP: eGeneral = sheet::GeneralFunction_STDEVP; break; + case SUBTOTAL_FUNC_SUM: eGeneral = sheet::GeneralFunction_SUM; break; + case SUBTOTAL_FUNC_VAR: eGeneral = sheet::GeneralFunction_VAR; break; + case SUBTOTAL_FUNC_VARP: eGeneral = sheet::GeneralFunction_VARP; break; default: DBG_ERROR("SubTotalToGeneral: falscher enum"); eGeneral = sheet::GeneralFunction_NONE; @@ -205,7 +205,7 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e //------------------------------------------------------------------------ -// ScImportDescriptor: alles static +// ScImportDescriptor: alles static long ScImportDescriptor::GetPropertyCount() { @@ -226,7 +226,7 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS else if ( rParam.nType == ScDbQuery ) eMode = sheet::DataImportMode_QUERY; else - eMode = sheet::DataImportMode_TABLE; // Type ist immer ScDbQuery oder ScDbTable + eMode = sheet::DataImportMode_TABLE; // Type ist immer ScDbQuery oder ScDbTable } ::svx::ODataAccessDescriptor aDescriptor; @@ -281,7 +281,7 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ } else if (aPropName.EqualsAscii( SC_UNONAME_SRCTYPE )) { - //! test for correct enum type? + //! test for correct enum type? sheet::DataImportMode eMode = (sheet::DataImportMode) ScUnoHelpFunctions::GetEnumFromAny( rProp.Value ); switch (eMode) @@ -313,13 +313,13 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ //------------------------------------------------------------------------ -// ScSortDescriptor: alles static +// ScSortDescriptor: alles static -//! SortAscending muss aus der SheetSortDescriptor service-Beschreibung raus +//! SortAscending muss aus der SheetSortDescriptor service-Beschreibung raus long ScSortDescriptor::GetPropertyCount() { - return 9; // TableSortDescriptor and SheetSortDescriptor + return 9; // TableSortDescriptor and SheetSortDescriptor } void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq, const ScSortParam& rParam ) @@ -328,7 +328,7 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq beans::PropertyValue* pArray = rSeq.getArray(); - // Uno-Werte zusammensuchen + // Uno-Werte zusammensuchen table::CellAddress aOutPos; aOutPos.Sheet = rParam.nDestTab; @@ -345,16 +345,16 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq table::TableSortField* pFieldArray = aFields.getArray(); for (USHORT i=0; i<nSortCount; i++) { - pFieldArray[i].Field = rParam.nField[i]; + pFieldArray[i].Field = rParam.nField[i]; pFieldArray[i].IsAscending = rParam.bAscending[i]; - pFieldArray[i].FieldType = table::TableSortFieldType_AUTOMATIC; // immer Automatic + pFieldArray[i].FieldType = table::TableSortFieldType_AUTOMATIC; // immer Automatic pFieldArray[i].IsCaseSensitive = rParam.bCaseSens; pFieldArray[i].CollatorLocale = rParam.aCollatorLocale; pFieldArray[i].CollatorAlgorithm = rtl::OUString( rParam.aCollatorAlgorithm ); } } - // Sequence fuellen + // Sequence fuellen pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISSORTCOLUMNS ); pArray[0].Value = ::cppu::bool2any(!rParam.bByRow); @@ -398,7 +398,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b if (aPropName.EqualsAscii( SC_UNONAME_ORIENT )) { bOldSortDescriptor = sal_True; - //! test for correct enum type? + //! test for correct enum type? table::TableOrientation eOrient = (table::TableOrientation) ScUnoHelpFunctions::GetEnumFromAny( rProp.Value ); rParam.bByRow = ( eOrient != table::TableOrientation_COLUMNS ); @@ -415,7 +415,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b sal_Int32 nVal; if ( (rProp.Value >>= nVal) && nVal > MAXSORT ) { - //! specify exceptions + //! specify exceptions //! throw lang::IllegalArgumentException(); } } @@ -436,7 +436,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b const util::SortField* pFieldArray = aSeq.getConstArray(); for (i=0; i<nCount; i++) { - rParam.nField[i] = (SCCOLROW)pFieldArray[i].Field; + rParam.nField[i] = (SCCOLROW)pFieldArray[i].Field; rParam.bAscending[i] = pFieldArray[i].SortAscending; // FieldType wird ignoriert @@ -458,7 +458,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b const table::TableSortField* pFieldArray = aNewSeq.getConstArray(); for (i=0; i<nCount; i++) { - rParam.nField[i] = (SCCOLROW)pFieldArray[i].Field; + rParam.nField[i] = (SCCOLROW)pFieldArray[i].Field; rParam.bAscending[i] = pFieldArray[i].IsAscending; // only one is possible, sometime we should make it possible to have different for every entry @@ -518,7 +518,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b //------------------------------------------------------------------------ ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, USHORT nP ) : - xRef( pDesc ), // Objekt festhalten + xRef( pDesc ), // Objekt festhalten rParent( *pDesc ), nPos( nP ) { @@ -602,7 +602,7 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns( aParam.pFunctions[nPos] = NULL; } } - //! sonst Exception oder so? (zuviele Spalten) + //! sonst Exception oder so? (zuviele Spalten) rParent.PutData(aParam); } @@ -648,7 +648,7 @@ void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException) for (USHORT i=0; i<MAXSUBTOTAL; i++) aParam.bGroupActive[i] = FALSE; - //! Notify oder so fuer die Field-Objekte??? + //! Notify oder so fuer die Field-Objekte??? PutData(aParam); } @@ -696,13 +696,13 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew( aParam.pFunctions[nPos] = NULL; } } - else // too many fields / columns - throw uno::RuntimeException(); // no other exceptions specified + else // too many fields / columns + throw uno::RuntimeException(); // no other exceptions specified PutData(aParam); } -// Flags/Einstellungen als Properties +// Flags/Einstellungen als Properties // XEnumerationAccess @@ -896,17 +896,17 @@ ScSubTotalDescriptor::~ScSubTotalDescriptor() void ScSubTotalDescriptor::GetData( ScSubTotalParam& rParam ) const { - rParam = aStoredParam; // Abfrage fuer Interface + rParam = aStoredParam; // Abfrage fuer Interface } void ScSubTotalDescriptor::PutData( const ScSubTotalParam& rParam ) { - aStoredParam = rParam; // vom Interface gesetzt + aStoredParam = rParam; // vom Interface gesetzt } void ScSubTotalDescriptor::SetParam( const ScSubTotalParam& rNew ) { - aStoredParam = rNew; // von aussen gesetzt + aStoredParam = rNew; // von aussen gesetzt } //------------------------------------------------------------------------ @@ -981,11 +981,11 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSo ScArea* pArea = aParam.ppDataAreas[i]; if (pArea) { - aRange.Sheet = pArea->nTab; - aRange.StartColumn = pArea->nColStart; - aRange.StartRow = pArea->nRowStart; - aRange.EndColumn = pArea->nColEnd; - aRange.EndRow = pArea->nRowEnd; + aRange.Sheet = pArea->nTab; + aRange.StartColumn = pArea->nColStart; + aRange.StartRow = pArea->nRowStart; + aRange.EndColumn = pArea->nColEnd; + aRange.EndRow = pArea->nRowEnd; } pAry[i] = aRange; } @@ -1008,7 +1008,7 @@ void SAL_CALL ScConsolidationDescriptor::setSources( static_cast<SCCOL>(pAry[i].StartColumn), pAry[i].StartRow, static_cast<SCCOL>(pAry[i].EndColumn), pAry[i].EndRow ); - aParam.SetAreas( pNew, nCount ); // kopiert alles + aParam.SetAreas( pNew, nCount ); // kopiert alles for (i=0; i<nCount; i++) delete pNew[i]; @@ -1023,9 +1023,9 @@ table::CellAddress SAL_CALL ScConsolidationDescriptor::getStartOutputPosition() { SolarMutexGuard aGuard; table::CellAddress aPos; - aPos.Column = aParam.nCol; - aPos.Row = aParam.nRow; - aPos.Sheet = aParam.nTab; + aPos.Column = aParam.nCol; + aPos.Row = aParam.nRow; + aPos.Sheet = aParam.nTab; return aPos; } @@ -1101,7 +1101,7 @@ void ScFilterDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) { - pDocSh = NULL; // invalid + pDocSh = NULL; // invalid } } } @@ -1115,8 +1115,8 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte ScQueryParam aParam; GetData(aParam); - SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param - SCSIZE nCount = 0; // aktive + SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param + SCSIZE nCount = 0; // aktive while ( nCount < nEntries && aParam.GetEntry(nCount).bDoQuery ) ++nCount; @@ -1132,14 +1132,14 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte if (rEntry.pStr) aStringValue = *rEntry.pStr; - aField.Connection = (rEntry.eConnect == SC_AND) ? sheet::FilterConnection_AND : + aField.Connection = (rEntry.eConnect == SC_AND) ? sheet::FilterConnection_AND : sheet::FilterConnection_OR; - aField.Field = rEntry.nField; - aField.IsNumeric = !rEntry.bQueryByString; - aField.StringValue = aStringValue; - aField.NumericValue = rEntry.nVal; + aField.Field = rEntry.nField; + aField.IsNumeric = !rEntry.bQueryByString; + aField.StringValue = aStringValue; + aField.NumericValue = rEntry.nVal; - switch (rEntry.eOp) // ScQueryOp + switch (rEntry.eOp) // ScQueryOp { case SC_EQUAL: { @@ -1159,15 +1159,15 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte } } break; - case SC_LESS: aField.Operator = sheet::FilterOperator_LESS; break; - case SC_GREATER: aField.Operator = sheet::FilterOperator_GREATER; break; - case SC_LESS_EQUAL: aField.Operator = sheet::FilterOperator_LESS_EQUAL; break; - case SC_GREATER_EQUAL: aField.Operator = sheet::FilterOperator_GREATER_EQUAL; break; - case SC_NOT_EQUAL: aField.Operator = sheet::FilterOperator_NOT_EQUAL; break; - case SC_TOPVAL: aField.Operator = sheet::FilterOperator_TOP_VALUES; break; - case SC_BOTVAL: aField.Operator = sheet::FilterOperator_BOTTOM_VALUES; break; - case SC_TOPPERC: aField.Operator = sheet::FilterOperator_TOP_PERCENT; break; - case SC_BOTPERC: aField.Operator = sheet::FilterOperator_BOTTOM_PERCENT; break; + case SC_LESS: aField.Operator = sheet::FilterOperator_LESS; break; + case SC_GREATER: aField.Operator = sheet::FilterOperator_GREATER; break; + case SC_LESS_EQUAL: aField.Operator = sheet::FilterOperator_LESS_EQUAL; break; + case SC_GREATER_EQUAL: aField.Operator = sheet::FilterOperator_GREATER_EQUAL; break; + case SC_NOT_EQUAL: aField.Operator = sheet::FilterOperator_NOT_EQUAL; break; + case SC_TOPVAL: aField.Operator = sheet::FilterOperator_TOP_VALUES; break; + case SC_BOTVAL: aField.Operator = sheet::FilterOperator_BOTTOM_VALUES; break; + case SC_TOPPERC: aField.Operator = sheet::FilterOperator_TOP_PERCENT; break; + case SC_BOTPERC: aField.Operator = sheet::FilterOperator_BOTTOM_PERCENT; break; default: DBG_ERROR("Falscher Filter-enum"); aField.Operator = sheet::FilterOperator_EMPTY; @@ -1184,8 +1184,8 @@ throw(uno::RuntimeException) ScQueryParam aParam; GetData(aParam); - SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param - SCSIZE nCount = 0; // aktive + SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param + SCSIZE nCount = 0; // aktive while ( nCount < nEntries && aParam.GetEntry(nCount).bDoQuery ) ++nCount; @@ -1201,13 +1201,13 @@ throw(uno::RuntimeException) if (rEntry.pStr) aStringValue = *rEntry.pStr; - aField.Connection = (rEntry.eConnect == SC_AND) ? sheet::FilterConnection_AND : sheet::FilterConnection_OR; - aField.Field = rEntry.nField; - aField.IsNumeric = !rEntry.bQueryByString; - aField.StringValue = aStringValue; - aField.NumericValue = rEntry.nVal; + aField.Connection = (rEntry.eConnect == SC_AND) ? sheet::FilterConnection_AND : sheet::FilterConnection_OR; + aField.Field = rEntry.nField; + aField.IsNumeric = !rEntry.bQueryByString; + aField.StringValue = aStringValue; + aField.NumericValue = rEntry.nVal; - switch (rEntry.eOp) // ScQueryOp + switch (rEntry.eOp) // ScQueryOp { case SC_EQUAL: { @@ -1227,15 +1227,15 @@ throw(uno::RuntimeException) } } break; - case SC_LESS: aField.Operator = sheet::FilterOperator2::LESS; break; - case SC_GREATER: aField.Operator = sheet::FilterOperator2::GREATER; break; - case SC_LESS_EQUAL: aField.Operator = sheet::FilterOperator2::LESS_EQUAL; break; - case SC_GREATER_EQUAL: aField.Operator = sheet::FilterOperator2::GREATER_EQUAL; break; - case SC_NOT_EQUAL: aField.Operator = sheet::FilterOperator2::NOT_EQUAL; break; - case SC_TOPVAL: aField.Operator = sheet::FilterOperator2::TOP_VALUES; break; - case SC_BOTVAL: aField.Operator = sheet::FilterOperator2::BOTTOM_VALUES; break; - case SC_TOPPERC: aField.Operator = sheet::FilterOperator2::TOP_PERCENT; break; - case SC_BOTPERC: aField.Operator = sheet::FilterOperator2::BOTTOM_PERCENT; break; + case SC_LESS: aField.Operator = sheet::FilterOperator2::LESS; break; + case SC_GREATER: aField.Operator = sheet::FilterOperator2::GREATER; break; + case SC_LESS_EQUAL: aField.Operator = sheet::FilterOperator2::LESS_EQUAL; break; + case SC_GREATER_EQUAL: aField.Operator = sheet::FilterOperator2::GREATER_EQUAL; break; + case SC_NOT_EQUAL: aField.Operator = sheet::FilterOperator2::NOT_EQUAL; break; + case SC_TOPVAL: aField.Operator = sheet::FilterOperator2::TOP_VALUES; break; + case SC_BOTVAL: aField.Operator = sheet::FilterOperator2::BOTTOM_VALUES; break; + case SC_TOPPERC: aField.Operator = sheet::FilterOperator2::TOP_PERCENT; break; + case SC_BOTPERC: aField.Operator = sheet::FilterOperator2::BOTTOM_PERCENT; break; case SC_CONTAINS: aField.Operator = sheet::FilterOperator2::CONTAINS; break; case SC_DOES_NOT_CONTAIN: aField.Operator = sheet::FilterOperator2::DOES_NOT_CONTAIN; break; case SC_BEGINS_WITH: aField.Operator = sheet::FilterOperator2::BEGINS_WITH; break; @@ -1270,32 +1270,32 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields( { ScQueryEntry& rEntry = aParam.GetEntry(i); if (!rEntry.pStr) - rEntry.pStr = new String; // sollte nicht sein (soll immer initialisiert sein) + rEntry.pStr = new String; // sollte nicht sein (soll immer initialisiert sein) - rEntry.bDoQuery = TRUE; - rEntry.eConnect = (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR; - rEntry.nField = pAry[i].Field; - rEntry.bQueryByString = !pAry[i].IsNumeric; - *rEntry.pStr = String( pAry[i].StringValue ); - rEntry.nVal = pAry[i].NumericValue; + rEntry.bDoQuery = TRUE; + rEntry.eConnect = (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR; + rEntry.nField = pAry[i].Field; + rEntry.bQueryByString = !pAry[i].IsNumeric; + *rEntry.pStr = String( pAry[i].StringValue ); + rEntry.nVal = pAry[i].NumericValue; if (!rEntry.bQueryByString && pDocSh) { pDocSh->GetDocument()->GetFormatTable()->GetInputLineString(rEntry.nVal, 0, *rEntry.pStr); } - switch (pAry[i].Operator) // FilterOperator + switch (pAry[i].Operator) // FilterOperator { - case sheet::FilterOperator_EQUAL: rEntry.eOp = SC_EQUAL; break; - case sheet::FilterOperator_LESS: rEntry.eOp = SC_LESS; break; - case sheet::FilterOperator_GREATER: rEntry.eOp = SC_GREATER; break; - case sheet::FilterOperator_LESS_EQUAL: rEntry.eOp = SC_LESS_EQUAL; break; - case sheet::FilterOperator_GREATER_EQUAL: rEntry.eOp = SC_GREATER_EQUAL; break; - case sheet::FilterOperator_NOT_EQUAL: rEntry.eOp = SC_NOT_EQUAL; break; - case sheet::FilterOperator_TOP_VALUES: rEntry.eOp = SC_TOPVAL; break; - case sheet::FilterOperator_BOTTOM_VALUES: rEntry.eOp = SC_BOTVAL; break; - case sheet::FilterOperator_TOP_PERCENT: rEntry.eOp = SC_TOPPERC; break; - case sheet::FilterOperator_BOTTOM_PERCENT: rEntry.eOp = SC_BOTPERC; break; + case sheet::FilterOperator_EQUAL: rEntry.eOp = SC_EQUAL; break; + case sheet::FilterOperator_LESS: rEntry.eOp = SC_LESS; break; + case sheet::FilterOperator_GREATER: rEntry.eOp = SC_GREATER; break; + case sheet::FilterOperator_LESS_EQUAL: rEntry.eOp = SC_LESS_EQUAL; break; + case sheet::FilterOperator_GREATER_EQUAL: rEntry.eOp = SC_GREATER_EQUAL; break; + case sheet::FilterOperator_NOT_EQUAL: rEntry.eOp = SC_NOT_EQUAL; break; + case sheet::FilterOperator_TOP_VALUES: rEntry.eOp = SC_TOPVAL; break; + case sheet::FilterOperator_BOTTOM_VALUES: rEntry.eOp = SC_BOTVAL; break; + case sheet::FilterOperator_TOP_PERCENT: rEntry.eOp = SC_TOPPERC; break; + case sheet::FilterOperator_BOTTOM_PERCENT: rEntry.eOp = SC_BOTPERC; break; case sheet::FilterOperator_EMPTY: { rEntry.eOp = SC_EQUAL; @@ -1318,9 +1318,9 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields( } } - SCSIZE nParamCount = aParam.GetEntryCount(); // Param wird nicht unter 8 resized + SCSIZE nParamCount = aParam.GetEntryCount(); // Param wird nicht unter 8 resized for (i=nCount; i<nParamCount; i++) - aParam.GetEntry(i).bDoQuery = FALSE; // ueberzaehlige Felder zuruecksetzen + aParam.GetEntry(i).bDoQuery = FALSE; // ueberzaehlige Felder zuruecksetzen PutData(aParam); } @@ -1344,38 +1344,38 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2( { ScQueryEntry& rEntry = aParam.GetEntry(i); if (!rEntry.pStr) - rEntry.pStr = new String; // sollte nicht sein (soll immer initialisiert sein) + rEntry.pStr = new String; // sollte nicht sein (soll immer initialisiert sein) - rEntry.bDoQuery = TRUE; - rEntry.eConnect = (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR; - rEntry.nField = pAry[i].Field; - rEntry.bQueryByString = !pAry[i].IsNumeric; - *rEntry.pStr = String( pAry[i].StringValue ); - rEntry.nVal = pAry[i].NumericValue; + rEntry.bDoQuery = TRUE; + rEntry.eConnect = (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR; + rEntry.nField = pAry[i].Field; + rEntry.bQueryByString = !pAry[i].IsNumeric; + *rEntry.pStr = String( pAry[i].StringValue ); + rEntry.nVal = pAry[i].NumericValue; if (!rEntry.bQueryByString && pDocSh) { pDocSh->GetDocument()->GetFormatTable()->GetInputLineString(rEntry.nVal, 0, *rEntry.pStr); } - switch (pAry[i].Operator) // FilterOperator + switch (pAry[i].Operator) // FilterOperator { - case sheet::FilterOperator2::EQUAL: rEntry.eOp = SC_EQUAL; break; - case sheet::FilterOperator2::LESS: rEntry.eOp = SC_LESS; break; - case sheet::FilterOperator2::GREATER: rEntry.eOp = SC_GREATER; break; - case sheet::FilterOperator2::LESS_EQUAL: rEntry.eOp = SC_LESS_EQUAL; break; - case sheet::FilterOperator2::GREATER_EQUAL: rEntry.eOp = SC_GREATER_EQUAL; break; - case sheet::FilterOperator2::NOT_EQUAL: rEntry.eOp = SC_NOT_EQUAL; break; - case sheet::FilterOperator2::TOP_VALUES: rEntry.eOp = SC_TOPVAL; break; - case sheet::FilterOperator2::BOTTOM_VALUES: rEntry.eOp = SC_BOTVAL; break; - case sheet::FilterOperator2::TOP_PERCENT: rEntry.eOp = SC_TOPPERC; break; - case sheet::FilterOperator2::BOTTOM_PERCENT: rEntry.eOp = SC_BOTPERC; break; - case sheet::FilterOperator2::CONTAINS: rEntry.eOp = SC_CONTAINS; break; - case sheet::FilterOperator2::DOES_NOT_CONTAIN: rEntry.eOp = SC_DOES_NOT_CONTAIN; break; - case sheet::FilterOperator2::BEGINS_WITH: rEntry.eOp = SC_BEGINS_WITH; break; - case sheet::FilterOperator2::DOES_NOT_BEGIN_WITH: rEntry.eOp = SC_DOES_NOT_BEGIN_WITH;break; - case sheet::FilterOperator2::ENDS_WITH: rEntry.eOp = SC_ENDS_WITH; break; - case sheet::FilterOperator2::DOES_NOT_END_WITH: rEntry.eOp = SC_DOES_NOT_END_WITH; break; + case sheet::FilterOperator2::EQUAL: rEntry.eOp = SC_EQUAL; break; + case sheet::FilterOperator2::LESS: rEntry.eOp = SC_LESS; break; + case sheet::FilterOperator2::GREATER: rEntry.eOp = SC_GREATER; break; + case sheet::FilterOperator2::LESS_EQUAL: rEntry.eOp = SC_LESS_EQUAL; break; + case sheet::FilterOperator2::GREATER_EQUAL: rEntry.eOp = SC_GREATER_EQUAL; break; + case sheet::FilterOperator2::NOT_EQUAL: rEntry.eOp = SC_NOT_EQUAL; break; + case sheet::FilterOperator2::TOP_VALUES: rEntry.eOp = SC_TOPVAL; break; + case sheet::FilterOperator2::BOTTOM_VALUES: rEntry.eOp = SC_BOTVAL; break; + case sheet::FilterOperator2::TOP_PERCENT: rEntry.eOp = SC_TOPPERC; break; + case sheet::FilterOperator2::BOTTOM_PERCENT: rEntry.eOp = SC_BOTPERC; break; + case sheet::FilterOperator2::CONTAINS: rEntry.eOp = SC_CONTAINS; break; + case sheet::FilterOperator2::DOES_NOT_CONTAIN: rEntry.eOp = SC_DOES_NOT_CONTAIN; break; + case sheet::FilterOperator2::BEGINS_WITH: rEntry.eOp = SC_BEGINS_WITH; break; + case sheet::FilterOperator2::DOES_NOT_BEGIN_WITH: rEntry.eOp = SC_DOES_NOT_BEGIN_WITH;break; + case sheet::FilterOperator2::ENDS_WITH: rEntry.eOp = SC_ENDS_WITH; break; + case sheet::FilterOperator2::DOES_NOT_END_WITH: rEntry.eOp = SC_DOES_NOT_END_WITH; break; case sheet::FilterOperator2::EMPTY: { rEntry.eOp = SC_EQUAL; @@ -1398,9 +1398,9 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2( } } - SCSIZE nParamCount = aParam.GetEntryCount(); // Param wird nicht unter 8 resized + SCSIZE nParamCount = aParam.GetEntryCount(); // Param wird nicht unter 8 resized for (i=nCount; i<nParamCount; i++) - aParam.GetEntry(i).bDoQuery = FALSE; // ueberzaehlige Felder zuruecksetzen + aParam.GetEntry(i).bDoQuery = FALSE; // ueberzaehlige Felder zuruecksetzen PutData(aParam); } @@ -1445,7 +1445,7 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue( } else if (aString.EqualsAscii( SC_UNONAME_ORIENT )) { - //! test for correct enum type? + //! test for correct enum type? table::TableOrientation eOrient = (table::TableOrientation) ScUnoHelpFunctions::GetEnumFromAny( aValue ); aParam.bByRow = ( eOrient != table::TableOrientation_COLUMNS ); @@ -1529,17 +1529,17 @@ ScFilterDescriptor::~ScFilterDescriptor() void ScFilterDescriptor::GetData( ScQueryParam& rParam ) const { - rParam = aStoredParam; // Abfrage fuer Interface + rParam = aStoredParam; // Abfrage fuer Interface } void ScFilterDescriptor::PutData( const ScQueryParam& rParam ) { - aStoredParam = rParam; // vom Interface gesetzt + aStoredParam = rParam; // vom Interface gesetzt } void ScFilterDescriptor::SetParam( const ScQueryParam& rNew ) { - aStoredParam = rNew; // von aussen gesetzt + aStoredParam = rNew; // von aussen gesetzt } //------------------------------------------------------------------------ @@ -1633,7 +1633,7 @@ void ScDatabaseRangeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden else if ( rHint.ISA (ScDBRangeRefreshedHint) ) { ScDBData* pDBData = GetDBData_Impl(); @@ -1696,11 +1696,11 @@ table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::Ru { ScRange aRange; pData->GetArea(aRange); - aAddress.Sheet = aRange.aStart.Tab(); + aAddress.Sheet = aRange.aStart.Tab(); aAddress.StartColumn = aRange.aStart.Col(); - aAddress.StartRow = aRange.aStart.Row(); - aAddress.EndColumn = aRange.aEnd.Col(); - aAddress.EndRow = aRange.aEnd.Row(); + aAddress.StartRow = aRange.aStart.Row(); + aAddress.EndColumn = aRange.aEnd.Col(); + aAddress.EndRow = aRange.aEnd.Row(); } return aAddress; } @@ -1713,7 +1713,7 @@ void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aD if ( pDocShell && pData ) { ScDBData aNewData( *pData ); - //! MoveTo ??? + //! MoveTo ??? aNewData.SetArea( aDataArea.Sheet, (SCCOL)aDataArea.StartColumn, (SCROW)aDataArea.StartRow, (SCCOL)aDataArea.EndColumn, (SCROW)aDataArea.EndRow ); ScDBDocFunc aFunc(*pDocShell); @@ -1731,7 +1731,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getSortDescript { pData->GetSortParam(aParam); - // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt ScRange aDBRange; pData->GetArea(aDBRange); SCCOLROW nFieldStart = aParam.bByRow ? static_cast<SCCOLROW>(aDBRange.aStart.Col()) : static_cast<SCCOLROW>(aDBRange.aStart.Row()); @@ -1752,7 +1752,7 @@ void ScDatabaseRangeObj::GetQueryParam(ScQueryParam& rQueryParam) const { pData->GetQueryParam(rQueryParam); - // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt ScRange aDBRange; pData->GetArea(aDBRange); SCCOLROW nFieldStart = rQueryParam.bByRow ? static_cast<SCCOLROW>(aDBRange.aStart.Col()) : static_cast<SCCOLROW>(aDBRange.aStart.Row()); @@ -1771,7 +1771,7 @@ void ScDatabaseRangeObj::SetQueryParam(const ScQueryParam& rQueryParam) const ScDBData* pData = GetDBData_Impl(); if (pData) { - // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt ScQueryParam aParam(rQueryParam); ScRange aDBRange; pData->GetArea(aDBRange); @@ -1787,7 +1787,7 @@ void ScDatabaseRangeObj::SetQueryParam(const ScQueryParam& rQueryParam) ScDBData aNewData( *pData ); aNewData.SetQueryParam(aParam); - aNewData.SetHeader(aParam.bHasHeader); // not in ScDBData::SetQueryParam + aNewData.SetHeader(aParam.bHasHeader); // not in ScDBData::SetQueryParam ScDBDocFunc aFunc(*pDocShell); aFunc.ModifyDBData(aNewData, TRUE); } @@ -1807,7 +1807,7 @@ void ScDatabaseRangeObj::GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const { pData->GetSubTotalParam(rSubTotalParam); - // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt ScRange aDBRange; pData->GetArea(aDBRange); SCCOL nFieldStart = aDBRange.aStart.Col(); @@ -1831,7 +1831,7 @@ void ScDatabaseRangeObj::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam) const ScDBData* pData = GetDBData_Impl(); if (pData) { - // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt + // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt ScSubTotalParam aParam(rSubTotalParam); ScRange aDBRange; pData->GetArea(aDBRange); @@ -1895,7 +1895,7 @@ void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException) SCROW nDummyRow; pData->GetArea( nTab, nDummyCol,nDummyRow,nDummyCol,nDummyRow ); uno::Reference< sdbc::XResultSet > xResultSet; - bContinue = aFunc.DoImport( nTab, aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag als Parameter + bContinue = aFunc.DoImport( nTab, aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag als Parameter } // interne Operationen (sort, query, subtotal) nur, wenn kein Fehler @@ -1913,7 +1913,7 @@ void SAL_CALL ScDatabaseRangeObj::addRefreshListener( new uno::Reference<util::XRefreshListener>( xListener ); aRefreshListeners.Insert( pObj, aRefreshListeners.Count() ); - // hold one additional ref to keep this object alive as long as there are listeners + // hold one additional ref to keep this object alive as long as there are listeners if ( aRefreshListeners.Count() == 1 ) acquire(); } @@ -1931,7 +1931,7 @@ void SAL_CALL ScDatabaseRangeObj::removeRefreshListener( { aRefreshListeners.DeleteAndDestroy( n ); if ( aRefreshListeners.Count() == 0 ) - release(); // release ref for listeners + release(); // release ref for listeners break; } } @@ -1955,7 +1955,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells( ScDBData* pData = GetDBData_Impl(); if ( pData ) { - //! static Funktion um ScCellObj/ScCellRangeObj zu erzeugen am ScCellRangeObj ??? + //! static Funktion um ScCellObj/ScCellRangeObj zu erzeugen am ScCellRangeObj ??? pData->GetArea(aRange); if ( aRange.aStart == aRange.aEnd ) @@ -2088,13 +2088,13 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const rtl::OUString& aPr ScUnoHelpFunctions::SetBoolInAny( aRet, pData->IsStripData() ); else if ( aString.EqualsAscii( SC_UNONAME_ISUSER ) ) { - // all database ranges except "unnamed" are user defined + // all database ranges except "unnamed" are user defined ScUnoHelpFunctions::SetBoolInAny( aRet, ( pData->GetName() != ScGlobal::GetRscString(STR_DB_NONAME) ) ); } else if ( aString.EqualsAscii( SC_UNO_LINKDISPBIT ) ) { - // no target bitmaps for individual entries (would be all equal) + // no target bitmaps for individual entries (would be all equal) // ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_DBAREA ); } else if ( aString.EqualsAscii( SC_UNO_LINKDISPNAME ) ) @@ -2185,12 +2185,12 @@ ScDatabaseRangesObj::~ScDatabaseRangesObj() void ScDatabaseRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -2234,7 +2234,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName, bDone = aFunc.AddDBRange( aString, aNameRange, TRUE ); } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName ) @@ -2249,7 +2249,7 @@ void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName ) bDone = aFunc.DeleteDBRange( aString, TRUE ); } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } // XEnumerationAccess @@ -2267,7 +2267,7 @@ sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - //! "unbenannt" weglassen ? + //! "unbenannt" weglassen ? if (pDocShell) { @@ -2323,7 +2323,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() { SolarMutexGuard aGuard; - //! "unbenannt" weglassen ? + //! "unbenannt" weglassen ? if (pDocShell) { @@ -2348,7 +2348,7 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const rtl::OUString& aName ) { SolarMutexGuard aGuard; - //! "unbenannt" weglassen ? + //! "unbenannt" weglassen ? if (pDocShell) { diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 68ad542e3ec0..cf1f27cee254 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,34 +57,34 @@ const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() { static SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), 0, &getCppuType((sal_Int16*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_TABSTOPDIS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), 0, &getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_TABSTOPDIS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {0,0,0,0,0,0} }; return aDocDefaultsMap_Impl; } -inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } -inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } -inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; } +inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } +inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } +inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; } //------------------------------------------------------------------------ @@ -110,7 +110,7 @@ void ScDocDefaultsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // document gone + pDocShell = NULL; // document gone } } @@ -118,7 +118,7 @@ void ScDocDefaultsObj::ItemsChanged() { if (pDocShell) { - //! if not in XML import, adjust row heights + //! if not in XML import, adjust row heights pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID ); } @@ -188,8 +188,8 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue( pEntry->nWID == ATTR_CJK_FONT_LANGUAGE || pEntry->nWID == ATTR_CTL_FONT_LANGUAGE ) { - // for getPropertyValue the PoolDefaults are sufficient, - // but setPropertyValue has to be handled differently + // for getPropertyValue the PoolDefaults are sufficient, + // but setPropertyValue has to be handled differently lang::Locale aLocale; if ( aValue >>= aLocale ) @@ -223,7 +223,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue( throw lang::IllegalArgumentException(); pPool->SetPoolDefaultItem( *pNewItem ); - delete pNewItem; // copied in SetPoolDefaultItem + delete pNewItem; // copied in SetPoolDefaultItem ItemsChanged(); } @@ -233,7 +233,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const rtl::OUString& aProp throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - // use pool default if set + // use pool default if set SolarMutexGuard aGuard; @@ -306,14 +306,14 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUS USHORT nWID = pEntry->nWID; if ( nWID == ATTR_FONT || nWID == ATTR_CJK_FONT || nWID == ATTR_CTL_FONT || !nWID ) { - // static default for font is system-dependent, - // so font default is always treated as "direct value". + // static default for font is system-dependent, + // so font default is always treated as "direct value". eRet = beans::PropertyState_DIRECT_VALUE; } else { - // check if pool default is set + // check if pool default is set ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool(); if ( pPool->GetPoolDefaultItem( nWID ) != NULL ) @@ -327,7 +327,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates const uno::Sequence<rtl::OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - // the simple way: call getPropertyState + // the simple way: call getPropertyState SolarMutexGuard aGuard; const rtl::OUString* pNames = aPropertyNames.getConstArray(); @@ -363,7 +363,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const rtl::OUString& aPr throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - // always use static default + // always use static default SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx index da87ca9e3644..653fbefa0a51 100644 --- a/sc/source/ui/unoobj/detreg.cxx +++ b/sc/source/ui/unoobj/detreg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,8 +50,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */ , - void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */ , + void* pRegistryKey ) { Reference< ::registry::XRegistryKey > xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ; @@ -78,9 +78,9 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImple // Set default return value for this operation - if it failed. void* pReturn = NULL ; - if ( - ( pImplementationName != NULL ) && - ( pServiceManager != NULL ) + if ( + ( pImplementationName != NULL ) && + ( pServiceManager != NULL ) ) { // Define variables which are used in following macros. diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 3420281600aa..ded35a1148b5 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 41bf1a16859f..c042f396dab8 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -51,7 +51,7 @@ #include <toolkit/awt/vclxdevice.hxx> #include <ctype.h> -#include <float.h> // DBL_MAX +#include <float.h> // DBL_MAX #include <com/sun/star/util/Date.hpp> #include <com/sun/star/sheet/XNamedRanges.hpp> @@ -106,14 +106,14 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -// alles ohne Which-ID, Map nur fuer PropertySetInfo +// alles ohne Which-ID, Map nur fuer PropertySetInfo -//! umbenennen, sind nicht mehr nur Options +//! umbenennen, sind nicht mehr nur Options const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() { static SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_APPLYFMDES), 0, &getBooleanCppuType(), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_APPLYFMDES), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_AREALINKS), 0, &getCppuType((uno::Reference<sheet::XAreaLinks>*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, @@ -159,17 +159,17 @@ const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() return aDocOptPropertyMap_Impl; } -//! StandardDecimals als Property und vom NumberFormatter ???????? +//! StandardDecimals als Property und vom NumberFormatter ???????? const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap() { static SfxItemPropertyMapEntry aColumnsPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_OWIDTH), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLWID), 0, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_OWIDTH), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLWID), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {0,0,0,0,0,0} }; return aColumnsPropertyMap_Impl; @@ -179,12 +179,12 @@ const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() { static SfxItemPropertyMapEntry aRowsPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_CELLHGT), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLHGT), 0, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, // not sorted, not used with SfxItemPropertyMapEntry::GetByName @@ -193,15 +193,15 @@ const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() return aRowsPropertyMap_Impl; } -//! move these functions to a header file -inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } -inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } +//! move these functions to a header file +inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } +inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } //------------------------------------------------------------------------ -#define SCMODELOBJ_SERVICE "com.sun.star.sheet.SpreadsheetDocument" -#define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" -#define SCDOC_SERVICE "com.sun.star.document.OfficeDocument" +#define SCMODELOBJ_SERVICE "com.sun.star.sheet.SpreadsheetDocument" +#define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" +#define SCDOC_SERVICE "com.sun.star.document.OfficeDocument" SC_SIMPLE_SERVICE_INFO( ScAnnotationsObj, "ScAnnotationsObj", "com.sun.star.sheet.CellAnnotations" ) SC_SIMPLE_SERVICE_INFO( ScDrawPagesObj, "ScDrawPagesObj", "com.sun.star.drawing.DrawPages" ) @@ -359,7 +359,7 @@ ScModelObj::ScModelObj( ScDocShell* pDocSh ) : // pDocShell may be NULL if this is the base of a ScDocOptionsObj if ( pDocShell ) { - pDocShell->GetDocument()->AddUnoObject(*this); // SfxModel is derived from SfxListener + pDocShell->GetDocument()->AddUnoObject(*this); // SfxModel is derived from SfxListener } } @@ -530,10 +530,10 @@ uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeExcep long i; for (i=0; i<nParentLen; i++) - pPtr[i] = pParentPtr[i]; // parent types first + pPtr[i] = pParentPtr[i]; // parent types first for (i=0; i<nAggLen; i++) - pPtr[nParentLen+nThisLen+i] = pAggPtr[i]; // aggregated types last + pPtr[nParentLen+nThisLen+i] = pAggPtr[i]; // aggregated types last } return aTypes; } @@ -552,14 +552,14 @@ uno::Sequence<sal_Int8> SAL_CALL ScModelObj::getImplementationId() void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { - // Not interested in reference update hints here + // Not interested in reference update hints here if ( rHint.ISA( SfxSimpleHint ) ) { ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) { - pDocShell = NULL; // has become invalid + pDocShell = NULL; // has become invalid if (xNumberAgg.is()) { SvNumberFormatsSupplierObj* pNumFmt = @@ -569,12 +569,12 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) pNumFmt->SetNumberFormatter( NULL ); } - DELETEZ( pPrintFuncCache ); // must be deleted because it has a pointer to the DocShell + DELETEZ( pPrintFuncCache ); // must be deleted because it has a pointer to the DocShell } else if ( nId == SFX_HINT_DATACHANGED ) { - // cached data for rendering become invalid when contents change - // (if a broadcast is added to SetDrawModified, is has to be tested here, too) + // cached data for rendering become invalid when contents change + // (if a broadcast is added to SetDrawModified, is has to be tested here, too) DELETEZ( pPrintFuncCache ); @@ -588,7 +588,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) USHORT nFlags = ((const ScPointerChangedHint&)rHint).GetFlags(); if (nFlags & SC_POINTERCHANGED_NUMFMT) { - // NumberFormatter-Pointer am Uno-Objekt neu setzen + // NumberFormatter-Pointer am Uno-Objekt neu setzen if (GetFormatter().is()) { @@ -818,9 +818,9 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection, { // a sheet object is treated like an empty selection: print the used area of the sheet - if ( bCursor || bSheet ) // nothing selected -> use whole tables + if ( bCursor || bSheet ) // nothing selected -> use whole tables { - rMark.ResetMark(); // doesn't change table selection + rMark.ResetMark(); // doesn't change table selection rStatus.SetMode( SC_PRINTSEL_CURSOR ); } else @@ -865,8 +865,8 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection, } else if ( ScModelObj::getImplementation( xInterface ) == this ) { - // render the whole document - // -> no selection, all sheets + // render the whole document + // -> no selection, all sheets SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); for (SCTAB nTab = 0; nTab < nTabCount; nTab++) @@ -924,9 +924,9 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount( const uno::Any& aSelection, if ( !FillRenderMarkData( aSelection, rOptions, aMark, aStatus, aPagesStr ) ) return 0; - // The same ScPrintFuncCache object in pPrintFuncCache is used as long as - // the same selection is used (aStatus) and the document isn't changed - // (pPrintFuncCache is cleared in Notify handler) + // The same ScPrintFuncCache object in pPrintFuncCache is used as long as + // the same selection is used (aStatus) and the document isn't changed + // (pPrintFuncCache is cleared in Notify handler) if ( !pPrintFuncCache || !pPrintFuncCache->IsSameSelection( aStatus ) ) { @@ -1012,7 +1012,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 throw lang::IllegalArgumentException(); } - // printer is used as device (just for page layout), draw view is not needed + // printer is used as device (just for page layout), draw view is not needed SCTAB nTab = pPrintFuncCache->GetTabForPage( nRenderer ); @@ -1121,8 +1121,8 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec pSelRange = &aRange; } - // to increase performance, ScPrintState might be used here for subsequent - // pages of the same sheet + // to increase performance, ScPrintState might be used here for subsequent + // pages of the same sheet ScPrintFunc aFunc( pDev, pDocShell, nTab, pPrintFuncCache->GetFirstAttr(nTab), nTotalPages, pSelRange, &aStatus.GetOptions() ); aFunc.SetDrawView( pDrawView ); @@ -1346,7 +1346,7 @@ void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException) pDocShell->DoRecalc(TRUE); else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + DBG_ERROR("keine DocShell"); //! Exception oder so? } } @@ -1357,7 +1357,7 @@ void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException) pDocShell->DoHardRecalc(TRUE); else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + DBG_ERROR("keine DocShell"); //! Exception oder so? } } @@ -1367,7 +1367,7 @@ sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::Runtime if (pDocShell) return pDocShell->GetDocument()->GetAutoCalc(); - DBG_ERROR("keine DocShell"); //! Exception oder so? + DBG_ERROR("keine DocShell"); //! Exception oder so? return FALSE; } @@ -1386,7 +1386,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabled ) } else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + DBG_ERROR("keine DocShell"); //! Exception oder so? } } @@ -1426,7 +1426,7 @@ sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException) if (pDocShell) return pDocShell->GetDocument()->IsDocProtected(); - DBG_ERROR("keine DocShell"); //! Exception oder so? + DBG_ERROR("keine DocShell"); //! Exception oder so? return FALSE; } @@ -1438,7 +1438,7 @@ uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() throw(un if (pDocShell) return new ScDrawPagesObj(pDocShell); - DBG_ERROR("keine DocShell"); //! Exception oder so? + DBG_ERROR("keine DocShell"); //! Exception oder so? return NULL; } @@ -1452,7 +1452,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( { SolarMutexGuard aGuard; sheet::GoalResult aResult; - aResult.Divergence = DBL_MAX; // nichts gefunden + aResult.Divergence = DBL_MAX; // nichts gefunden if (pDocShell) { WaitObject aWait( pDocShell->GetActiveDialogParent() ); @@ -1465,7 +1465,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( aGoalString, fValue ); aResult.Result = fValue; if (bFound) - aResult.Divergence = 0.0; //! das ist gelogen + aResult.Divergence = 0.0; //! das ist gelogen } return aResult; } @@ -1492,10 +1492,10 @@ void SAL_CALL ScModelObj::consolidate( throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // das koennte theoretisch ein fremdes Objekt sein, also nur das - // oeffentliche XConsolidationDescriptor Interface benutzen, um - // die Daten in ein ScConsolidationDescriptor Objekt zu kopieren: - //! wenn es schon ein ScConsolidationDescriptor ist, direkt per getImplementation? + // das koennte theoretisch ein fremdes Objekt sein, also nur das + // oeffentliche XConsolidationDescriptor Interface benutzen, um + // die Daten in ein ScConsolidationDescriptor Objekt zu kopieren: + //! wenn es schon ein ScConsolidationDescriptor ist, direkt per getImplementation? ScConsolidationDescriptor aImpl; aImpl.setFunction( xDescriptor->getFunction() ); @@ -1557,8 +1557,8 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) return xRet; } -// XPropertySet (Doc-Optionen) -//! auch an der Applikation anbieten? +// XPropertySet (Doc-Optionen) +//! auch an der Applikation anbieten? uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo() throw(uno::RuntimeException) @@ -1630,7 +1630,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } else if ( aString.EqualsAscii( SC_UNO_APPLYFMDES ) ) { - // model is created if not there + // model is created if not there ScDrawLayer* pModel = pDocShell->MakeDrawLayer(); pModel->SetOpenInDesignMode( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); @@ -1640,7 +1640,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } else if ( aString.EqualsAscii( SC_UNO_AUTOCONTFOC ) ) { - // model is created if not there + // model is created if not there ScDrawLayer* pModel = pDocShell->MakeDrawLayer(); pModel->SetAutoControlFocus( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); @@ -1889,16 +1889,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( USHORT nType = ScServiceProvider::GetProviderType(aNameStr); if ( nType != SC_SERVICE_INVALID ) { - // drawing layer tables must be kept as long as the model is alive - // return stored instance if already set + // drawing layer tables must be kept as long as the model is alive + // return stored instance if already set switch ( nType ) { - case SC_SERVICE_GRADTAB: xRet.set(xDrawGradTab); break; - case SC_SERVICE_HATCHTAB: xRet.set(xDrawHatchTab); break; - case SC_SERVICE_BITMAPTAB: xRet.set(xDrawBitmapTab); break; - case SC_SERVICE_TRGRADTAB: xRet.set(xDrawTrGradTab); break; - case SC_SERVICE_MARKERTAB: xRet.set(xDrawMarkerTab); break; - case SC_SERVICE_DASHTAB: xRet.set(xDrawDashTab); break; + case SC_SERVICE_GRADTAB: xRet.set(xDrawGradTab); break; + case SC_SERVICE_HATCHTAB: xRet.set(xDrawHatchTab); break; + case SC_SERVICE_BITMAPTAB: xRet.set(xDrawBitmapTab); break; + case SC_SERVICE_TRGRADTAB: xRet.set(xDrawTrGradTab); break; + case SC_SERVICE_MARKERTAB: xRet.set(xDrawMarkerTab); break; + case SC_SERVICE_DASHTAB: xRet.set(xDrawDashTab); break; case SC_SERVICE_CHDATAPROV: xRet.set(xChartDataProv); break; } @@ -1915,23 +1915,23 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( { xRet.set(ScServiceProvider::MakeInstance( nType, pDocShell )); - // store created instance + // store created instance switch ( nType ) { - case SC_SERVICE_GRADTAB: xDrawGradTab.set(xRet); break; - case SC_SERVICE_HATCHTAB: xDrawHatchTab.set(xRet); break; - case SC_SERVICE_BITMAPTAB: xDrawBitmapTab.set(xRet); break; - case SC_SERVICE_TRGRADTAB: xDrawTrGradTab.set(xRet); break; - case SC_SERVICE_MARKERTAB: xDrawMarkerTab.set(xRet); break; - case SC_SERVICE_DASHTAB: xDrawDashTab.set(xRet); break; + case SC_SERVICE_GRADTAB: xDrawGradTab.set(xRet); break; + case SC_SERVICE_HATCHTAB: xDrawHatchTab.set(xRet); break; + case SC_SERVICE_BITMAPTAB: xDrawBitmapTab.set(xRet); break; + case SC_SERVICE_TRGRADTAB: xDrawTrGradTab.set(xRet); break; + case SC_SERVICE_MARKERTAB: xDrawMarkerTab.set(xRet); break; + case SC_SERVICE_DASHTAB: xDrawDashTab.set(xRet); break; case SC_SERVICE_CHDATAPROV: xChartDataProv.set(xRet); break; } } } else { - // alles was ich nicht kenn, werf ich der SvxFmMSFactory an den Hals, - // da wird dann 'ne Exception geworfen, wenn's nicht passt... + // alles was ich nicht kenn, werf ich der SvxFmMSFactory an den Hals, + // da wird dann 'ne Exception geworfen, wenn's nicht passt... try { @@ -1942,14 +1942,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( { } - // #96117# if the drawing factory created a shape, a ScShapeObj has to be used - // to support own properties like ImageMap: + // #96117# if the drawing factory created a shape, a ScShapeObj has to be used + // to support own properties like ImageMap: uno::Reference<drawing::XShape> xShape( xRet, uno::UNO_QUERY ); if ( xShape.is() ) { - xRet.clear(); // for aggregation, xShape must be the object's only ref - new ScShapeObj( xShape ); // aggregates object and modifies xShape + xRet.clear(); // for aggregation, xShape must be the object's only ref + new ScShapeObj( xShape ); // aggregates object and modifies xShape xRet.set(xShape); } } @@ -1961,14 +1961,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments const uno::Sequence<uno::Any>& aArgs ) throw(uno::Exception, uno::RuntimeException) { - //! unterscheiden zwischen eigenen Services und denen vom Drawing-Layer? + //! unterscheiden zwischen eigenen Services und denen vom Drawing-Layer? SolarMutexGuard aGuard; uno::Reference<uno::XInterface> xInt(createInstance(ServiceSpecifier)); if ( aArgs.getLength() ) { - // used only for cell value binding so far - it can be initialized after creating + // used only for cell value binding so far - it can be initialized after creating uno::Reference<lang::XInitialization> xInit( xInt, uno::UNO_QUERY ); if ( xInit.is() ) @@ -1983,9 +1983,9 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() { SolarMutexGuard aGuard; - //! warum sind die Parameter bei concatServiceNames nicht const ??? - //! return concatServiceNames( ScServiceProvider::GetAllServiceNames(), - //! SvxFmMSFactory::getAvailableServiceNames() ); + //! warum sind die Parameter bei concatServiceNames nicht const ??? + //! return concatServiceNames( ScServiceProvider::GetAllServiceNames(), + //! SvxFmMSFactory::getAvailableServiceNames() ); uno::Sequence<rtl::OUString> aMyServices(ScServiceProvider::GetAllServiceNames()); uno::Sequence<rtl::OUString> aDrawServices(SvxFmMSFactory::getAvailableServiceNames()); @@ -2038,8 +2038,8 @@ sal_Int64 SAL_CALL ScModelObj::getSomething( return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell )); } - // aggregated number formats supplier has XUnoTunnel, too - // interface from aggregated object must be obtained via queryAggregation + // aggregated number formats supplier has XUnoTunnel, too + // interface from aggregated object must be obtained via queryAggregation sal_Int64 nRet = SfxBaseModel::getSomething( rId ); if ( nRet ) @@ -2270,12 +2270,12 @@ ScDrawPagesObj::~ScDrawPagesObj() void ScDrawPagesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -2384,12 +2384,12 @@ ScTableSheetsObj::~ScTableSheetsObj() void ScTableSheetsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -2427,7 +2427,7 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE ); } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int16 nDestination ) @@ -2443,7 +2443,7 @@ void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int1 bDone = pDocShell->MoveTable( nSource, nDestination, FALSE, TRUE ); } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName, @@ -2474,7 +2474,7 @@ void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName, } } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) @@ -2485,7 +2485,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const BOOL bDone = FALSE; BOOL bIllArg = FALSE; - //! Type of aElement can be some specific interface instead of XInterface + //! Type of aElement can be some specific interface instead of XInterface if ( pDocShell ) { @@ -2493,14 +2493,14 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const if ( xInterface.is() ) { ScTableSheetObj* pSheetObj = ScTableSheetObj::getImplementation( xInterface ); - if ( pSheetObj && !pSheetObj->GetDocShell() ) // noch nicht eingefuegt? + if ( pSheetObj && !pSheetObj->GetDocShell() ) // noch nicht eingefuegt? { ScDocument* pDoc = pDocShell->GetDocument(); String aNamStr(aName); SCTAB nDummy; if ( pDoc->GetTable( aNamStr, nDummy ) ) { - // name already exists + // name already exists throw container::ElementExistException(); } else @@ -2510,7 +2510,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE ); if (bDone) pSheetObj->InitInsertSheet( pDocShell, nPosition ); - // Dokument und neuen Range am Objekt setzen + // Dokument und neuen Range am Objekt setzen } } else @@ -2525,7 +2525,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const if (bIllArg) throw lang::IllegalArgumentException(); else - throw uno::RuntimeException(); // ElementExistException is handled above + throw uno::RuntimeException(); // ElementExistException is handled above } } @@ -2537,7 +2537,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const BOOL bDone = FALSE; BOOL bIllArg = FALSE; - //! Type of aElement can be some specific interface instead of XInterface + //! Type of aElement can be some specific interface instead of XInterface if ( pDocShell ) { @@ -2545,7 +2545,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const if ( xInterface.is() ) { ScTableSheetObj* pSheetObj = ScTableSheetObj::getImplementation( xInterface ); - if ( pSheetObj && !pSheetObj->GetDocShell() ) // noch nicht eingefuegt? + if ( pSheetObj && !pSheetObj->GetDocShell() ) // noch nicht eingefuegt? { String aNamStr(aName); SCTAB nPosition; @@ -2554,7 +2554,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const ScDocFunc aFunc(*pDocShell); if ( aFunc.DeleteTable( nPosition, TRUE, TRUE ) ) { - // InsertTable kann jetzt eigentlich nicht schiefgehen... + // InsertTable kann jetzt eigentlich nicht schiefgehen... bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE ); if (bDone) pSheetObj->InitInsertSheet( pDocShell, nPosition ); @@ -2562,7 +2562,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const } else { - // not found + // not found throw container::NoSuchElementException(); } } @@ -2578,7 +2578,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const if (bIllArg) throw lang::IllegalArgumentException(); else - throw uno::RuntimeException(); // NoSuchElementException is handled above + throw uno::RuntimeException(); // NoSuchElementException is handled above } } @@ -2599,13 +2599,13 @@ void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName ) } else { - // not found + // not found throw container::NoSuchElementException(); } } if (!bDone) - throw uno::RuntimeException(); // NoSuchElementException is handled above + throw uno::RuntimeException(); // NoSuchElementException is handled above } // XCellRangesAccess @@ -2758,9 +2758,9 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const rtl::OUString& aName ) ScTableColumnsObj::ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT, SCCOL nSC, SCCOL nEC) : pDocShell( pDocSh ), - nTab ( nT ), + nTab ( nT ), nStartCol( nSC ), - nEndCol ( nEC ) + nEndCol ( nEC ) { pDocShell->GetDocument()->AddUnoObject(*this); } @@ -2777,12 +2777,12 @@ void ScTableColumnsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - //! Referenz-Update fuer Tab und Start/Ende + //! Referenz-Update fuer Tab und Start/Ende } else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -2794,7 +2794,7 @@ ScTableColumnObj* ScTableColumnsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) con if ( pDocShell && nCol <= nEndCol ) return new ScTableColumnObj( pDocShell, nCol, nTab ); - return NULL; // falscher Index + return NULL; // falscher Index } ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const rtl::OUString& aName) const @@ -2822,7 +2822,7 @@ void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 n bDone = aFunc.InsertCells( aRange, NULL, INS_INSCOLS, TRUE, TRUE ); } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) @@ -2830,7 +2830,7 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou { SolarMutexGuard aGuard; BOOL bDone = FALSE; - // Der zu loeschende Bereich muss innerhalb des Objekts liegen + // Der zu loeschende Bereich muss innerhalb des Objekts liegen if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartCol+nIndex+nCount-1 <= nEndCol ) { ScDocFunc aFunc(*pDocShell); @@ -2839,7 +2839,7 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou bDone = aFunc.DeleteCells( aRange, NULL, DEL_DELCOLS, TRUE, TRUE ); } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } // XEnumerationAccess @@ -2920,7 +2920,7 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const rtl::OUString& aName ) if ( pDocShell && nCol >= nStartCol && nCol <= nEndCol ) return TRUE; - return FALSE; // nicht gefunden + return FALSE; // nicht gefunden } // XPropertySet @@ -2962,7 +2962,7 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue( BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue ); ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT; aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, eMode, 0, TRUE, TRUE ); - // SC_SIZE_DIRECT with size 0: hide + // SC_SIZE_DIRECT with size 0: hide } else if ( aNameString.EqualsAscii( SC_UNONAME_OWIDTH ) ) { @@ -2974,7 +2974,7 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue( } else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) || aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) ) { - //! single function to set/remove all breaks? + //! single function to set/remove all breaks? BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue ); for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++) if (bSet) @@ -2996,7 +2996,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro String aNameString(aPropertyName); uno::Any aAny; - //! loop over all columns for current state? + //! loop over all columns for current state? if ( aNameString.EqualsAscii( SC_UNONAME_CELLWID ) ) { @@ -3035,9 +3035,9 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableColumnsObj ) ScTableRowsObj::ScTableRowsObj(ScDocShell* pDocSh, SCTAB nT, SCROW nSR, SCROW nER) : pDocShell( pDocSh ), - nTab ( nT ), + nTab ( nT ), nStartRow( nSR ), - nEndRow ( nER ) + nEndRow ( nER ) { pDocShell->GetDocument()->AddUnoObject(*this); } @@ -3054,12 +3054,12 @@ void ScTableRowsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - //! Referenz-Update fuer Tab und Start/Ende + //! Referenz-Update fuer Tab und Start/Ende } else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -3071,7 +3071,7 @@ ScTableRowObj* ScTableRowsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const if ( pDocShell && nRow <= nEndRow ) return new ScTableRowObj( pDocShell, nRow, nTab ); - return NULL; // falscher Index + return NULL; // falscher Index } void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount ) @@ -3088,7 +3088,7 @@ void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCou bDone = aFunc.InsertCells( aRange, NULL, INS_INSROWS, TRUE, TRUE ); } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) @@ -3096,7 +3096,7 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount { SolarMutexGuard aGuard; BOOL bDone = FALSE; - // Der zu loeschende Bereich muss innerhalb des Objekts liegen + // Der zu loeschende Bereich muss innerhalb des Objekts liegen if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartRow+nIndex+nCount-1 <= nEndRow ) { ScDocFunc aFunc(*pDocShell); @@ -3105,7 +3105,7 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount bDone = aFunc.DeleteCells( aRange, NULL, DEL_DELROWS, TRUE, TRUE ); } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } // XEnumerationAccess @@ -3212,11 +3212,11 @@ void SAL_CALL ScTableRowsObj::setPropertyValue( BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue ); ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT; aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE ); - // SC_SIZE_DIRECT with size 0: hide + // SC_SIZE_DIRECT with size 0: hide } else if ( aNameString.EqualsAscii( SC_UNONAME_CELLFILT ) ) { - //! undo etc. + //! undo etc. if (ScUnoHelpFunctions::GetBoolFromAny( aValue )) pDoc->SetRowFiltered(nStartRow, nEndRow, nTab, true); else @@ -3224,7 +3224,7 @@ void SAL_CALL ScTableRowsObj::setPropertyValue( } else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE) || aNameString.EqualsAscii( SC_UNONAME_MANPAGE) ) { - //! single function to set/remove all breaks? + //! single function to set/remove all breaks? BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue ); for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++) if (bSet) @@ -3258,7 +3258,7 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper String aNameString(aPropertyName); uno::Any aAny; - //! loop over all rows for current state? + //! loop over all rows for current state? if ( aNameString.EqualsAscii( SC_UNONAME_CELLHGT ) ) { @@ -3317,12 +3317,12 @@ ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj() void ScSpreadsheetSettingsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -3331,7 +3331,7 @@ void ScSpreadsheetSettingsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPropertySetInfo() throw(uno::RuntimeException) { - //! muss noch + //! muss noch return NULL; } @@ -3341,14 +3341,14 @@ void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - //! muss noch + //! muss noch } uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const rtl::OUString& /* aPropertyName */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - //! muss noch + //! muss noch return uno::Any(); } @@ -3371,12 +3371,12 @@ ScAnnotationsObj::~ScAnnotationsObj() void ScAnnotationsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! nTab bei Referenz-Update anpassen!!! + //! nTab bei Referenz-Update anpassen!!! if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -3454,7 +3454,7 @@ void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Run uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumeration() throw(uno::RuntimeException) { - //! iterate directly (more efficiently)? + //! iterate directly (more efficiently)? SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAnnotationsEnumeration"))); @@ -3505,7 +3505,7 @@ sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException) ScScenariosObj::ScScenariosObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), - nTab ( nT ) + nTab ( nT ) { pDocShell->GetDocument()->AddUnoObject(*this); } @@ -3522,12 +3522,12 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - //! Referenz-Update fuer Tab und Start/Ende + //! Referenz-Update fuer Tab und Start/Ende } else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -3535,7 +3535,7 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) BOOL ScScenariosObj::GetScenarioIndex_Impl( const rtl::OUString& rName, SCTAB& rIndex ) { - //! Case-insensitiv ???? + //! Case-insensitiv ???? if ( pDocShell ) { @@ -3562,7 +3562,7 @@ ScTableSheetObj* ScScenariosObj::GetObjectByIndex_Impl(sal_Int32 nIndex) if ( pDocShell && nIndex >= 0 && nIndex < nCount ) return new ScTableSheetObj( pDocShell, nTab+static_cast<SCTAB>(nIndex)+1 ); - return NULL; // kein Dokument oder falscher Index + return NULL; // kein Dokument oder falscher Index } ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const rtl::OUString& aName) @@ -3571,7 +3571,7 @@ ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const rtl::OUString& aName if ( pDocShell && GetScenarioIndex_Impl( aName, nIndex ) ) return new ScTableSheetObj( pDocShell, nTab+nIndex+1 ); - return NULL; // nicht gefunden + return NULL; // nicht gefunden } void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName, @@ -3602,7 +3602,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName, String aNameStr(aName); String aCommStr(aComment); - Color aColor( COL_LIGHTGRAY ); // Default + Color aColor( COL_LIGHTGRAY ); // Default USHORT nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY | SC_SCENARIO_PROTECT; pDocShell->MakeScenario( nTab, aNameStr, aCommStr, aColor, nFlags, aMarkData ); @@ -3698,7 +3698,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScScenariosObj::getElementNames() SCTAB nCount = (SCTAB)getCount(); uno::Sequence<rtl::OUString> aSeq(nCount); - if ( pDocShell ) // sonst ist auch Count = 0 + if ( pDocShell ) // sonst ist auch Count = 0 { String aTabName; ScDocument* pDoc = pDocShell->GetDocument(); diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx index ee4a89baf76b..3cee45eaed4a 100644 --- a/sc/source/ui/unoobj/drdefuno.cxx +++ b/sc/source/ui/unoobj/drdefuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ ScDrawDefaultsObj::ScDrawDefaultsObj(ScDocShell* pDocSh) : SvxUnoDrawPool( NULL ), pDocShell( pDocSh ) { - // SvxUnoDrawPool is initialized without model, - // draw layer is created on demand in getModelPool + // SvxUnoDrawPool is initialized without model, + // draw layer is created on demand in getModelPool pDocShell->GetDocument()->AddUnoObject(*this); } @@ -60,7 +60,7 @@ void ScDrawDefaultsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // document gone + pDocShell = NULL; // document gone } } @@ -76,7 +76,7 @@ SfxItemPool* ScDrawDefaultsObj::getModelPool( sal_Bool bReadOnly ) throw() pRet = &pModel->GetItemPool(); } if ( !pRet ) - pRet = SvxUnoDrawPool::getModelPool( bReadOnly ); // uses default pool + pRet = SvxUnoDrawPool::getModelPool( bReadOnly ); // uses default pool return pRet; } diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index 5e891ea37174..d31b41aeeeaf 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,9 +70,9 @@ ScHeaderFooterChangedHint::~ScHeaderFooterChangedHint() ScSharedHeaderFooterEditSource::ScSharedHeaderFooterEditSource( ScHeaderFooterTextData* pData ) : pTextData( pData ) { - // pTextData is held by the ScHeaderFooterTextObj. - // Text range and cursor keep a reference to their parent text, so the text object is - // always alive and the TextData is valid as long as there are children. + // pTextData is held by the ScHeaderFooterTextObj. + // Text range and cursor keep a reference to their parent text, so the text object is + // always alive and the TextData is valid as long as there are children. } ScSharedHeaderFooterEditSource::~ScSharedHeaderFooterEditSource() @@ -101,7 +101,7 @@ ScEditEngineDefaulter* ScSharedHeaderFooterEditSource::GetEditEngine() //------------------------------------------------------------------------ -// each ScHeaderFooterEditSource object has its own ScHeaderFooterTextData +// each ScHeaderFooterEditSource object has its own ScHeaderFooterTextData ScHeaderFooterEditSource::ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent, USHORT nP ) : @@ -117,7 +117,7 @@ ScHeaderFooterEditSource::ScHeaderFooterEditSource( ScHeaderFooterContentObj& rC ScHeaderFooterEditSource::~ScHeaderFooterEditSource() { - delete GetTextData(); // not accessed in ScSharedHeaderFooterEditSource dtor + delete GetTextData(); // not accessed in ScSharedHeaderFooterEditSource dtor } SvxEditSource* ScHeaderFooterEditSource::Clone() const @@ -131,9 +131,9 @@ SvxEditSource* ScHeaderFooterEditSource::Clone() const ScSharedCellEditSource::ScSharedCellEditSource( ScCellTextData* pData ) : pCellTextData( pData ) { - // pCellTextData is part of the ScCellTextObj. - // Text range and cursor keep a reference to their parent text, so the text object is - // always alive and the CellTextData is valid as long as there are children. + // pCellTextData is part of the ScCellTextObj. + // Text range and cursor keep a reference to their parent text, so the text object is + // always alive and the CellTextData is valid as long as there are children. } ScSharedCellEditSource::~ScSharedCellEditSource() @@ -172,7 +172,7 @@ ScEditEngineDefaulter* ScSharedCellEditSource::GetEditEngine() //------------------------------------------------------------------------ -// each ScCellEditSource object has its own ScCellTextData +// each ScCellEditSource object has its own ScCellTextData ScCellEditSource::ScCellEditSource( ScDocShell* pDocSh, const ScAddress& rP ) : ScSharedCellEditSource( new ScCellTextData( pDocSh, rP ) ) @@ -181,7 +181,7 @@ ScCellEditSource::ScCellEditSource( ScDocShell* pDocSh, const ScAddress& rP ) : ScCellEditSource::~ScCellEditSource() { - delete GetCellTextData(); // not accessed in ScSharedCellEditSource dtor + delete GetCellTextData(); // not accessed in ScSharedCellEditSource dtor } SvxEditSource* ScCellEditSource::Clone() const @@ -205,7 +205,7 @@ ScAnnotationEditSource::ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddre ScAnnotationEditSource::~ScAnnotationEditSource() { - SolarMutexGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor if (pDocShell) pDocShell->GetDocument()->RemoveUnoObject(*this); @@ -249,7 +249,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder() if ( pDocShell ) if ( ScPostIt* pNote = pDocShell->GetDocument()->GetNote( aCellPos ) ) if ( const EditTextObject* pEditObj = pNote->GetEditTextObject() ) - pEditEngine->SetText( *pEditObj ); // incl. Umbrueche + pEditEngine->SetText( *pEditObj ); // incl. Umbrueche bDataValid = TRUE; return pForwarder; @@ -271,7 +271,7 @@ void ScAnnotationEditSource::UpdateData() pObj->ActionChanged(); } - //! Undo !!! + //! Undo !!! aModificator.SetDocumentModified(); @@ -285,20 +285,20 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - //! Ref-Update + //! Ref-Update } else if ( rHint.ISA( SfxSimpleHint ) ) { ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden DELETEZ( pForwarder ); - DELETEZ( pEditEngine ); // EditEngine uses document's pool + DELETEZ( pEditEngine ); // EditEngine uses document's pool } else if ( nId == SFX_HINT_DATACHANGED ) - bDataValid = FALSE; // Text muss neu geholt werden + bDataValid = FALSE; // Text muss neu geholt werden } } @@ -307,9 +307,9 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint ) ScSimpleEditSource::ScSimpleEditSource( SvxTextForwarder* pForw ) : pForwarder( pForw ) { - // The same forwarder (and EditEngine) is shared by all children of the same Text object. - // Text range and cursor keep a reference to their parent text, so the text object is - // always alive and the forwarder is valid as long as there are children. + // The same forwarder (and EditEngine) is shared by all children of the same Text object. + // Text range and cursor keep a reference to their parent text, so the text object is + // always alive and the forwarder is valid as long as there are children. } ScSimpleEditSource::~ScSimpleEditSource() @@ -328,7 +328,7 @@ SvxTextForwarder* ScSimpleEditSource::GetTextForwarder() void ScSimpleEditSource::UpdateData() { - // nothing + // nothing } //------------------------------------------------------------------------ diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 3af71007dfcf..253b664b01af 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ #include "hints.hxx" #include "editsrc.hxx" #include "cellsuno.hxx" -#include "servuno.hxx" // fuer IDs +#include "servuno.hxx" // fuer IDs #include "unonames.hxx" #include "editutil.hxx" @@ -59,7 +59,7 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -// alles ohne Which-ID, Map nur fuer PropertySetInfo +// alles ohne Which-ID, Map nur fuer PropertySetInfo const SfxItemPropertySet* lcl_GetURLPropertySet() { @@ -106,15 +106,15 @@ const SfxItemPropertySet* lcl_GetFileFieldPropertySet() //------------------------------------------------------------------------ -#define SCTEXTFIELD_SERVICE "com.sun.star.text.TextField" -#define SCTEXTCONTENT_SERVICE "com.sun.star.text.TextContent" +#define SCTEXTFIELD_SERVICE "com.sun.star.text.TextField" +#define SCTEXTCONTENT_SERVICE "com.sun.star.text.TextContent" SC_SIMPLE_SERVICE_INFO( ScCellFieldsObj, "ScCellFieldsObj", "com.sun.star.text.TextFields" ) SC_SIMPLE_SERVICE_INFO( ScHeaderFieldsObj, "ScHeaderFieldsObj", "com.sun.star.text.TextFields" ) //------------------------------------------------------------------------ -// ScUnoEditEngine nur um aus einer EditEngine die Felder herauszubekommen... +// ScUnoEditEngine nur um aus einer EditEngine die Felder herauszubekommen... enum ScUnoCollectMode { @@ -126,28 +126,28 @@ enum ScUnoCollectMode class ScUnoEditEngine : public ScEditEngineDefaulter { - ScUnoCollectMode eMode; - USHORT nFieldCount; - TypeId aFieldType; - SvxFieldData* pFound; // lokale Kopie - USHORT nFieldPar; - xub_StrLen nFieldPos; - USHORT nFieldIndex; + ScUnoCollectMode eMode; + USHORT nFieldCount; + TypeId aFieldType; + SvxFieldData* pFound; // lokale Kopie + USHORT nFieldPar; + xub_StrLen nFieldPos; + USHORT nFieldIndex; public: ScUnoEditEngine(ScEditEngineDefaulter* pSource); ~ScUnoEditEngine(); - //! nPos should be xub_StrLen - virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, + //! nPos should be xub_StrLen + virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); - USHORT CountFields(TypeId aType); - SvxFieldData* FindByIndex(USHORT nIndex, TypeId aType); - SvxFieldData* FindByPos(USHORT nPar, xub_StrLen nPos, TypeId aType); + USHORT CountFields(TypeId aType); + SvxFieldData* FindByIndex(USHORT nIndex, TypeId aType); + SvxFieldData* FindByPos(USHORT nPar, xub_StrLen nPos, TypeId aType); - USHORT GetFieldPar() const { return nFieldPar; } - xub_StrLen GetFieldPos() const { return nFieldPos; } + USHORT GetFieldPar() const { return nFieldPar; } + xub_StrLen GetFieldPos() const { return nFieldPos; } }; ScUnoEditEngine::ScUnoEditEngine(ScEditEngineDefaulter* pSource) : @@ -176,7 +176,7 @@ String ScUnoEditEngine::CalcFieldValue( const SvxFieldItem& rField, String aRet(EditEngine::CalcFieldValue( rField, nPara, nPos, rTxtColor, rFldColor )); if (eMode != SC_UNO_COLLECT_NONE) { - const SvxFieldData* pFieldData = rField.GetField(); + const SvxFieldData* pFieldData = rField.GetField(); if ( pFieldData ) { if ( !aFieldType || pFieldData->Type() == aFieldType ) @@ -279,30 +279,30 @@ void ScCellFieldsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - //! Ref-Update + //! Ref-Update } else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } - // EditSource hat sich selber als Listener angemeldet + // EditSource hat sich selber als Listener angemeldet } // XIndexAccess (via XTextFields) ScCellFieldObj* ScCellFieldsObj::GetObjectByIndex_Impl(INT32 Index) const { - //! Feld-Funktionen muessen an den Forwarder !!! + //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine(); ScUnoEditEngine aTempEngine(pEditEngine); - if ( aTempEngine.FindByIndex( (USHORT)Index, NULL ) ) // in der Zelle ist der Typ egal + if ( aTempEngine.FindByIndex( (USHORT)Index, NULL ) ) // in der Zelle ist der Typ egal { USHORT nPar = aTempEngine.GetFieldPar(); xub_StrLen nPos = aTempEngine.GetFieldPos(); - ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Feld ist 1 Zeichen + ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Feld ist 1 Zeichen return new ScCellFieldObj( pDocShell, aCellPos, aSelection ); } return NULL; @@ -312,11 +312,11 @@ sal_Int32 SAL_CALL ScCellFieldsObj::getCount() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - //! Feld-Funktionen muessen an den Forwarder !!! + //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine(); ScUnoEditEngine aTempEngine(pEditEngine); - return aTempEngine.CountFields(NULL); // Felder zaehlen, in Zelle ist der Typ egal + return aTempEngine.CountFields(NULL); // Felder zaehlen, in Zelle ist der Typ egal } uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex ) @@ -395,7 +395,7 @@ void SAL_CALL ScCellFieldsObj::refresh( ) } catch(uno::RuntimeException&) { -// DBG_ERROR("a object is gone without to remove from Broadcaster"); +// DBG_ERROR("a object is gone without to remove from Broadcaster"); ++pInterfaces; ++i; } @@ -430,7 +430,7 @@ void SAL_CALL ScCellFieldsObj::removeRefreshListener( const uno::Reference<util: //------------------------------------------------------------------------ -// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht +// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht ScCellFieldObj::ScCellFieldObj(ScDocShell* pDocSh, const ScAddress& rPos, @@ -441,7 +441,7 @@ ScCellFieldObj::ScCellFieldObj(ScDocShell* pDocSh, const ScAddress& rPos, aCellPos( rPos ), aSelection( rSel ) { - // pDocShell ist Null, wenn per ServiceProvider erzeugt + // pDocShell ist Null, wenn per ServiceProvider erzeugt if (pDocShell) { @@ -456,12 +456,12 @@ uno::Any SAL_CALL ScCellFieldObj::queryAggregation( const uno::Type& rType ) throw(uno::RuntimeException) { SC_QUERYINTERFACE( text::XTextField ) - SC_QUERYINTERFACE( text::XTextContent ) // parent of XTextField + SC_QUERYINTERFACE( text::XTextContent ) // parent of XTextField SC_QUERYINTERFACE( beans::XPropertySet ) SC_QUERYINTERFACE( lang::XUnoTunnel ) SC_QUERYINTERFACE( lang::XServiceInfo ) - return OComponentHelper::queryAggregation( rType ); // XComponent + return OComponentHelper::queryAggregation( rType ); // XComponent } uno::Sequence<uno::Type> SAL_CALL ScCellFieldObj::getTypes() throw(uno::RuntimeException) @@ -481,7 +481,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellFieldObj::getTypes() throw(uno::RuntimeE pPtr[nParentLen + 3] = getCppuType((const uno::Reference<lang::XServiceInfo>*)0); for (long i=0; i<nParentLen; i++) - pPtr[i] = pParentPtr[i]; // parent types first + pPtr[i] = pParentPtr[i]; // parent types first } return aTypes; } @@ -538,21 +538,21 @@ ScCellFieldObj::~ScCellFieldObj() void ScCellFieldObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! Updates fuer aSelection (muessen erst noch erzeugt werden) !!!!!! + //! Updates fuer aSelection (muessen erst noch erzeugt werden) !!!!!! if ( rHint.ISA( ScUpdateRefHint ) ) { // const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - //! Ref-Update + //! Ref-Update } else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } - // EditSource hat sich selber als Listener angemeldet + // EditSource hat sich selber als Listener angemeldet } // per getImplementation gerufen: @@ -574,7 +574,7 @@ void ScCellFieldObj::DeleteField() if (pEditSource) { SvxTextForwarder* pForwarder = pEditSource->GetTextForwarder(); -// pEditEngine->QuickDelete( aSelection ); +// pEditEngine->QuickDelete( aSelection ); pForwarder->QuickInsertText( String(), aSelection ); pEditSource->UpdateData(); @@ -582,7 +582,7 @@ void ScCellFieldObj::DeleteField() aSelection.nEndPos = aSelection.nStartPos; //! Broadcast, um Selektion in anderen Objekten anzupassen - //! (auch bei anderen Aktionen) + //! (auch bei anderen Aktionen) } } @@ -596,11 +596,11 @@ rtl::OUString SAL_CALL ScCellFieldObj::getPresentation( sal_Bool bShowCommand ) if (pEditSource) { - //! Feld-Funktionen muessen an den Forwarder !!! + //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine(); ScUnoEditEngine aTempEngine(pEditEngine); - // Typ egal (in Zellen gibts nur URLs) + // Typ egal (in Zellen gibts nur URLs) SvxFieldData* pField = aTempEngine.FindByPos( aSelection.nStartPara, aSelection.nStartPos, 0 ); DBG_ASSERT(pField,"getPresentation: Feld nicht gefunden"); if (pField) @@ -682,16 +682,16 @@ void SAL_CALL ScCellFieldObj::setPropertyValue( rtl::OUString aStrVal; if (pEditSource) { - //! Feld-Funktionen muessen an den Forwarder !!! + //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine(); ScUnoEditEngine aTempEngine(pEditEngine); - // Typ egal (in Zellen gibts nur URLs) + // Typ egal (in Zellen gibts nur URLs) SvxFieldData* pField = aTempEngine.FindByPos( aSelection.nStartPara, aSelection.nStartPos, 0 ); DBG_ASSERT(pField,"setPropertyValue: Feld nicht gefunden"); if (pField) { - SvxURLField* pURL = (SvxURLField*)pField; // ist eine Kopie in der ScUnoEditEngine + SvxURLField* pURL = (SvxURLField*)pField; // ist eine Kopie in der ScUnoEditEngine BOOL bOk = TRUE; if ( aNameString.EqualsAscii( SC_UNONAME_URL ) ) @@ -719,7 +719,7 @@ void SAL_CALL ScCellFieldObj::setPropertyValue( } } } - else // noch nicht eingefuegt + else // noch nicht eingefuegt { if ( aNameString.EqualsAscii( SC_UNONAME_URL ) ) { @@ -761,11 +761,11 @@ uno::Any SAL_CALL ScCellFieldObj::getPropertyValue( const rtl::OUString& aProper aRet <<= text::WrapTextMode_NONE; else if (pEditSource) { - //! Feld-Funktionen muessen an den Forwarder !!! + //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine(); ScUnoEditEngine aTempEngine(pEditEngine); - // Typ egal (in Zellen gibts nur URLs) + // Typ egal (in Zellen gibts nur URLs) SvxFieldData* pField = aTempEngine.FindByPos( aSelection.nStartPara, aSelection.nStartPos, 0 ); DBG_ASSERT(pField,"getPropertyValue: Feld nicht gefunden"); if (pField) @@ -780,7 +780,7 @@ uno::Any SAL_CALL ScCellFieldObj::getPropertyValue( const rtl::OUString& aProper aRet <<= rtl::OUString( pURL->GetTargetFrame() ); } } - else // noch nicht eingefuegt + else // noch nicht eingefuegt { if ( aNameString.EqualsAscii( SC_UNONAME_URL ) ) aRet <<= rtl::OUString( aUrl ); @@ -873,7 +873,7 @@ ScHeaderFieldsObj::ScHeaderFieldsObj(ScHeaderFooterContentObj* pContent, USHORT if (pContentObj) { - pContentObj->acquire(); // darf nicht wegkommen + pContentObj->acquire(); // darf nicht wegkommen pEditSource = new ScHeaderFooterEditSource( pContentObj, nPart ); } else @@ -906,20 +906,20 @@ ScHeaderFieldsObj::~ScHeaderFieldsObj() ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(INT32 Index) const { - //! Feld-Funktionen muessen an den Forwarder !!! + //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = ((ScHeaderFooterEditSource*)pEditSource)->GetEditEngine(); ScUnoEditEngine aTempEngine(pEditEngine); TypeId aTypeId = NULL; switch (nType) { - case SC_SERVICE_PAGEFIELD: aTypeId = TYPE(SvxPageField); break; - case SC_SERVICE_PAGESFIELD: aTypeId = TYPE(SvxPagesField); break; - case SC_SERVICE_DATEFIELD: aTypeId = TYPE(SvxDateField); break; - case SC_SERVICE_TIMEFIELD: aTypeId = TYPE(SvxTimeField); break; - case SC_SERVICE_TITLEFIELD: aTypeId = TYPE(SvxFileField); break; - case SC_SERVICE_FILEFIELD: aTypeId = TYPE(SvxExtFileField); break; - case SC_SERVICE_SHEETFIELD: aTypeId = TYPE(SvxTableField); break; + case SC_SERVICE_PAGEFIELD: aTypeId = TYPE(SvxPageField); break; + case SC_SERVICE_PAGESFIELD: aTypeId = TYPE(SvxPagesField); break; + case SC_SERVICE_DATEFIELD: aTypeId = TYPE(SvxDateField); break; + case SC_SERVICE_TIMEFIELD: aTypeId = TYPE(SvxTimeField); break; + case SC_SERVICE_TITLEFIELD: aTypeId = TYPE(SvxFileField); break; + case SC_SERVICE_FILEFIELD: aTypeId = TYPE(SvxExtFileField); break; + case SC_SERVICE_SHEETFIELD: aTypeId = TYPE(SvxTableField); break; // bei SC_SERVICE_INVALID bleibt TypeId Null } SvxFieldData* pData = aTempEngine.FindByIndex( (USHORT)Index, aTypeId ); @@ -931,16 +931,16 @@ ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(INT32 Index) const USHORT nFieldType = nType; if ( nFieldType == SC_SERVICE_INVALID ) { - if ( pData->ISA( SvxPageField ) ) nFieldType = SC_SERVICE_PAGEFIELD; - else if ( pData->ISA( SvxPagesField ) ) nFieldType = SC_SERVICE_PAGESFIELD; - else if ( pData->ISA( SvxDateField ) ) nFieldType = SC_SERVICE_DATEFIELD; - else if ( pData->ISA( SvxTimeField ) ) nFieldType = SC_SERVICE_TIMEFIELD; - else if ( pData->ISA( SvxFileField ) ) nFieldType = SC_SERVICE_TITLEFIELD; + if ( pData->ISA( SvxPageField ) ) nFieldType = SC_SERVICE_PAGEFIELD; + else if ( pData->ISA( SvxPagesField ) ) nFieldType = SC_SERVICE_PAGESFIELD; + else if ( pData->ISA( SvxDateField ) ) nFieldType = SC_SERVICE_DATEFIELD; + else if ( pData->ISA( SvxTimeField ) ) nFieldType = SC_SERVICE_TIMEFIELD; + else if ( pData->ISA( SvxFileField ) ) nFieldType = SC_SERVICE_TITLEFIELD; else if ( pData->ISA( SvxExtFileField ) ) nFieldType = SC_SERVICE_FILEFIELD; - else if ( pData->ISA( SvxTableField ) ) nFieldType = SC_SERVICE_SHEETFIELD; + else if ( pData->ISA( SvxTableField ) ) nFieldType = SC_SERVICE_SHEETFIELD; } - ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Field is 1 character + ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Field is 1 character return new ScHeaderFieldObj( pContentObj, nPart, nFieldType, aSelection ); } return NULL; @@ -950,22 +950,22 @@ sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - //! Feld-Funktionen muessen an den Forwarder !!! + //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = ((ScHeaderFooterEditSource*)pEditSource)->GetEditEngine(); ScUnoEditEngine aTempEngine(pEditEngine); TypeId aTypeId = NULL; switch (nType) { - case SC_SERVICE_PAGEFIELD: aTypeId = TYPE(SvxPageField); break; - case SC_SERVICE_PAGESFIELD: aTypeId = TYPE(SvxPagesField); break; - case SC_SERVICE_DATEFIELD: aTypeId = TYPE(SvxDateField); break; - case SC_SERVICE_TIMEFIELD: aTypeId = TYPE(SvxTimeField); break; - case SC_SERVICE_TITLEFIELD: aTypeId = TYPE(SvxFileField); break; - case SC_SERVICE_FILEFIELD: aTypeId = TYPE(SvxExtFileField); break; - case SC_SERVICE_SHEETFIELD: aTypeId = TYPE(SvxTableField); break; + case SC_SERVICE_PAGEFIELD: aTypeId = TYPE(SvxPageField); break; + case SC_SERVICE_PAGESFIELD: aTypeId = TYPE(SvxPagesField); break; + case SC_SERVICE_DATEFIELD: aTypeId = TYPE(SvxDateField); break; + case SC_SERVICE_TIMEFIELD: aTypeId = TYPE(SvxTimeField); break; + case SC_SERVICE_TITLEFIELD: aTypeId = TYPE(SvxFileField); break; + case SC_SERVICE_FILEFIELD: aTypeId = TYPE(SvxExtFileField); break; + case SC_SERVICE_SHEETFIELD: aTypeId = TYPE(SvxTableField); break; } - return aTempEngine.CountFields(aTypeId); // Felder zaehlen + return aTempEngine.CountFields(aTypeId); // Felder zaehlen } uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex ) @@ -1044,7 +1044,7 @@ void SAL_CALL ScHeaderFieldsObj::refresh( ) } catch(uno::RuntimeException&) { -// DBG_ERROR("a object is gone without to remove from Broadcaster"); +// DBG_ERROR("a object is gone without to remove from Broadcaster"); ++pInterfaces; ++i; } @@ -1083,10 +1083,10 @@ SvxFileFormat lcl_UnoToSvxFileFormat( sal_Int16 nUnoValue ) { switch( nUnoValue ) { - case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH; - case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH; - case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME; -// case text::FilenameDisplayFormat::NAME_AND_EXT: + case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH; + case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH; + case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME; +// case text::FilenameDisplayFormat::NAME_AND_EXT: default: return SVXFILEFORMAT_NAME_EXT; } @@ -1096,10 +1096,10 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue ) { switch( nSvxValue ) { - case SVXFILEFORMAT_NAME_EXT: return text::FilenameDisplayFormat::NAME_AND_EXT; - case SVXFILEFORMAT_FULLPATH: return text::FilenameDisplayFormat::FULL; - case SVXFILEFORMAT_PATH: return text::FilenameDisplayFormat::PATH; -// case SVXFILEFORMAT_NAME: + case SVXFILEFORMAT_NAME_EXT: return text::FilenameDisplayFormat::NAME_AND_EXT; + case SVXFILEFORMAT_FULLPATH: return text::FilenameDisplayFormat::FULL; + case SVXFILEFORMAT_PATH: return text::FilenameDisplayFormat::PATH; +// case SVXFILEFORMAT_NAME: default: return text::FilenameDisplayFormat::NAME; } @@ -1115,11 +1115,11 @@ ScHeaderFieldObj::ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP aSelection( rSel ), nFileFormat( SVXFILEFORMAT_NAME_EXT ) { - // pContent ist Null, wenn per ServiceProvider erzeugt + // pContent ist Null, wenn per ServiceProvider erzeugt if (pContentObj) { - pContentObj->acquire(); // darf nicht wegkommen + pContentObj->acquire(); // darf nicht wegkommen pEditSource = new ScHeaderFooterEditSource( pContentObj, nPart ); } else @@ -1130,12 +1130,12 @@ uno::Any SAL_CALL ScHeaderFieldObj::queryAggregation( const uno::Type& rType ) throw(uno::RuntimeException) { SC_QUERYINTERFACE( text::XTextField ) - SC_QUERYINTERFACE( text::XTextContent ) // parent of XTextField + SC_QUERYINTERFACE( text::XTextContent ) // parent of XTextField SC_QUERYINTERFACE( beans::XPropertySet ) SC_QUERYINTERFACE( lang::XUnoTunnel ) SC_QUERYINTERFACE( lang::XServiceInfo ) - return OComponentHelper::queryAggregation( rType ); // XComponent + return OComponentHelper::queryAggregation( rType ); // XComponent } uno::Sequence<uno::Type> SAL_CALL ScHeaderFieldObj::getTypes() throw(uno::RuntimeException) @@ -1155,7 +1155,7 @@ uno::Sequence<uno::Type> SAL_CALL ScHeaderFieldObj::getTypes() throw(uno::Runtim pPtr[nParentLen + 3] = getCppuType((const uno::Reference<lang::XServiceInfo>*)0); for (long i=0; i<nParentLen; i++) - pPtr[i] = pParentPtr[i]; // parent types first + pPtr[i] = pParentPtr[i]; // parent types first } return aTypes; } @@ -1199,7 +1199,7 @@ void ScHeaderFieldObj::InitDoc( ScHeaderFooterContentObj* pContent, USHORT nP, nPart = nP; pContentObj = pContent; - pContentObj->acquire(); // darf nicht wegkommen + pContentObj->acquire(); // darf nicht wegkommen pEditSource = new ScHeaderFooterEditSource( pContentObj, nPart ); } } @@ -1266,7 +1266,7 @@ void ScHeaderFieldObj::DeleteField() if (pEditSource) { SvxTextForwarder* pForwarder = pEditSource->GetTextForwarder(); -// pEditEngine->QuickDelete( aSelection ); +// pEditEngine->QuickDelete( aSelection ); pForwarder->QuickInsertText( String(), aSelection ); pEditSource->UpdateData(); @@ -1274,7 +1274,7 @@ void ScHeaderFieldObj::DeleteField() aSelection.nEndPos = aSelection.nStartPos; //! Broadcast, um Selektion in anderen Objekten anzupassen - //! (auch bei anderen Aktionen) + //! (auch bei anderen Aktionen) } } @@ -1359,7 +1359,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScHeaderFieldObj::getPropertySe SolarMutexGuard aGuard; if (nType == SC_SERVICE_FILEFIELD) { - // file field has different properties + // file field has different properties static uno::Reference<beans::XPropertySetInfo> aFileFieldInfo = pPropSet->getPropertySetInfo(); return aFileFieldInfo; } @@ -1393,7 +1393,7 @@ void SAL_CALL ScHeaderFieldObj::setPropertyValue( DBG_ASSERT(pField,"setPropertyValue: Field not found"); if (pField) { - SvxExtFileField* pExtFile = (SvxExtFileField*)pField; // local to the ScUnoEditEngine + SvxExtFileField* pExtFile = (SvxExtFileField*)pField; // local to the ScUnoEditEngine pExtFile->SetFormat( eFormat ); pEditEngine->QuickInsertField( SvxFieldItem(*pField, EE_FEATURE_FIELD), aSelection ); pEditSource->UpdateData(); @@ -1411,7 +1411,7 @@ uno::Any SAL_CALL ScHeaderFieldObj::getPropertyValue( const rtl::OUString& aProp { SolarMutexGuard aGuard; - //! Properties? + //! Properties? uno::Any aRet; String aNameString(aPropertyName); @@ -1444,7 +1444,7 @@ uno::Any SAL_CALL ScHeaderFieldObj::getPropertyValue( const rtl::OUString& aProp } } else - eFormat = (SvxFileFormat) nFileFormat; // not inserted yet - use stored value + eFormat = (SvxFileFormat) nFileFormat; // not inserted yet - use stored value sal_Int16 nIntVal = lcl_SvxToUnoFileFormat( eFormat ); aRet <<= nIntVal; diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index ed1880380089..d12859b95db9 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,15 +58,15 @@ using ::rtl::OUStringBuffer; //------------------------------------------------------------------------ -#define SCFILTEROPTIONSOBJ_SERVICE "com.sun.star.ui.dialogs.FilterOptionsDialog" -#define SCFILTEROPTIONSOBJ_IMPLNAME "com.sun.star.comp.Calc.FilterOptionsDialog" +#define SCFILTEROPTIONSOBJ_SERVICE "com.sun.star.ui.dialogs.FilterOptionsDialog" +#define SCFILTEROPTIONSOBJ_IMPLNAME "com.sun.star.comp.Calc.FilterOptionsDialog" SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTEROPTIONSOBJ_SERVICE ) #define SC_UNONAME_FILENAME "URL" -#define SC_UNONAME_FILTERNAME "FilterName" -#define SC_UNONAME_FILTEROPTIONS "FilterOptions" -#define SC_UNONAME_INPUTSTREAM "InputStream" +#define SC_UNONAME_FILTERNAME "FilterName" +#define SC_UNONAME_FILTEROPTIONS "FilterOptions" +#define SC_UNONAME_INPUTSTREAM "InputStream" //------------------------------------------------------------------------ @@ -81,7 +81,7 @@ ScFilterOptionsObj::~ScFilterOptionsObj() // stuff for exService_... -uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance( +uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { SolarMutexGuard aGuard; @@ -155,7 +155,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) if ( !bExport && aFilterString == ScDocShell::GetAsciiFilterName() ) { - // ascii import is special... + // ascii import is special... INetURLObject aURL( aFileName ); String aExt(aURL.getExtension()); @@ -192,12 +192,12 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) // HTML import. ::std::auto_ptr<AbstractScTextImportOptionsDlg> pDlg( pFact->CreateScTextImportOptionsDlg(NULL, RID_SCDLG_TEXT_IMPORT_OPTIONS)); - + if (pDlg->Execute() == RET_OK) { LanguageType eLang = pDlg->GetLanguageType(); OUStringBuffer aBuf; - + aBuf.append(String::CreateFromInt32(static_cast<sal_Int32>(eLang))); aBuf.append(sal_Unicode(' ')); aBuf.append(pDlg->IsDateConversionSet() ? sal_Unicode('1') : sal_Unicode('0')); @@ -220,7 +220,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) if ( aFilterString == ScDocShell::GetAsciiFilterName() ) { - // ascii export (import is handled above) + // ascii export (import is handled above) INetURLObject aURL( aFileName ); String aExt(aURL.getExtension()); @@ -234,7 +234,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) } else if ( aFilterString == ScDocShell::GetLotusFilterName() ) { - // lotus is only imported + // lotus is only imported DBG_ASSERT( !bExport, "Filter Options for Lotus Export is not implemented" ); aTitle = ScGlobal::GetRscString( STR_IMPORT_LOTUS ); @@ -244,12 +244,12 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) { if ( bExport ) { - // dBase export + // dBase export aTitle = ScGlobal::GetRscString( STR_EXPORT_DBF ); } else { - // dBase import + // dBase import aTitle = ScGlobal::GetRscString( STR_IMPORT_DBF ); } // common for dBase import/export @@ -260,12 +260,12 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) { if ( bExport ) { - // DIF export + // DIF export aTitle = ScGlobal::GetRscString( STR_EXPORT_DIF ); } else { - // DIF import + // DIF import aTitle = ScGlobal::GetRscString( STR_IMPORT_DIF ); } // common for DIF import/export @@ -290,7 +290,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) delete pDlg; } - xInputStream.clear(); // don't hold the stream longer than necessary + xInputStream.clear(); // don't hold the stream longer than necessary return nRet; } diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 72c10ee29c62..56ba41e1bc40 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #include "validat.hxx" #include "document.hxx" #include "unonames.hxx" -#include "styleuno.hxx" // ScStyleNameConversion +#include "styleuno.hxx" // ScStyleNameConversion #include "tokenarray.hxx" #include "tokenuno.hxx" @@ -53,7 +53,7 @@ using namespace ::formula; //------------------------------------------------------------------------ -// Map nur fuer PropertySetInfo +// Map nur fuer PropertySetInfo const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() { @@ -87,15 +87,15 @@ sheet::ConditionOperator lcl_ConditionModeToOperator( ScConditionMode eMode ) sheet::ConditionOperator eOper = sheet::ConditionOperator_NONE; switch (eMode) { - case SC_COND_EQUAL: eOper = sheet::ConditionOperator_EQUAL; break; - case SC_COND_LESS: eOper = sheet::ConditionOperator_LESS; break; - case SC_COND_GREATER: eOper = sheet::ConditionOperator_GREATER; break; - case SC_COND_EQLESS: eOper = sheet::ConditionOperator_LESS_EQUAL; break; - case SC_COND_EQGREATER: eOper = sheet::ConditionOperator_GREATER_EQUAL; break; - case SC_COND_NOTEQUAL: eOper = sheet::ConditionOperator_NOT_EQUAL; break; - case SC_COND_BETWEEN: eOper = sheet::ConditionOperator_BETWEEN; break; - case SC_COND_NOTBETWEEN: eOper = sheet::ConditionOperator_NOT_BETWEEN; break; - case SC_COND_DIRECT: eOper = sheet::ConditionOperator_FORMULA; break; + case SC_COND_EQUAL: eOper = sheet::ConditionOperator_EQUAL; break; + case SC_COND_LESS: eOper = sheet::ConditionOperator_LESS; break; + case SC_COND_GREATER: eOper = sheet::ConditionOperator_GREATER; break; + case SC_COND_EQLESS: eOper = sheet::ConditionOperator_LESS_EQUAL; break; + case SC_COND_EQGREATER: eOper = sheet::ConditionOperator_GREATER_EQUAL; break; + case SC_COND_NOTEQUAL: eOper = sheet::ConditionOperator_NOT_EQUAL; break; + case SC_COND_BETWEEN: eOper = sheet::ConditionOperator_BETWEEN; break; + case SC_COND_NOTBETWEEN: eOper = sheet::ConditionOperator_NOT_BETWEEN; break; + case SC_COND_DIRECT: eOper = sheet::ConditionOperator_FORMULA; break; default: { // added to avoid warnings @@ -109,15 +109,15 @@ ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOper ) ScConditionMode eMode = SC_COND_NONE; switch (eOper) { - case sheet::ConditionOperator_EQUAL: eMode = SC_COND_EQUAL; break; - case sheet::ConditionOperator_LESS: eMode = SC_COND_LESS; break; - case sheet::ConditionOperator_GREATER: eMode = SC_COND_GREATER; break; - case sheet::ConditionOperator_LESS_EQUAL: eMode = SC_COND_EQLESS; break; + case sheet::ConditionOperator_EQUAL: eMode = SC_COND_EQUAL; break; + case sheet::ConditionOperator_LESS: eMode = SC_COND_LESS; break; + case sheet::ConditionOperator_GREATER: eMode = SC_COND_GREATER; break; + case sheet::ConditionOperator_LESS_EQUAL: eMode = SC_COND_EQLESS; break; case sheet::ConditionOperator_GREATER_EQUAL: eMode = SC_COND_EQGREATER; break; - case sheet::ConditionOperator_NOT_EQUAL: eMode = SC_COND_NOTEQUAL; break; - case sheet::ConditionOperator_BETWEEN: eMode = SC_COND_BETWEEN; break; - case sheet::ConditionOperator_NOT_BETWEEN: eMode = SC_COND_NOTBETWEEN; break; - case sheet::ConditionOperator_FORMULA: eMode = SC_COND_DIRECT; break; + case sheet::ConditionOperator_NOT_EQUAL: eMode = SC_COND_NOTEQUAL; break; + case sheet::ConditionOperator_BETWEEN: eMode = SC_COND_BETWEEN; break; + case sheet::ConditionOperator_NOT_BETWEEN: eMode = SC_COND_NOTBETWEEN; break; + case sheet::ConditionOperator_FORMULA: eMode = SC_COND_DIRECT; break; default: { // added to avoid warnings @@ -140,7 +140,7 @@ ScCondFormatEntryItem::ScCondFormatEntryItem() : ScTableConditionalFormat::ScTableConditionalFormat( ScDocument* pDoc, ULONG nKey, FormulaGrammar::Grammar eGrammar) { - // Eintrag aus dem Dokument lesen... + // Eintrag aus dem Dokument lesen... if ( pDoc && nKey ) { @@ -188,7 +188,7 @@ FormulaGrammar::Grammar lclResolveGrammar( FormulaGrammar::Grammar eExtGrammar, void ScTableConditionalFormat::FillFormat( ScConditionalFormat& rFormat, ScDocument* pDoc, FormulaGrammar::Grammar eGrammar) const { - // ScConditionalFormat = Core-Struktur, muss leer sein + // ScConditionalFormat = Core-Struktur, muss leer sein DBG_ASSERT( rFormat.IsEmpty(), "FillFormat: Format nicht leer" ); USHORT nCount = (USHORT)aEntries.Count(); @@ -244,7 +244,7 @@ void ScTableConditionalFormat::AddEntry_Impl(const ScCondFormatEntryItem& aEntry void ScTableConditionalFormat::DataChanged() { - // wenn's mal das "lebende Objekt" ist, muss hier was passieren... + // wenn's mal das "lebende Objekt" ist, muss hier was passieren... } // XSheetConditionalFormat @@ -344,7 +344,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( else { DBG_ERROR("falsche Property"); - //! Exception... + //! Exception... } } @@ -418,8 +418,8 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce return ( getCount() != 0 ); } -// conditional format entries have no real names -// -> generate name from index +// conditional format entries have no real names +// -> generate name from index rtl::OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) { @@ -631,12 +631,12 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, ULONG nKey, const formula::FormulaGrammar::Grammar eGrammar) : aPropSet( lcl_GetValidatePropertyMap() ) { - // Eintrag aus dem Dokument lesen... + // Eintrag aus dem Dokument lesen... BOOL bFound = FALSE; if ( pDoc && nKey ) { - const ScValidationData* pData = pDoc->GetValidationEntry( nKey ); + const ScValidationData* pData = pDoc->GetValidationEntry( nKey ); if (pData) { nMode = sal::static_int_cast<USHORT>( pData->GetOperation() ); @@ -663,13 +663,13 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, ULONG nKey, } } if (!bFound) - ClearData_Impl(); // Defaults + ClearData_Impl(); // Defaults } ScValidationData* ScTableValidationObj::CreateValidationData( ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar ) const { - // ScValidationData = Core-Struktur + // ScValidationData = Core-Struktur FormulaGrammar::Grammar eGrammar1 = lclResolveGrammar( eGrammar, meGrammar1 ); FormulaGrammar::Grammar eGrammar2 = lclResolveGrammar( eGrammar, meGrammar2 ); @@ -712,13 +712,13 @@ ScValidationData* ScTableValidationObj::CreateValidationData( ScDocument* pDoc, void ScTableValidationObj::ClearData_Impl() { - nMode = SC_COND_NONE; - nValMode = SC_VALID_ANY; + nMode = SC_COND_NONE; + nValMode = SC_VALID_ANY; bIgnoreBlank = TRUE; nShowList = sheet::TableValidationVisibility::UNSORTED; - bShowInput = FALSE; - bShowError = FALSE; - nErrorStyle = SC_VALERR_STOP; + bShowInput = FALSE; + bShowError = FALSE; + nErrorStyle = SC_VALERR_STOP; aSrcPos.Set(0,0,0); aExpr1.Erase(); aExpr2.Erase(); @@ -737,7 +737,7 @@ ScTableValidationObj::~ScTableValidationObj() void ScTableValidationObj::DataChanged() { - // wenn's mal das "lebende Objekt" ist, muss hier was passieren... + // wenn's mal das "lebende Objekt" ist, muss hier was passieren... } // XSheetCondition @@ -855,7 +855,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( SolarMutexGuard aGuard; String aString(aPropertyName); - if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) bShowInput = ScUnoHelpFunctions::GetBoolFromAny( aValue ); + if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) bShowInput = ScUnoHelpFunctions::GetBoolFromAny( aValue ); else if ( aString.EqualsAscii( SC_UNONAME_SHOWERR ) ) bShowError = ScUnoHelpFunctions::GetBoolFromAny( aValue ); else if ( aString.EqualsAscii( SC_UNONAME_IGNOREBL ) ) bIgnoreBlank = ScUnoHelpFunctions::GetBoolFromAny( aValue ); else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aValue >>= nShowList; @@ -889,14 +889,14 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( ScUnoHelpFunctions::GetEnumFromAny( aValue ); switch (eType) { - case sheet::ValidationType_ANY: nValMode = SC_VALID_ANY; break; - case sheet::ValidationType_WHOLE: nValMode = SC_VALID_WHOLE; break; + case sheet::ValidationType_ANY: nValMode = SC_VALID_ANY; break; + case sheet::ValidationType_WHOLE: nValMode = SC_VALID_WHOLE; break; case sheet::ValidationType_DECIMAL: nValMode = SC_VALID_DECIMAL; break; - case sheet::ValidationType_DATE: nValMode = SC_VALID_DATE; break; - case sheet::ValidationType_TIME: nValMode = SC_VALID_TIME; break; + case sheet::ValidationType_DATE: nValMode = SC_VALID_DATE; break; + case sheet::ValidationType_TIME: nValMode = SC_VALID_TIME; break; case sheet::ValidationType_TEXT_LEN: nValMode = SC_VALID_TEXTLEN; break; - case sheet::ValidationType_LIST: nValMode = SC_VALID_LIST; break; - case sheet::ValidationType_CUSTOM: nValMode = SC_VALID_CUSTOM; break; + case sheet::ValidationType_LIST: nValMode = SC_VALID_LIST; break; + case sheet::ValidationType_CUSTOM: nValMode = SC_VALID_CUSTOM; break; default: { // added to avoid warnings @@ -909,9 +909,9 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( ScUnoHelpFunctions::GetEnumFromAny( aValue ); switch (eStyle) { - case sheet::ValidationAlertStyle_STOP: nErrorStyle = SC_VALERR_STOP; break; + case sheet::ValidationAlertStyle_STOP: nErrorStyle = SC_VALERR_STOP; break; case sheet::ValidationAlertStyle_WARNING: nErrorStyle = SC_VALERR_WARNING; break; - case sheet::ValidationAlertStyle_INFO: nErrorStyle = SC_VALERR_INFO; break; + case sheet::ValidationAlertStyle_INFO: nErrorStyle = SC_VALERR_INFO; break; case sheet::ValidationAlertStyle_MACRO: nErrorStyle = SC_VALERR_MACRO; break; default: { @@ -971,7 +971,7 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a String aString(aPropertyName); uno::Any aRet; - if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowInput ); + if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowInput ); else if ( aString.EqualsAscii( SC_UNONAME_SHOWERR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowError ); else if ( aString.EqualsAscii( SC_UNONAME_IGNOREBL ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bIgnoreBlank ); else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aRet <<= nShowList; @@ -984,14 +984,14 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a sheet::ValidationType eType = sheet::ValidationType_ANY; switch (nValMode) { - case SC_VALID_ANY: eType = sheet::ValidationType_ANY; break; - case SC_VALID_WHOLE: eType = sheet::ValidationType_WHOLE; break; - case SC_VALID_DECIMAL: eType = sheet::ValidationType_DECIMAL; break; - case SC_VALID_DATE: eType = sheet::ValidationType_DATE; break; - case SC_VALID_TIME: eType = sheet::ValidationType_TIME; break; - case SC_VALID_TEXTLEN: eType = sheet::ValidationType_TEXT_LEN; break; - case SC_VALID_LIST: eType = sheet::ValidationType_LIST; break; - case SC_VALID_CUSTOM: eType = sheet::ValidationType_CUSTOM; break; + case SC_VALID_ANY: eType = sheet::ValidationType_ANY; break; + case SC_VALID_WHOLE: eType = sheet::ValidationType_WHOLE; break; + case SC_VALID_DECIMAL: eType = sheet::ValidationType_DECIMAL; break; + case SC_VALID_DATE: eType = sheet::ValidationType_DATE; break; + case SC_VALID_TIME: eType = sheet::ValidationType_TIME; break; + case SC_VALID_TEXTLEN: eType = sheet::ValidationType_TEXT_LEN; break; + case SC_VALID_LIST: eType = sheet::ValidationType_LIST; break; + case SC_VALID_CUSTOM: eType = sheet::ValidationType_CUSTOM; break; } aRet <<= eType; } @@ -1000,10 +1000,10 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP; switch (nErrorStyle) { - case SC_VALERR_STOP: eStyle = sheet::ValidationAlertStyle_STOP; break; - case SC_VALERR_WARNING: eStyle = sheet::ValidationAlertStyle_WARNING; break; - case SC_VALERR_INFO: eStyle = sheet::ValidationAlertStyle_INFO; break; - case SC_VALERR_MACRO: eStyle = sheet::ValidationAlertStyle_MACRO; break; + case SC_VALERR_STOP: eStyle = sheet::ValidationAlertStyle_STOP; break; + case SC_VALERR_WARNING: eStyle = sheet::ValidationAlertStyle_WARNING; break; + case SC_VALERR_INFO: eStyle = sheet::ValidationAlertStyle_INFO; break; + case SC_VALERR_MACRO: eStyle = sheet::ValidationAlertStyle_MACRO; break; } aRet <<= eStyle; } diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx index 1a03a0d57acb..c6a91c28d54d 100644 --- a/sc/source/ui/unoobj/forbiuno.cxx +++ b/sc/source/ui/unoobj/forbiuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ rtl::Reference<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh xRet = pDoc->GetForbiddenCharacters(); if ( !xRet.is() ) { - // create an empty SvxForbiddenCharactersTable for SvxUnoForbiddenCharsTable, - // so changes can be stored. + // create an empty SvxForbiddenCharactersTable for SvxUnoForbiddenCharsTable, + // so changes can be stored. xRet = new SvxForbiddenCharactersTable( pDoc->GetServiceManager() ); pDoc->SetForbiddenCharacters( xRet ); @@ -78,7 +78,7 @@ void ScForbiddenCharsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // document gone + pDocShell = NULL; // document gone } } diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 7b1efbd8e20f..1849ae4d171f 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,11 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -// registered as implementation for service FunctionAccess, -// also supports service SpreadsheetDocumentSettings (to set null date etc.) +// registered as implementation for service FunctionAccess, +// also supports service SpreadsheetDocumentSettings (to set null date etc.) -#define SCFUNCTIONACCESS_SERVICE "com.sun.star.sheet.FunctionAccess" -#define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" +#define SCFUNCTIONACCESS_SERVICE "com.sun.star.sheet.FunctionAccess" +#define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" //------------------------------------------------------------------------ @@ -75,16 +75,16 @@ using namespace com::sun::star; class ScTempDocSource { private: - ScTempDocCache& rCache; - ScDocument* pTempDoc; + ScTempDocCache& rCache; + ScDocument* pTempDoc; - static ScDocument* CreateDocument(); // create and initialize doc + static ScDocument* CreateDocument(); // create and initialize doc public: ScTempDocSource( ScTempDocCache& rDocCache ); ~ScTempDocSource(); - ScDocument* GetDocument(); + ScDocument* GetDocument(); }; //------------------------------------------------------------------------ @@ -92,7 +92,7 @@ public: // static ScDocument* ScTempDocSource::CreateDocument() { - ScDocument* pDoc = new ScDocument; // SCDOCMODE_DOCUMENT + ScDocument* pDoc = new ScDocument; // SCDOCMODE_DOCUMENT pDoc->MakeTable( 0 ); return pDoc; } @@ -156,9 +156,9 @@ void ScTempDocCache::Clear() //------------------------------------------------------------------------ -// copy results from one document into another -//! merge this with ScAreaLink::Refresh -//! copy directly without a clipboard document? +// copy results from one document into another +//! merge this with ScAreaLink::Refresh +//! copy directly without a clipboard document? BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, ScDocument* pDestDoc, const ScAddress& rDestPos ) @@ -173,7 +173,7 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); ScMarkData aSourceMark; - aSourceMark.SelectOneTable( nSrcTab ); // for CopyToClip + aSourceMark.SelectOneTable( nSrcTab ); // for CopyToClip aSourceMark.SetMarkArea( rSrcRange ); ScClipParam aClipParam(rSrcRange, false); pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aSourceMark, false); @@ -182,7 +182,7 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, HASATTR_MERGED | HASATTR_OVERLAPPED ) ) { ScPatternAttr aPattern( pSrcDoc->GetPool() ); - aPattern.GetItemSet().Put( ScMergeAttr() ); // Defaults + aPattern.GetItemSet().Put( ScMergeAttr() ); // Defaults aPattern.GetItemSet().Put( ScMergeFlagAttr() ); pClipDoc->ApplyPatternAreaTab( 0,0, MAXCOL,MAXROW, nSrcTab, aPattern ); } @@ -230,7 +230,7 @@ ScFunctionAccess::ScFunctionAccess() : mbArray( true ), // default according to behaviour of older Office versions mbValid( true ) { - StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING + StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING } ScFunctionAccess::~ScFunctionAccess() @@ -243,7 +243,7 @@ void ScFunctionAccess::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( rHint.ISA(SfxSimpleHint) && ((SfxSimpleHint&)rHint).GetId() == SFX_HINT_DEINITIALIZING ) { - // document must not be used anymore + // document must not be used anymore aDocCache.Clear(); mbValid = false; } @@ -251,7 +251,7 @@ void ScFunctionAccess::Notify( SfxBroadcaster&, const SfxHint& rHint ) // stuff for exService_... -uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance( +uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { SolarMutexGuard aGuard; @@ -385,11 +385,11 @@ BOOL lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,cons String aIntName(ScGlobal::GetAddInCollection()->FindFunction( aUpper, FALSE )); if (aIntName.Len()) { - rArray.AddExternal( aIntName.GetBuffer() ); // international name + rArray.AddExternal( aIntName.GetBuffer() ); // international name return TRUE; } - return FALSE; // no valid function name + return FALSE; // no valid function name } void lcl_AddRef( ScTokenArray& rArray, long nStartRow, long nColCount, long nRowCount ) @@ -416,8 +416,8 @@ public: // 1) virtual void visitElem( long& nCol, long& nRow, const double& elem ) // 2) virtual void visitElem( long& nCol, long& nRow, const rtl::OUString& elem ) // 3) virtual void visitElem( long& nCol, long& nRow, const uno::Any& elem ) - // the other types methods are here just to reflect the orig code and for - // completeness. + // the other types methods are here just to reflect the orig code and for + // completeness. void visitElem( long nCol, long nRow, const sal_Int16& elem ) { @@ -452,8 +452,8 @@ public: eElemClass == uno::TypeClass_FLOAT || eElemClass == uno::TypeClass_DOUBLE ) { - // #87871# accept integer types because Basic passes a floating point - // variable as byte, short or long if it's an integer number. + // #87871# accept integer types because Basic passes a floating point + // variable as byte, short or long if it's an integer number. double fVal(0.0); rElement >>= fVal; visitElem( nCol, nRow, fVal ); @@ -469,23 +469,23 @@ public: } bool hasArgError() { return mbArgError; } }; - + template< class seq > -class SequencesContainer +class SequencesContainer { uno::Sequence< uno::Sequence< seq > > maSeq; - + long& mrDocRow; bool mbOverflow; bool mbArgError; ScDocument* mpDoc; ScTokenArray& mrTokenArr; - + public: SequencesContainer( const uno::Any& rArg, ScTokenArray& rTokenArr, long& rDocRow, ScDocument* pDoc ) : mrDocRow( rDocRow ), mbOverflow(false), mbArgError(false), mpDoc( pDoc ), mrTokenArr( rTokenArr ) - { - rArg >>= maSeq; + { + rArg >>= maSeq; } void process() @@ -494,7 +494,7 @@ public: long nStartRow = mrDocRow; long nRowCount = maSeq.getLength(); long nMaxColCount = 0; - const uno::Sequence< seq >* pRowArr = maSeq.getConstArray(); + const uno::Sequence< seq >* pRowArr = maSeq.getConstArray(); for ( long nRow=0; nRow<nRowCount; nRow++ ) { long nColCount = pRowArr[nRow].getLength(); @@ -503,7 +503,7 @@ public: const seq* pColArr = pRowArr[nRow].getConstArray(); for (long nCol=0; nCol<nColCount; nCol++) if ( nCol <= MAXCOL && mrDocRow <= MAXROW ) - aVisitor.visitElem( nCol, mrDocRow, pColArr[ nCol ] ); + aVisitor.visitElem( nCol, mrDocRow, pColArr[ nCol ] ); else mbOverflow=true; mrDocRow++; @@ -527,7 +527,7 @@ static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArr aContainer.process(); rArgErr = aContainer.getArgError(); rOverflow = aContainer.getOverflow(); -} +} }; uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, @@ -541,7 +541,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, throw uno::RuntimeException(); // use cached document if not in use, temporary document otherwise - // (deleted in ScTempDocSource dtor) + // (deleted in ScTempDocSource dtor) ScTempDocSource aSource( aDocCache ); ScDocument* pDoc = aSource.GetDocument(); const static SCTAB nTempSheet = 1; @@ -558,7 +558,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, // ScCompiler::InitSymbolsEnglish(); // - // find function + // find function // ScTokenArray aTokenArr; @@ -569,14 +569,14 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, } // - // set options (null date, etc.) + // set options (null date, etc.) // if ( pOptions ) pDoc->SetDocOptions( *pOptions ); // - // add arguments to token array + // add arguments to token array // BOOL bArgErr = FALSE; @@ -604,8 +604,8 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, eClass == uno::TypeClass_FLOAT || eClass == uno::TypeClass_DOUBLE ) { - // #87871# accept integer types because Basic passes a floating point - // variable as byte, short or long if it's an integer number. + // #87871# accept integer types because Basic passes a floating point + // variable as byte, short or long if it's an integer number. double fVal = 0; rArg >>= fVal; aTokenArr.AddDouble( fVal ); @@ -619,23 +619,23 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, } else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<sal_Int16> > *)0 ) ) ) { - ArrayOfArrayProc<sal_Int16>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); + ArrayOfArrayProc<sal_Int16>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<sal_Int32> > *)0 ) ) ) { - ArrayOfArrayProc<sal_Int32>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); + ArrayOfArrayProc<sal_Int32>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<double> > *)0 ) ) ) { - ArrayOfArrayProc<double>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); + ArrayOfArrayProc<double>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<rtl::OUString> > *)0 ) ) ) { - ArrayOfArrayProc<rtl::OUString>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); + ArrayOfArrayProc<rtl::OUString>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<uno::Any> > *)0 ) ) ) { - ArrayOfArrayProc<uno::Any>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); + ArrayOfArrayProc<uno::Any>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } else if ( aType.equals( getCppuType( (uno::Reference<table::XCellRange>*)0 ) ) ) { @@ -675,13 +675,13 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, bArgErr = TRUE; } else - bArgErr = TRUE; // invalid type + bArgErr = TRUE; // invalid type } aTokenArr.AddOpCode(ocClose); aTokenArr.AddOpCode(ocStop); // - // execute formula + // execute formula // uno::Any aRet; @@ -692,10 +692,10 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, // other API compatibility grammars. ScFormulaCell* pFormula = new ScFormulaCell( pDoc, aFormulaPos, &aTokenArr, formula::FormulaGrammar::GRAM_PODF_A1, (BYTE)(mbArray ? MM_FORMULA : MM_NONE) ); - pDoc->PutCell( aFormulaPos, pFormula ); //! necessary? + pDoc->PutCell( aFormulaPos, pFormula ); //! necessary? - // call GetMatrix before GetErrCode because GetMatrix always recalculates - // if there is no matrix result + // call GetMatrix before GetErrCode because GetMatrix always recalculates + // if there is no matrix result const ScMatrix* pMat = mbArray ? pFormula->GetMatrix() : 0; USHORT nErrCode = pFormula->GetErrCode(); @@ -725,7 +725,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, } else { - // any other error: IllegalArgumentException + // any other error: IllegalArgumentException bArgErr = TRUE; } diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 9f5d7a5dd1c2..886230b6799d 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,16 +65,16 @@ using ::std::vector; //------------------------------------------------------------------------ -// fuer Sheet- und Area-Links benutzt: +// fuer Sheet- und Area-Links benutzt: const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() { static SfxItemPropertyMapEntry aSheetLinkMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_REFDELAY), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_REFDELAY), 0, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {0,0,0,0,0,0} }; return aSheetLinkMap_Impl; @@ -109,13 +109,13 @@ ScSheetLinkObj::~ScSheetLinkObj() void ScSheetLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! notify if links in document are changed - // UpdateRef is not needed here + //! notify if links in document are changed + // UpdateRef is not needed here if ( rHint.ISA( SfxSimpleHint ) ) { if ( ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) - pDocShell = NULL; // pointer is invalid + pDocShell = NULL; // pointer is invalid } else if ( rHint.ISA( ScLinkRefreshedHint ) ) { @@ -142,7 +142,7 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const } } } - return NULL; // nicht gefunden + return NULL; // nicht gefunden } // XNamed @@ -150,13 +150,13 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const rtl::OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return getFileName(); // Name ist der Dateiname (URL) + return getFileName(); // Name ist der Dateiname (URL) } void SAL_CALL ScSheetLinkObj::setName( const rtl::OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; - setFileName(aName); // Name ist der Dateiname (URL) + setFileName(aName); // Name ist der Dateiname (URL) } // XRefreshable @@ -178,7 +178,7 @@ void SAL_CALL ScSheetLinkObj::addRefreshListener( new uno::Reference<util::XRefreshListener>( xListener ); aRefreshListeners.Insert( pObj, aRefreshListeners.Count() ); - // hold one additional ref to keep this object alive as long as there are listeners + // hold one additional ref to keep this object alive as long as there are listeners if ( aRefreshListeners.Count() == 1 ) acquire(); } @@ -196,7 +196,7 @@ void SAL_CALL ScSheetLinkObj::removeRefreshListener( { aRefreshListeners.DeleteAndDestroy( n ); if ( aRefreshListeners.Count() == 0 ) - release(); // release ref for listeners + release(); // release ref for listeners break; } } @@ -302,34 +302,34 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) ScTableLink* pLink = GetLink_Impl(); if (pLink) { - // pLink->Refresh mit neuem Dateinamen bringt sfx2::LinkManager durcheinander - // darum per Hand die Tabellen umsetzen und Link per UpdateLinks neu erzeugen + // pLink->Refresh mit neuem Dateinamen bringt sfx2::LinkManager durcheinander + // darum per Hand die Tabellen umsetzen und Link per UpdateLinks neu erzeugen String aNewStr(ScGlobal::GetAbsDocName( String(rNewName), pDocShell )); - // zuerst Tabellen umsetzen + // zuerst Tabellen umsetzen ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) - if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == aFileName ) // alte Datei + if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == aFileName ) // alte Datei pDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), aNewStr, pDoc->GetLinkFlt(nTab), pDoc->GetLinkOpt(nTab), pDoc->GetLinkTab(nTab), - pDoc->GetLinkRefreshDelay(nTab) ); // nur Datei aendern + pDoc->GetLinkRefreshDelay(nTab) ); // nur Datei aendern - // Links updaten - //! Undo !!! + // Links updaten + //! Undo !!! - pLink = NULL; // wird bei UpdateLinks ungueltig - pDocShell->UpdateLinks(); // alter Link raus, evtl. neuen Link anlegen + pLink = NULL; // wird bei UpdateLinks ungueltig + pDocShell->UpdateLinks(); // alter Link raus, evtl. neuen Link anlegen - // Daten kopieren + // Daten kopieren aFileName = aNewStr; - pLink = GetLink_Impl(); // neuer Link mit neuem Namen + pLink = GetLink_Impl(); // neuer Link mit neuem Namen if (pLink) - pLink->Update(); // inkl. Paint & Undo fuer Daten + pLink->Update(); // inkl. Paint & Undo fuer Daten } } @@ -407,12 +407,12 @@ ScSheetLinksObj::~ScSheetLinksObj() void ScSheetLinksObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -423,7 +423,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(INT32 nIndex) if (pDocShell) { INT32 nCount = 0; - ScStrCollection aNames; // um doppelte wegzulassen + ScStrCollection aNames; // um doppelte wegzulassen ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) @@ -441,12 +441,12 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(INT32 nIndex) delete pData; } } - return NULL; // kein Dokument oder Index zu gross + return NULL; // kein Dokument oder Index zu gross } ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const rtl::OUString& aName) { - // Name ist der Dateiname + // Name ist der Dateiname if (pDocShell) { @@ -457,7 +457,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const rtl::OUString& aName for (SCTAB nTab=0; nTab<nTabCount; nTab++) if (pDoc->IsLinked(nTab)) { - //! case-insensitiv ??? + //! case-insensitiv ??? String aLinkDoc = pDoc->GetLinkDoc( nTab ); if ( aLinkDoc == aNameStr ) return new ScSheetLinkObj( pDocShell, aNameStr ); @@ -484,7 +484,7 @@ sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException) INT32 nCount = 0; if (pDocShell) { - ScStrCollection aNames; // um doppelte wegzulassen + ScStrCollection aNames; // um doppelte wegzulassen ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) @@ -543,7 +543,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // Name ist der Dateiname + // Name ist der Dateiname if (pDocShell) { @@ -554,7 +554,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) for (SCTAB nTab=0; nTab<nTabCount; nTab++) if (pDoc->IsLinked(nTab)) { - //! case-insensitiv ??? + //! case-insensitiv ??? String aLinkDoc(pDoc->GetLinkDoc( nTab )); if ( aLinkDoc == aNameStr ) return TRUE; @@ -566,11 +566,11 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // Name ist der Dateiname + // Name ist der Dateiname if (pDocShell) { - ScStrCollection aNames; // um doppelte wegzulassen + ScStrCollection aNames; // um doppelte wegzulassen ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); String aName; @@ -617,7 +617,7 @@ ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, USHORT nPos ) } } } - return NULL; // nicht gefunden + return NULL; // nicht gefunden } ScAreaLinkObj::ScAreaLinkObj(ScDocShell* pDocSh, USHORT nP) : @@ -636,20 +636,20 @@ ScAreaLinkObj::~ScAreaLinkObj() void ScAreaLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! notify if links in document are changed - // UpdateRef is not needed here + //! notify if links in document are changed + // UpdateRef is not needed here if ( rHint.ISA( SfxSimpleHint ) ) { if ( ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) - pDocShell = NULL; // pointer is invalid + pDocShell = NULL; // pointer is invalid } else if ( rHint.ISA( ScLinkRefreshedHint ) ) { const ScLinkRefreshedHint& rLH = (const ScLinkRefreshedHint&) rHint; if ( rLH.GetLinkType() == SC_LINKREFTYPE_AREA ) { - // get this link to compare dest position + // get this link to compare dest position ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if ( pLink && pLink->GetDestArea().aStart == rLH.GetDestPos() ) Refreshed_Impl(); @@ -666,25 +666,25 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) { - String aFile (pLink->GetFile()); + String aFile (pLink->GetFile()); String aFilter (pLink->GetFilter()); String aOptions (pLink->GetOptions()); String aSource (pLink->GetSource()); ScRange aDest (pLink->GetDestArea()); - ULONG nRefresh = pLink->GetRefreshDelay(); + ULONG nRefresh = pLink->GetRefreshDelay(); - //! Undo fuer Loeschen - //! Undo zusammenfassen + //! Undo fuer Loeschen + //! Undo zusammenfassen sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); pLinkManager->Remove( pLink ); - pLink = NULL; // bei Remove geloescht + pLink = NULL; // bei Remove geloescht - BOOL bFitBlock = TRUE; // verschieben, wenn durch Update Groesse geaendert + BOOL bFitBlock = TRUE; // verschieben, wenn durch Update Groesse geaendert if (pNewFile) { aFile = String( *pNewFile ); - aFile = ScGlobal::GetAbsDocName( aFile, pDocShell ); //! in InsertAreaLink? + aFile = ScGlobal::GetAbsDocName( aFile, pDocShell ); //! in InsertAreaLink? } if (pNewFilter) aFilter = String( *pNewFilter ); @@ -695,7 +695,7 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr if (pNewDest) { ScUnoConversion::FillScRange( aDest, *pNewDest ); - bFitBlock = FALSE; // neuer Bereich angegeben -> keine Inhalte verschieben + bFitBlock = FALSE; // neuer Bereich angegeben -> keine Inhalte verschieben } ScDocFunc aFunc(*pDocShell); @@ -729,7 +729,7 @@ void SAL_CALL ScAreaLinkObj::addRefreshListener( new uno::Reference<util::XRefreshListener>( xListener ); aRefreshListeners.Insert( pObj, aRefreshListeners.Count() ); - // hold one additional ref to keep this object alive as long as there are listeners + // hold one additional ref to keep this object alive as long as there are listeners if ( aRefreshListeners.Count() == 1 ) acquire(); } @@ -747,7 +747,7 @@ void SAL_CALL ScAreaLinkObj::removeRefreshListener( { aRefreshListeners.DeleteAndDestroy( n ); if ( aRefreshListeners.Count() == 0 ) - release(); // release ref for listeners + release(); // release ref for listeners break; } } @@ -832,7 +832,7 @@ uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const rtl::OUString& aPropert SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAreaLinkObj ) -// internal: +// internal: rtl::OUString ScAreaLinkObj::getFileName(void) const { @@ -950,12 +950,12 @@ ScAreaLinksObj::~ScAreaLinksObj() void ScAreaLinksObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -966,7 +966,7 @@ ScAreaLinkObj* ScAreaLinksObj::GetObjectByIndex_Impl(INT32 nIndex) if ( pDocShell && nIndex >= 0 && nIndex < getCount() ) return new ScAreaLinkObj( pDocShell, (USHORT)nIndex ); - return NULL; // nicht gefunden + return NULL; // nicht gefunden } void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestPos, @@ -985,12 +985,12 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP String aSourceStr (aSourceArea); ScAddress aDestAddr( (SCCOL)aDestPos.Column, (SCROW)aDestPos.Row, aDestPos.Sheet ); - aFileStr = ScGlobal::GetAbsDocName( aFileStr, pDocShell ); //! in InsertAreaLink ??? + aFileStr = ScGlobal::GetAbsDocName( aFileStr, pDocShell ); //! in InsertAreaLink ??? ScDocFunc aFunc(*pDocShell); aFunc.InsertAreaLink( aFileStr, aFilterStr, aOptionStr, aSourceStr, ScRange(aDestAddr), - 0, FALSE, TRUE ); // keine Inhalte verschieben + 0, FALSE, TRUE ); // keine Inhalte verschieben } } @@ -1000,7 +1000,7 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Runti ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, (USHORT)nIndex); if (pLink) { - //! SetAddUndo oder so + //! SetAddUndo oder so sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); pLinkManager->Remove( pLink ); @@ -1081,13 +1081,13 @@ ScDDELinkObj::~ScDDELinkObj() void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! notify if links in document are changed - // UpdateRef is not needed here + //! notify if links in document are changed + // UpdateRef is not needed here if ( rHint.ISA( SfxSimpleHint ) ) { if ( ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) - pDocShell = NULL; // pointer is invalid + pDocShell = NULL; // pointer is invalid } else if ( rHint.ISA( ScLinkRefreshedHint ) ) { @@ -1095,7 +1095,7 @@ void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( rLH.GetLinkType() == SC_LINKREFTYPE_DDE && rLH.GetDdeAppl() == aAppl && rLH.GetDdeTopic() == aTopic && - rLH.GetDdeItem() == aItem ) //! mode is ignored + rLH.GetDdeItem() == aItem ) //! mode is ignored Refreshed_Impl(); } } @@ -1104,7 +1104,7 @@ void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) String lcl_BuildDDEName( const String& rAppl, const String& rTopic, const String& rItem ) { - // Appl|Topic!Item (wie Excel) + // Appl|Topic!Item (wie Excel) String aRet = rAppl; aRet += '|'; aRet += rTopic; @@ -1121,7 +1121,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException) void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException) { - // name can't be changed (formulas wouldn't find the link) + // name can't be changed (formulas wouldn't find the link) throw uno::RuntimeException(); } @@ -1130,7 +1130,7 @@ void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(un rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - //! Test, ob Link noch im Dokument enthalten? + //! Test, ob Link noch im Dokument enthalten? return aAppl; } @@ -1138,7 +1138,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeExceptio rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - //! Test, ob Link noch im Dokument enthalten? + //! Test, ob Link noch im Dokument enthalten? return aTopic; } @@ -1146,7 +1146,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) rtl::OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - //! Test, ob Link noch im Dokument enthalten? + //! Test, ob Link noch im Dokument enthalten? return aItem; } @@ -1160,7 +1160,7 @@ void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException) { ScDocument* pDoc = pDocShell->GetDocument(); (void)pDoc->UpdateDdeLink( aAppl, aTopic, aItem ); - //! Fehler abfragen + //! Fehler abfragen } } @@ -1173,7 +1173,7 @@ void SAL_CALL ScDDELinkObj::addRefreshListener( new uno::Reference<util::XRefreshListener>( xListener ); aRefreshListeners.Insert( pObj, aRefreshListeners.Count() ); - // hold one additional ref to keep this object alive as long as there are listeners + // hold one additional ref to keep this object alive as long as there are listeners if ( aRefreshListeners.Count() == 1 ) acquire(); } @@ -1191,7 +1191,7 @@ void SAL_CALL ScDDELinkObj::removeRefreshListener( { aRefreshListeners.DeleteAndDestroy( n ); if ( aRefreshListeners.Count() == 0 ) - release(); // release ref for listeners + release(); // release ref for listeners break; } } @@ -1292,12 +1292,12 @@ ScDDELinksObj::~ScDDELinksObj() void ScDDELinksObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx index 8160cd470424..281997d31a53 100644 --- a/sc/source/ui/unoobj/listenercalls.cxx +++ b/sc/source/ui/unoobj/listenercalls.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index f0c1798e8c73..a148c9f476cd 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,17 @@ SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unk //------------------------------------------------------------------------ -// static +// static uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::Any& rAny ) { if ( rAny.getValueTypeClass() == uno::TypeClass_INTERFACE ) { return uno::Reference<uno::XInterface>(rAny, uno::UNO_QUERY); } - return uno::Reference<uno::XInterface>(); //! Exception? + return uno::Reference<uno::XInterface>(); //! Exception? } -// static +// static sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp, const rtl::OUString& rName, sal_Bool bDefault ) { @@ -67,11 +67,11 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPrope try { uno::Any aAny(xProp->getPropertyValue( rName )); - //! type conversion??? - // operator >>= shouldn't be used for bool (?) + //! type conversion??? + // operator >>= shouldn't be used for bool (?) if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN ) { - //! safe way to get bool value from any??? + //! safe way to get bool value from any??? bRet = *(sal_Bool*)aAny.getValue(); } } @@ -83,7 +83,7 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPrope return bRet; } -// static +// static sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertySet>& xProp, const rtl::OUString& rName, long nDefault ) { @@ -92,7 +92,7 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XProp { try { - //! type conversion??? + //! type conversion??? xProp->getPropertyValue( rName ) >>= nRet; } catch(uno::Exception&) @@ -103,7 +103,7 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XProp return nRet; } -// static +// static sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XPropertySet>& xProp, const rtl::OUString& rName, long nDefault ) { @@ -116,12 +116,12 @@ sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XProp if ( aAny.getValueTypeClass() == uno::TypeClass_ENUM ) { - //! get enum value from any??? + //! get enum value from any??? nRet = *(sal_Int32*)aAny.getValue(); } else { - //! type conversion??? + //! type conversion??? aAny >>= nRet; } } @@ -153,7 +153,7 @@ OUString ScUnoHelpFunctions::GetStringProperty( return aRet; } -// static +// static sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny ) { if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN ) @@ -161,7 +161,7 @@ sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny ) return FALSE; } -// static +// static sal_Int16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny ) { sal_Int16 nRet = 0; @@ -170,7 +170,7 @@ sal_Int16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny ) return 0; } -// static +// static sal_Int32 ScUnoHelpFunctions::GetInt32FromAny( const uno::Any& aAny ) { sal_Int32 nRet = 0; @@ -179,7 +179,7 @@ sal_Int32 ScUnoHelpFunctions::GetInt32FromAny( const uno::Any& aAny ) return 0; } -// static +// static sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny ) { sal_Int32 nRet = 0; @@ -190,14 +190,14 @@ sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny ) return nRet; } -// static +// static void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, sal_Bool bValue ) { rAny.setValue( &bValue, getBooleanCppuType() ); } // static -void ScUnoHelpFunctions::SetOptionalPropertyValue( +void ScUnoHelpFunctions::SetOptionalPropertyValue( Reference<beans::XPropertySet>& rPropSet, const sal_Char* pPropName, const Any& rVal ) { try @@ -278,7 +278,7 @@ ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess>& rNameObj ) : xNameAccess( rNameObj ) { - //! test for XIndexAccess interface at rNameObj, use that instead! + //! test for XIndexAccess interface at rNameObj, use that instead! if ( xNameAccess.is() ) aNames = xNameAccess->getElementNames(); diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index abc2eaef0514..d85f24fd1484 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap() //------------------------------------------------------------------------ -#define SCNAMEDRANGEOBJ_SERVICE "com.sun.star.sheet.NamedRange" +#define SCNAMEDRANGEOBJ_SERVICE "com.sun.star.sheet.NamedRange" SC_SIMPLE_SERVICE_INFO( ScLabelRangeObj, "ScLabelRangeObj", "com.sun.star.sheet.LabelRange" ) SC_SIMPLE_SERVICE_INFO( ScLabelRangesObj, "ScLabelRangesObj", "com.sun.star.sheet.LabelRanges" ) @@ -94,7 +94,7 @@ SC_SIMPLE_SERVICE_INFO( ScNamedRangesObj, "ScNamedRangesObj", "com.sun.star.shee sal_Bool lcl_UserVisibleName( const ScRangeData* pData ) { - //! als Methode an ScRangeData + //! als Methode an ScRangeData return ( pData && !pData->HasType( RT_DATABASE ) && !pData->HasType( RT_SHARED ) ); } @@ -117,10 +117,10 @@ ScNamedRangeObj::~ScNamedRangeObj() void ScNamedRangeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Ref-Update interessiert nicht + // Ref-Update interessiert nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } // Hilfsfuntionen @@ -137,7 +137,7 @@ ScRangeData* ScNamedRangeObj::GetRangeData_Impl() if (pNames->SearchName( aName, nPos )) { pRet = (*pNames)[nPos]; - pRet->ValidateTabRefs(); // adjust relative tab refs to valid tables + pRet->ValidateTabRefs(); // adjust relative tab refs to valid tables } } } @@ -189,11 +189,11 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p ScDocFunc aFunc(*pDocShell); aFunc.SetNewRangeNames( pNewRanges, mpParent->IsModifyAndBroadcast()); - aName = aInsName; //! broadcast? + aName = aInsName; //! broadcast? } else { - delete pNew; //! uno::Exception/Fehler oder so + delete pNew; //! uno::Exception/Fehler oder so delete pNewRanges; } } @@ -212,14 +212,14 @@ void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; - //! Formeln anpassen ????? + //! Formeln anpassen ????? String aNewStr(aNewName); // GRAM_PODF_A1 for API compatibility. Modify_Impl( &aNewStr, NULL, NULL, NULL, NULL,formula::FormulaGrammar::GRAM_PODF_A1 ); - if ( aName != aNewStr ) // some error occured... - throw uno::RuntimeException(); // no other exceptions specified + if ( aName != aNewStr ) // some error occured... + throw uno::RuntimeException(); // no other exceptions specified } rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException) @@ -259,17 +259,17 @@ table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition() if (pData) aPos = pData->GetPos(); table::CellAddress aAddress; - aAddress.Column = aPos.Col(); - aAddress.Row = aPos.Row(); - aAddress.Sheet = aPos.Tab(); + aAddress.Column = aPos.Col(); + aAddress.Row = aPos.Row(); + aAddress.Sheet = aPos.Tab(); if (pDocShell) { SCTAB nDocTabs = pDocShell->GetDocument()->GetTableCount(); if ( aAddress.Sheet >= nDocTabs && nDocTabs > 0 ) { - // Even after ValidateTabRefs, the position can be invalid if - // the content points to preceding tables. The resulting string - // is invalid in any case, so the position is just shifted. + // Even after ValidateTabRefs, the position can be invalid if + // the content points to preceding tables. The resulting string + // is invalid in any case, so the position is just shifted. aAddress.Sheet = nDocTabs - 1; } } @@ -294,10 +294,10 @@ sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException) { // do not return internal RT_* flags // see property 'IsSharedFormula' for RT_SHARED - if ( pData->HasType(RT_CRITERIA) ) nType |= sheet::NamedRangeFlag::FILTER_CRITERIA; - if ( pData->HasType(RT_PRINTAREA) ) nType |= sheet::NamedRangeFlag::PRINT_AREA; - if ( pData->HasType(RT_COLHEADER) ) nType |= sheet::NamedRangeFlag::COLUMN_HEADER; - if ( pData->HasType(RT_ROWHEADER) ) nType |= sheet::NamedRangeFlag::ROW_HEADER; + if ( pData->HasType(RT_CRITERIA) ) nType |= sheet::NamedRangeFlag::FILTER_CRITERIA; + if ( pData->HasType(RT_PRINTAREA) ) nType |= sheet::NamedRangeFlag::PRINT_AREA; + if ( pData->HasType(RT_COLHEADER) ) nType |= sheet::NamedRangeFlag::COLUMN_HEADER; + if ( pData->HasType(RT_ROWHEADER) ) nType |= sheet::NamedRangeFlag::ROW_HEADER; } return nType; } @@ -307,10 +307,10 @@ void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) throw(uno::RuntimeE // see property 'IsSharedFormula' for RT_SHARED SolarMutexGuard aGuard; sal_uInt16 nNewType = RT_NAME; - if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA; - if ( nUnoType & sheet::NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA; - if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER ) nNewType |= RT_COLHEADER; - if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER; + if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA; + if ( nUnoType & sheet::NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA; + if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER ) nNewType |= RT_COLHEADER; + if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER; // GRAM_PODF_A1 for API compatibility. Modify_Impl( NULL, NULL, NULL, NULL, &nNewType,formula::FormulaGrammar::GRAM_PODF_A1 ); @@ -355,7 +355,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells() ScRangeData* pData = GetRangeData_Impl(); if ( pData && pData->IsValidReference( aRange ) ) { - //! static Funktion um ScCellObj/ScCellRangeObj zu erzeugen am ScCellRangeObj ??? + //! static Funktion um ScCellObj/ScCellRangeObj zu erzeugen am ScCellRangeObj ??? if ( aRange.aStart == aRange.aEnd ) return new ScCellObj( pDocShell, aRange.aStart ); @@ -401,7 +401,7 @@ uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPrope uno::Any aRet; if ( rPropertyName.equalsAscii( SC_UNO_LINKDISPBIT ) ) { - // no target bitmaps for individual entries (would be all equal) + // no target bitmaps for individual entries (would be all equal) // ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_RANGENAME ); } else if ( rPropertyName.equalsAscii( SC_UNO_LINKDISPNAME ) ) @@ -505,12 +505,12 @@ ScNamedRangesObj::~ScNamedRangesObj() void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -533,7 +533,7 @@ ScNamedRangeObj* ScNamedRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) for (sal_uInt16 i=0; i<nCount; i++) { ScRangeData* pData = (*pNames)[i]; - if (lcl_UserVisibleName(pData)) // interne weglassen + if (lcl_UserVisibleName(pData)) // interne weglassen { if ( nPos == nIndex ) return new ScNamedRangeObj(this, pDocShell, pData->GetName()); @@ -562,10 +562,10 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName, ScAddress aPos( (SCCOL)aPosition.Column, (SCROW)aPosition.Row, aPosition.Sheet ); sal_uInt16 nNewType = RT_NAME; - if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA; - if ( nUnoType & sheet::NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA; - if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER ) nNewType |= RT_COLHEADER; - if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER; + if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA; + if ( nUnoType & sheet::NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA; + if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER ) nNewType |= RT_COLHEADER; + if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER; BOOL bDone = FALSE; if (pDocShell) @@ -594,14 +594,14 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName, } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& aSource, sheet::Border aBorder ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; - //! das darf kein enum sein, weil mehrere Bits gesetzt sein koennen !!! + //! das darf kein enum sein, weil mehrere Bits gesetzt sein koennen !!! sal_Bool bTop = ( aBorder == sheet::Border_TOP ); sal_Bool bLeft = ( aBorder == sheet::Border_LEFT ); @@ -612,10 +612,10 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& ScUnoConversion::FillScRange( aRange, aSource ); sal_uInt16 nFlags = 0; - if (bTop) nFlags |= NAME_TOP; - if (bLeft) nFlags |= NAME_LEFT; + if (bTop) nFlags |= NAME_TOP; + if (bLeft) nFlags |= NAME_LEFT; if (bBottom) nFlags |= NAME_BOTTOM; - if (bRight) nFlags |= NAME_RIGHT; + if (bRight) nFlags |= NAME_RIGHT; if (nFlags) { @@ -649,7 +649,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName ) } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPosition ) @@ -686,7 +686,7 @@ sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException) { sal_uInt16 nCount = pNames->GetCount(); for (sal_uInt16 i=0; i<nCount; i++) - if (lcl_UserVisibleName( (*pNames)[i] )) // interne weglassen + if (lcl_UserVisibleName( (*pNames)[i] )) // interne weglassen ++nRet; } } @@ -709,7 +709,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScNamedRangesObj::getElementType() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< sheet::XNamedRange >*)0); // muss zu getByIndex passen + return ::getCppuType((const uno::Reference< sheet::XNamedRange >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScNamedRangesObj::hasElements() throw(uno::RuntimeException) @@ -775,7 +775,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() ScRangeName* pNames = pDocShell->GetDocument()->GetRangeName(); if (pNames) { - long nVisCount = getCount(); // Namen mit lcl_UserVisibleName + long nVisCount = getCount(); // Namen mit lcl_UserVisibleName uno::Sequence<rtl::OUString> aSeq(nVisCount); rtl::OUString* pAry = aSeq.getArray(); @@ -787,7 +787,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() if ( lcl_UserVisibleName(pData) ) pAry[nVisPos++] = pData->GetName(); } -// DBG_ASSERT(nVisPos == nVisCount, "huch, verzaehlt?"); +// DBG_ASSERT(nVisPos == nVisCount, "huch, verzaehlt?"); return aSeq; } } @@ -911,10 +911,10 @@ ScLabelRangeObj::~ScLabelRangeObj() void ScLabelRangeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - //! Ref-Update !!! + //! Ref-Update !!! if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } // Hilfsfuntionen @@ -944,7 +944,7 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData ) ScRangePair* pEntry = xNewList->Find( aRange ); if (pEntry) { - xNewList->Remove( pEntry ); // nur aus der Liste entfernt, nicht geloescht + xNewList->Remove( pEntry ); // nur aus der Liste entfernt, nicht geloescht if ( pLabel ) pEntry->GetRange(0) = *pLabel; @@ -963,10 +963,10 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData ) pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID ); pDocShell->SetDocumentModified(); - //! Undo ?!?! (hier und aus Dialog) + //! Undo ?!?! (hier und aus Dialog) if ( pLabel ) - aRange = *pLabel; // Objekt anpassen, um Range wiederzufinden + aRange = *pLabel; // Objekt anpassen, um Range wiederzufinden } } } @@ -1031,12 +1031,12 @@ ScLabelRangesObj::~ScLabelRangesObj() void ScLabelRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -1086,7 +1086,7 @@ void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelAre pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID ); pDocShell->SetDocumentModified(); - //! Undo ?!?! (hier und aus Dialog) + //! Undo ?!?! (hier und aus Dialog) } } } @@ -1121,12 +1121,12 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex ) pDocShell->SetDocumentModified(); bDone = TRUE; - //! Undo ?!?! (hier und aus Dialog) + //! Undo ?!?! (hier und aus Dialog) } } } if (!bDone) - throw uno::RuntimeException(); // no other exceptions specified + throw uno::RuntimeException(); // no other exceptions specified } // container::XEnumerationAccess @@ -1169,7 +1169,7 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScLabelRangesObj::getElementType() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< sheet::XLabelRange >*)0); // muss zu getByIndex passen + return ::getCppuType((const uno::Reference< sheet::XLabelRange >*)0); // muss zu getByIndex passen } diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 7860ba8fbde6..7be42a6ae54a 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <vcl/svapp.hxx> #include "notesuno.hxx" #include "textuno.hxx" -#include "cellsuno.hxx" // getParent +#include "cellsuno.hxx" // getParent #include "docsh.hxx" #include "docfunc.hxx" #include "hints.hxx" @@ -70,10 +70,10 @@ const SvxItemPropertySet* lcl_GetAnnotationPropertySet() SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties + SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties {0,0,0,0,0,0} }; - static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); + static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aAnnotationPropertySet_Impl; } @@ -91,8 +91,8 @@ ScAnnotationObj::ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos) : { pDocShell->GetDocument()->AddUnoObject(*this); - // pUnoText is allocated on demand (GetUnoText) - // can't be aggregated because getString/setString is handled here + // pUnoText is allocated on demand (GetUnoText) + // can't be aggregated because getString/setString is handled here } ScAnnotationObj::~ScAnnotationObj() @@ -110,12 +110,12 @@ void ScAnnotationObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - //! Ref-Update + //! Ref-Update } else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -126,8 +126,8 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno: { SolarMutexGuard aGuard; - // Parent der Notiz ist die zugehoerige Zelle - //! existierendes Objekt finden und zurueckgeben ??? + // Parent der Notiz ist die zugehoerige Zelle + //! existierendes Objekt finden und zurueckgeben ??? if (pDocShell) return (cppu::OWeakObject*)new ScCellObj( pDocShell, aCellPos ); @@ -138,8 +138,8 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno: void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>& /* Parent */ ) throw(lang::NoSupportException, uno::RuntimeException) { - // hamma nich - //! Exception oder so ??! + // hamma nich + //! Exception oder so ??! } // XSimpleText @@ -148,7 +148,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // Notizen brauchen keine Extrawurst + // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursor(); } @@ -157,7 +157,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRa throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // Notizen brauchen keine Extrawurst + // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursorByRange(aTextPosition); } @@ -213,9 +213,9 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc { SolarMutexGuard aGuard; table::CellAddress aAdr; - aAdr.Sheet = aCellPos.Tab(); - aAdr.Column = aCellPos.Col(); - aAdr.Row = aCellPos.Row(); + aAdr.Sheet = aCellPos.Tab(); + aAdr.Column = aCellPos.Col(); + aAdr.Row = aCellPos.Row(); return aAdr; } @@ -281,11 +281,11 @@ ScAnnotationShapeObj::ScAnnotationShapeObj(ScDocShell* pDocSh, const ScAddress& { pDocShell->GetDocument()->AddUnoObject(*this); - // pUnoText is allocated on demand (GetUnoText) - // can't be aggregated because getString/setString is handled here + // pUnoText is allocated on demand (GetUnoText) + // can't be aggregated because getString/setString is handled here } -SvxUnoText& ScAnnotationShapeObj::GetUnoText() +SvxUnoText& ScAnnotationShapeObj::GetUnoText() { if (!pUnoText) { @@ -320,12 +320,12 @@ void ScAnnotationShapeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - //! Ref-Update + //! Ref-Update } else if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -336,8 +336,8 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationShapeObj::getParent() throw { SolarMutexGuard aGuard; - // Parent der Notiz ist die zugehoerige Zelle - //! existierendes Objekt finden und zurueckgeben ??? + // Parent der Notiz ist die zugehoerige Zelle + //! existierendes Objekt finden und zurueckgeben ??? if (pDocShell) return (cppu::OWeakObject*)new ScCellObj( pDocShell, aCellPos ); @@ -348,8 +348,8 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationShapeObj::getParent() throw void SAL_CALL ScAnnotationShapeObj::setParent( const uno::Reference<uno::XInterface>& /* Parent */ ) throw(lang::NoSupportException, uno::RuntimeException) { - // hamma nich - //! Exception oder so ??! + // hamma nich + //! Exception oder so ??! } // XElementAccess @@ -410,7 +410,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationShapeObj::createTextCurso throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // Notizen brauchen keine Extrawurst + // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursor(); } @@ -419,7 +419,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationShapeObj::createTextCurso throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // Notizen brauchen keine Extrawurst + // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursorByRange(aTextPosition); } diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index bfd6e631bd31..a7b929fb298f 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,10 +67,10 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() // static sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, - const SfxItemPropertyMap& rPropMap, + const SfxItemPropertyMap& rPropMap, const rtl::OUString& aPropertyName, const uno::Any& aValue ) { - //! use map (with new identifiers) + //! use map (with new identifiers) const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName(aPropertyName ); if( !pEntry || !pEntry->nWID ) @@ -90,7 +90,7 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, case PROP_UNO_IGNORECASE : rOptions.SetIgnoreCase( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); break; - case PROP_UNO_ITERENABLED: + case PROP_UNO_ITERENABLED: rOptions.SetIter( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); break; case PROP_UNO_ITERCOUNT : @@ -113,17 +113,17 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, case PROP_UNO_MATCHWHOLE : rOptions.SetMatchWholeCell( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); break; - case PROP_UNO_NULLDATE: + case PROP_UNO_NULLDATE: { util::Date aDate; if ( aValue >>= aDate ) rOptions.SetDate( aDate.Day, aDate.Month, aDate.Year ); } break; - case PROP_UNO_SPELLONLINE: + case PROP_UNO_SPELLONLINE: rOptions.SetAutoSpell( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); break; - case PROP_UNO_STANDARDDEC: + case PROP_UNO_STANDARDDEC: { sal_Int16 nIntVal = 0; if ( aValue >>= nIntVal ) @@ -140,8 +140,8 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, // static uno::Any ScDocOptionsHelper::getPropertyValue( - const ScDocOptions& rOptions, - const SfxItemPropertyMap& rPropMap, + const ScDocOptions& rOptions, + const SfxItemPropertyMap& rPropMap, const rtl::OUString& aPropertyName ) { uno::Any aRet; @@ -153,28 +153,28 @@ uno::Any ScDocOptionsHelper::getPropertyValue( case PROP_UNO_CALCASSHOWN : ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsCalcAsShown() ); break; - case PROP_UNO_DEFTABSTOP : + case PROP_UNO_DEFTABSTOP : aRet <<= (sal_Int16)( rOptions.GetTabDistance() ); break; - case PROP_UNO_IGNORECASE : + case PROP_UNO_IGNORECASE : ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsIgnoreCase() ); break; - case PROP_UNO_ITERENABLED: + case PROP_UNO_ITERENABLED: ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsIter() ); break; - case PROP_UNO_ITERCOUNT: + case PROP_UNO_ITERCOUNT: aRet <<= (sal_Int32)( rOptions.GetIterCount() ); break; - case PROP_UNO_ITEREPSILON: + case PROP_UNO_ITEREPSILON: aRet <<= (double)( rOptions.GetIterEps() ); break; case PROP_UNO_LOOKUPLABELS: ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsLookUpColRowNames() ); break; - case PROP_UNO_MATCHWHOLE: + case PROP_UNO_MATCHWHOLE: ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsMatchWholeCell() ); break; - case PROP_UNO_NULLDATE: + case PROP_UNO_NULLDATE: { USHORT nD, nM, nY; rOptions.GetDate( nD, nM, nY ); diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index 37b7d83c6886..e65a8e241a0e 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) cons { uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::_CreateShape( pObj )); - new ScShapeObj( xShape ); // aggregates object and modifies xShape + new ScShapeObj( xShape ); // aggregates object and modifies xShape return xShape; } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index d16edbbd9ea0..21b3e2030a36 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,32 +97,32 @@ ScFilterDetect::~ScFilterDetect() { } -static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0"; -static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0"; -static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0"; -static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0"; -static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)"; -static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)"; -static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus"; -static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0"; -static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0"; -static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95"; -static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95"; -static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97"; -static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; +static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0"; +static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template"; +static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0"; +static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template"; +static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0"; +static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template"; +static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0"; +static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)"; +static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)"; +static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus"; +static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0"; +static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0"; +static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template"; +static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95"; +static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template"; +static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95"; +static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; +static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97"; +static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; static const sal_Char __FAR_DATA pFilter2003XML[] = "MS Excel 2003 XML"; -static const sal_Char __FAR_DATA pFilterDBase[] = "dBase"; -static const sal_Char __FAR_DATA pFilterDif[] = "DIF"; -static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK"; -static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)"; -static const sal_Char __FAR_DATA pFilterHtmlWeb[] = "calc_HTML_WebQuery"; -static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)"; +static const sal_Char __FAR_DATA pFilterDBase[] = "dBase"; +static const sal_Char __FAR_DATA pFilterDif[] = "DIF"; +static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK"; +static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)"; +static const sal_Char __FAR_DATA pFilterHtmlWeb[] = "calc_HTML_WebQuery"; +static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)"; static BOOL lcl_MayBeAscii( SvStream& rStream ) diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 204a139aae12..659fe15e5e22 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index b942c7dd9f11..2b76b5759c78 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ #include <com/sun/star/document/XCodeNameQuery.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> -#include <svx/unomod.hxx> +#include <svx/unomod.hxx> #include <vbahelper/vbaaccesshelper.hxx> #include <comphelper/processfactory.hxx> @@ -124,7 +124,7 @@ public: throw uno::RuntimeException(); if ( sName == pDoc->GetCodeName() ) maCachedObject = maWorkbook; - else + else { String sCodeName; SCTAB nCount = pDoc->GetTableCount(); @@ -171,7 +171,7 @@ public: if ( !pDoc ) throw uno::RuntimeException(); SCTAB nCount = pDoc->GetTableCount(); - uno::Sequence< rtl::OUString > aNames( nCount + 1 ); + uno::Sequence< rtl::OUString > aNames( nCount + 1 ); SCTAB index = 0; String sCodeName; for( ; index < nCount; ++index ) @@ -218,7 +218,7 @@ public: sal_Int32 nCntrls = xFormControls->getCount(); for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex ) { - uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW ); bMatched = ( xControl == xIf ); if ( bMatched ) { @@ -311,51 +311,51 @@ static const ProvNamesId_Type __FAR_DATA aProvNamesId[] = }; // -// old service names that were in 567 still work in createInstance, -// in case some macro is still using them +// old service names that were in 567 still work in createInstance, +// in case some macro is still using them // static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] = { - "", // SC_SERVICE_SHEET - "stardiv.one.text.TextField.URL", // SC_SERVICE_URLFIELD - "stardiv.one.text.TextField.PageNumber", // SC_SERVICE_PAGEFIELD - "stardiv.one.text.TextField.PageCount", // SC_SERVICE_PAGESFIELD - "stardiv.one.text.TextField.Date", // SC_SERVICE_DATEFIELD - "stardiv.one.text.TextField.Time", // SC_SERVICE_TIMEFIELD - "stardiv.one.text.TextField.DocumentTitle", // SC_SERVICE_TITLEFIELD - "stardiv.one.text.TextField.FileName", // SC_SERVICE_FILEFIELD - "stardiv.one.text.TextField.SheetName", // SC_SERVICE_SHEETFIELD - "stardiv.one.style.CellStyle", // SC_SERVICE_CELLSTYLE - "stardiv.one.style.PageStyle", // SC_SERVICE_PAGESTYLE - "", // SC_SERVICE_AUTOFORMAT - "", // SC_SERVICE_CELLRANGES - "", // SC_SERVICE_GRADTAB - "", // SC_SERVICE_HATCHTAB - "", // SC_SERVICE_BITMAPTAB - "", // SC_SERVICE_TRGRADTAB - "", // SC_SERVICE_MARKERTAB - "", // SC_SERVICE_DASHTAB - "", // SC_SERVICE_NUMRULES - "", // SC_SERVICE_DOCDEFLTS - "", // SC_SERVICE_DRAWDEFLTS - "", // SC_SERVICE_DOCSPRSETT - "", // SC_SERVICE_DOCCONF - "", // SC_SERVICE_IMAP_RECT - "", // SC_SERVICE_IMAP_CIRC - "", // SC_SERVICE_IMAP_POLY + "", // SC_SERVICE_SHEET + "stardiv.one.text.TextField.URL", // SC_SERVICE_URLFIELD + "stardiv.one.text.TextField.PageNumber", // SC_SERVICE_PAGEFIELD + "stardiv.one.text.TextField.PageCount", // SC_SERVICE_PAGESFIELD + "stardiv.one.text.TextField.Date", // SC_SERVICE_DATEFIELD + "stardiv.one.text.TextField.Time", // SC_SERVICE_TIMEFIELD + "stardiv.one.text.TextField.DocumentTitle", // SC_SERVICE_TITLEFIELD + "stardiv.one.text.TextField.FileName", // SC_SERVICE_FILEFIELD + "stardiv.one.text.TextField.SheetName", // SC_SERVICE_SHEETFIELD + "stardiv.one.style.CellStyle", // SC_SERVICE_CELLSTYLE + "stardiv.one.style.PageStyle", // SC_SERVICE_PAGESTYLE + "", // SC_SERVICE_AUTOFORMAT + "", // SC_SERVICE_CELLRANGES + "", // SC_SERVICE_GRADTAB + "", // SC_SERVICE_HATCHTAB + "", // SC_SERVICE_BITMAPTAB + "", // SC_SERVICE_TRGRADTAB + "", // SC_SERVICE_MARKERTAB + "", // SC_SERVICE_DASHTAB + "", // SC_SERVICE_NUMRULES + "", // SC_SERVICE_DOCDEFLTS + "", // SC_SERVICE_DRAWDEFLTS + "", // SC_SERVICE_DOCSPRSETT + "", // SC_SERVICE_DOCCONF + "", // SC_SERVICE_IMAP_RECT + "", // SC_SERVICE_IMAP_CIRC + "", // SC_SERVICE_IMAP_POLY // #100263# Support creation of GraphicObjectResolver and EmbeddedObjectResolver - "", // SC_SERVICE_EXPORT_GOR - "", // SC_SERVICE_IMPORT_GOR - "", // SC_SERVICE_EXPORT_EOR - "", // SC_SERVICE_IMPORT_EOR - - "", // SC_SERVICE_VALBIND - "", // SC_SERVICE_LISTCELLBIND - "", // SC_SERVICE_LISTSOURCE - "", // SC_SERVICE_CELLADDRESS - "", // SC_SERVICE_RANGEADDRESS + "", // SC_SERVICE_EXPORT_GOR + "", // SC_SERVICE_IMPORT_GOR + "", // SC_SERVICE_EXPORT_EOR + "", // SC_SERVICE_IMPORT_EOR + + "", // SC_SERVICE_VALBIND + "", // SC_SERVICE_LISTCELLBIND + "", // SC_SERVICE_LISTSOURCE + "", // SC_SERVICE_CELLADDRESS + "", // SC_SERVICE_RANGEADDRESS "", // SC_SERVICE_SHEETDOCSET "", // SC_SERVICE_CHDATAPROV "", // SC_SERVICE_FORMULAPARS @@ -370,7 +370,7 @@ static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] = //------------------------------------------------------------------------ -// alles static +// alles static sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName) @@ -408,7 +408,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( switch (nType) { case SC_SERVICE_SHEET: - // noch nicht eingefuegt - DocShell=Null + // noch nicht eingefuegt - DocShell=Null xRet.set((sheet::XSpreadsheet*)new ScTableSheetObj(NULL,0)); break; case SC_SERVICE_URLFIELD: @@ -433,8 +433,8 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( xRet.set((container::XIndexAccess*)new ScAutoFormatObj( SC_AFMTOBJ_INVALID )); break; case SC_SERVICE_CELLRANGES: - // wird nicht eingefuegt, sondern gefuellt - // -> DocShell muss gesetzt sein, aber leere Ranges + // wird nicht eingefuegt, sondern gefuellt + // -> DocShell muss gesetzt sein, aber leere Ranges if (pDocShell) xRet.set((sheet::XSheetCellRanges*)new ScCellRangesObj( pDocShell, ScRangeList() )); break; @@ -448,9 +448,9 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( xRet.set((beans::XPropertySet*)new ScDrawDefaultsObj( pDocShell )); break; - // Drawing layer tables are not in SvxUnoDrawMSFactory, - // because SvxUnoDrawMSFactory doesn't have a SdrModel pointer. - // Drawing layer is always allocated if not there (MakeDrawLayer). + // Drawing layer tables are not in SvxUnoDrawMSFactory, + // because SvxUnoDrawMSFactory doesn't have a SdrModel pointer. + // Drawing layer is always allocated if not there (MakeDrawLayer). case SC_SERVICE_GRADTAB: if (pDocShell) diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 3f9ea0aabcab..845b64d24ec9 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ const SfxItemPropertyMapEntry* lcl_GetShapeMap() { {MAP_CHAR_LEN(SC_UNONAME_ANCHOR), 0, &getCppuType((uno::Reference<uno::XInterface>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_HORIPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP), 0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP), 0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_MOVEPROTECT), 0, &getCppuType((sal_Bool*)0), 0, 0 }, // #i66550 HLINK_FOR_SHAPES @@ -126,7 +126,7 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : if (mxShapeAgg.is()) { - xShape = NULL; // during setDelegator, mxShapeAgg must be the only ref + xShape = NULL; // during setDelegator, mxShapeAgg must be the only ref mxShapeAgg->setDelegator( (cppu::OWeakObject*)this ); @@ -149,8 +149,8 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : ScShapeObj::~ScShapeObj() { -// if (mxShapeAgg.is()) -// mxShapeAgg->setDelegator(uno::Reference<uno::XInterface>()); +// if (mxShapeAgg.is()) +// mxShapeAgg->setDelegator(uno::Reference<uno::XInterface>()); } // XInterface @@ -239,7 +239,7 @@ uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<uno::XAg return xRet; } -// XPropertySet +// XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo() throw(uno::RuntimeException) @@ -249,7 +249,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo( // #i61527# cache property set info for this object if ( !mxPropSetInfo.is() ) { - // mix own and aggregated properties: + // mix own and aggregated properties: GetShapePropertySet(); if (pShapePropertySet) { @@ -928,7 +928,7 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPr pShapePropertySet->removeVetoableChangeListener( aPropertyName, aListener ); } -// XPropertyState +// XPropertyState beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) @@ -969,7 +969,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( { SolarMutexGuard aGuard; - // simple loop to get own and aggregated states + // simple loop to get own and aggregated states const rtl::OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); @@ -994,7 +994,7 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyNa if( pIMapInfo ) { ImageMap aEmpty; - pIMapInfo->SetImageMap( aEmpty ); // replace with empty image map + pIMapInfo->SetImageMap( aEmpty ); // replace with empty image map } else { @@ -1020,7 +1020,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const rtl::OUString& aProperty uno::Any aAny; if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) { - // default: empty ImageMap + // default: empty ImageMap uno::Reference< uno::XInterface > xImageMap(SvUnoImageMap_createInstance( GetSupportedMacroItems() )); aAny <<= uno::Reference< container::XIndexContainer >::query( xImageMap ); } @@ -1041,7 +1041,7 @@ void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTe { SolarMutexGuard aGuard; - throw lang::IllegalArgumentException(); // anchor cannot be changed + throw lang::IllegalArgumentException(); // anchor cannot be changed } uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() throw(uno::RuntimeException) @@ -1071,7 +1071,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() throw(uno::Run Point aPos(pObj->GetCurrentBoundRect().TopLeft()); ScRange aRange(pDoc->GetRange( nTab, Rectangle( aPos, aPos ) )); - // anchor is always the cell + // anchor is always the cell xRet.set(new ScCellObj( pDocSh, aRange.aStart )); } @@ -1144,9 +1144,9 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan ScCellFieldObj* pCellField = ScCellFieldObj::getImplementation( xContent ); if ( pCellField ) { - // #105585# createInstance("TextField.URL") from the document creates a ScCellFieldObj. - // To insert it into drawing text, a SvxUnoTextField is needed instead. - // The ScCellFieldObj object is left in non-inserted state. + // #105585# createInstance("TextField.URL") from the document creates a ScCellFieldObj. + // To insert it into drawing text, a SvxUnoTextField is needed instead. + // The ScCellFieldObj object is left in non-inserted state. SvxUnoTextField* pDrawField = new SvxUnoTextField( ID_URLFIELD ); xEffContent.set(pDrawField); @@ -1167,7 +1167,7 @@ void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextCon { SolarMutexGuard aGuard; - // ScCellFieldObj can't be used here. + // ScCellFieldObj can't be used here. uno::Reference<text::XText> xAggText(lcl_GetText(mxShapeAgg)); if ( xAggText.is() ) @@ -1184,7 +1184,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor() if ( mxShapeAgg.is() ) { - // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText + // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( mxShapeAgg ); if (pText) @@ -1202,7 +1202,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( if ( mxShapeAgg.is() && aTextPosition.is() ) { - // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText + // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( mxShapeAgg ); SvxUnoTextRangeBase* pRange = SvxUnoTextRangeBase::getImplementation( aTextPosition ); @@ -1344,8 +1344,8 @@ uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId() { // we need to create a new implementation id for this // note: this memory is not free'd until application exists - // but since we have a fixed set of shapetypes and the - // memory will be reused this is ok. + // but since we have a fixed set of shapetypes and the + // memory will be reused this is ok. pImplementationId = new uno::Sequence< sal_Int8 >( 16 ); rtl_createUuid( (sal_uInt8 *) pImplementationId->getArray(), 0, sal_True ); aImplementationIdMap[ aShapeType ] = pImplementationId; diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 6402f60d91aa..74bf2a095af0 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -//! SearchWords sucht in ganzen Zellen - umbenennen ??? +//! SearchWords sucht in ganzen Zellen - umbenennen ??? // SfxItemPropertyMapEntry nur fuer GetPropertySetInfo @@ -57,18 +57,18 @@ const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() { static SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_SRCHBACK), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHBYROW), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHCASE), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHREGEXP), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHSIM), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHSIMADD), 0, &getCppuType((sal_Int16*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHSIMEX), 0, &getCppuType((sal_Int16*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHSIMREL), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHSIMREM), 0, &getCppuType((sal_Int16*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHSTYLES), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_SRCHTYPE), 0, &getCppuType((sal_Int16*)0), 0, 0}, // enum TableSearch ist weg - {MAP_CHAR_LEN(SC_UNO_SRCHWORDS), 0, &getBooleanCppuType(), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHBACK), 0, &getBooleanCppuType(), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHBYROW), 0, &getBooleanCppuType(), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHCASE), 0, &getBooleanCppuType(), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHREGEXP), 0, &getBooleanCppuType(), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHSIM), 0, &getBooleanCppuType(), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHSIMADD), 0, &getCppuType((sal_Int16*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHSIMEX), 0, &getCppuType((sal_Int16*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHSIMREL), 0, &getBooleanCppuType(), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHSIMREM), 0, &getCppuType((sal_Int16*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHSTYLES), 0, &getBooleanCppuType(), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_SRCHTYPE), 0, &getCppuType((sal_Int16*)0), 0, 0}, // enum TableSearch ist weg + {MAP_CHAR_LEN(SC_UNO_SRCHWORDS), 0, &getBooleanCppuType(), 0, 0}, {0,0,0,0,0,0} }; return aSearchPropertyMap_Impl; @@ -76,8 +76,8 @@ const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() //------------------------------------------------------------------------ -#define SCSEARCHDESCRIPTOR_SERVICE "com.sun.star.util.SearchDescriptor" -#define SCREPLACEDESCRIPTOR_SERVICE "com.sun.star.util.ReplaceDescriptor" +#define SCSEARCHDESCRIPTOR_SERVICE "com.sun.star.util.SearchDescriptor" +#define SCREPLACEDESCRIPTOR_SERVICE "com.sun.star.util.ReplaceDescriptor" //------------------------------------------------------------------------ @@ -85,11 +85,11 @@ ScCellSearchObj::ScCellSearchObj() : aPropSet(lcl_GetSearchPropertyMap()) { pSearchItem = new SvxSearchItem( SCITEM_SEARCHDATA ); - // Defaults: + // Defaults: pSearchItem->SetWordOnly(FALSE); pSearchItem->SetExact(FALSE); pSearchItem->SetMatchFullHalfWidthForms(FALSE); - pSearchItem->SetUseAsianOptions(FALSE); // or all asian bits would have to be handled + pSearchItem->SetUseAsianOptions(FALSE); // or all asian bits would have to be handled pSearchItem->SetBackward(FALSE); pSearchItem->SetSelection(FALSE); pSearchItem->SetRegExp(FALSE); @@ -99,11 +99,11 @@ ScCellSearchObj::ScCellSearchObj() : pSearchItem->SetLEVOther(2); pSearchItem->SetLEVShorter(2); pSearchItem->SetLEVLonger(2); - // Calc-Flags + // Calc-Flags pSearchItem->SetRowDirection(FALSE); pSearchItem->SetCellType(SVX_SEARCHIN_FORMULA); - // Selection-Flag wird beim Aufruf gesetzt + // Selection-Flag wird beim Aufruf gesetzt } ScCellSearchObj::~ScCellSearchObj() @@ -161,11 +161,11 @@ void SAL_CALL ScCellSearchObj::setPropertyValue( SolarMutexGuard aGuard; String aString(aPropertyName); - if (aString.EqualsAscii( SC_UNO_SRCHBACK )) pSearchItem->SetBackward( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + if (aString.EqualsAscii( SC_UNO_SRCHBACK )) pSearchItem->SetBackward( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if (aString.EqualsAscii( SC_UNO_SRCHBYROW )) pSearchItem->SetRowDirection( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if (aString.EqualsAscii( SC_UNO_SRCHCASE )) pSearchItem->SetExact( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if (aString.EqualsAscii( SC_UNO_SRCHREGEXP )) pSearchItem->SetRegExp( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); - else if (aString.EqualsAscii( SC_UNO_SRCHSIM )) pSearchItem->SetLevenshtein( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + else if (aString.EqualsAscii( SC_UNO_SRCHSIM )) pSearchItem->SetLevenshtein( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if (aString.EqualsAscii( SC_UNO_SRCHSIMREL )) pSearchItem->SetLEVRelaxed( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if (aString.EqualsAscii( SC_UNO_SRCHSTYLES )) pSearchItem->SetPattern( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if (aString.EqualsAscii( SC_UNO_SRCHWORDS )) pSearchItem->SetWordOnly( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); @@ -184,11 +184,11 @@ uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const rtl::OUString& aPrope String aString(aPropertyName); uno::Any aRet; - if (aString.EqualsAscii( SC_UNO_SRCHBACK )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetBackward() ); + if (aString.EqualsAscii( SC_UNO_SRCHBACK )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetBackward() ); else if (aString.EqualsAscii( SC_UNO_SRCHBYROW )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetRowDirection() ); else if (aString.EqualsAscii( SC_UNO_SRCHCASE )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetExact() ); else if (aString.EqualsAscii( SC_UNO_SRCHREGEXP )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetRegExp() ); - else if (aString.EqualsAscii( SC_UNO_SRCHSIM )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsLevenshtein() ); + else if (aString.EqualsAscii( SC_UNO_SRCHSIM )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsLevenshtein() ); else if (aString.EqualsAscii( SC_UNO_SRCHSIMREL )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsLEVRelaxed() ); else if (aString.EqualsAscii( SC_UNO_SRCHSTYLES )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetPattern() ); else if (aString.EqualsAscii( SC_UNO_SRCHWORDS )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetWordOnly() ); diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 9383816528ab..e9124658e6dd 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,283 +87,283 @@ const SfxItemPropertySet* lcl_GetCellStyleSet() { static SfxItemPropertyMapEntry aCellStyleMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &::getCppuType((const util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&::getBooleanCppuType(), 0, MID_CROSSED_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, - {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, - {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE }, - {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE }, - {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, - {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &::getCppuType((const float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT }, - {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &::getCppuType((const util::CellProtection*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&::getBooleanCppuType(), 0, MID_CROSSED_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS }, + {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET }, + {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE }, + {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, + {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &::getCppuType((const float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT }, + {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &::getCppuType((const table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, + {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &::getCppuType((const table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &::getCppuType((const sal_Int32*)0), 0, 0 }, -// {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &::getCppuType((const sal_Int32*)0), 0, 0 }, +// {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &::getCppuType((const table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &::getCppuType((const sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS - {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, - {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &::getCppuType((const sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS + {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, + {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &::getCppuType((const table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &::getCppuType((const table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellStyleSet_Impl( aCellStyleMap_Impl ); return &aCellStyleSet_Impl; } -// Map mit allen Seitenattributen, incl. Kopf-/Fusszeilenattribute +// Map mit allen Seitenattributen, incl. Kopf-/Fusszeilenattribute const SfxItemPropertySet * lcl_GetPageStyleSet() { static SfxItemPropertyMapEntry aPageStyleMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, - {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, - {MAP_CHAR_LEN(SC_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERHOR), ATTR_PAGE_HORCENTER,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERVER), ATTR_PAGE_VERCENTER,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ATTR_PAGE_FIRSTPAGENO,&::getCppuType((const sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, + {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERHOR), ATTR_PAGE_HORCENTER,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERVER), ATTR_PAGE_VERCENTER,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ATTR_PAGE_FIRSTPAGENO,&::getCppuType((const sal_Int16*)0), 0, 0 }, // - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, // - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), SC_WID_UNO_HEADERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), SC_WID_UNO_HEADERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, // - {MAP_CHAR_LEN(SC_UNO_PAGE_HEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(SC_UNO_PAGE_LANDSCAPE), ATTR_PAGE, &::getBooleanCppuType(), 0, MID_PAGE_ORIENTATION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ATTR_PAGE_FOOTERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ATTR_PAGE_HEADERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_NUMBERTYPE), ATTR_PAGE, &::getCppuType((const sal_Int16*)0), 0, MID_PAGE_NUMTYPE }, - {MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ATTR_PAGE_SCALE, &::getCppuType((const sal_Int16*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_SYTLELAYOUT), ATTR_PAGE, &::getCppuType((const style::PageStyleLayout*)0), 0, MID_PAGE_LAYOUT }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTANNOT), ATTR_PAGE_NOTES, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTCHARTS), ATTR_PAGE_CHARTS, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDOWN), ATTR_PAGE_TOPDOWN, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDRAW), ATTR_PAGE_DRAWINGS, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTFORMUL), ATTR_PAGE_FORMULAS, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTGRID), ATTR_PAGE_GRID, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTHEADER), ATTR_PAGE_HEADERS, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTOBJS), ATTR_PAGE_OBJECTS, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTZERO), ATTR_PAGE_NULLVALS, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ATTR_PAGE_FOOTERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ATTR_PAGE_HEADERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ATTR_PAGE_SCALETOPAGES,&::getCppuType((const sal_Int16*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ATTR_PAGE_SCALETO, &::getCppuType((const sal_Int16*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ATTR_PAGE_SCALETO, &::getCppuType((const sal_Int16*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_SIZE), ATTR_PAGE_SIZE, &::getCppuType((const awt::Size*)0), 0, MID_SIZE_SIZE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_TOPMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_WIDTH), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_WIDTH | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(SC_UNO_PAGE_LANDSCAPE), ATTR_PAGE, &::getBooleanCppuType(), 0, MID_PAGE_ORIENTATION }, + {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ATTR_PAGE_FOOTERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ATTR_PAGE_HEADERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_NUMBERTYPE), ATTR_PAGE, &::getCppuType((const sal_Int16*)0), 0, MID_PAGE_NUMTYPE }, + {MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ATTR_PAGE_SCALE, &::getCppuType((const sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_SYTLELAYOUT), ATTR_PAGE, &::getCppuType((const style::PageStyleLayout*)0), 0, MID_PAGE_LAYOUT }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTANNOT), ATTR_PAGE_NOTES, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTCHARTS), ATTR_PAGE_CHARTS, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDOWN), ATTR_PAGE_TOPDOWN, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDRAW), ATTR_PAGE_DRAWINGS, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTFORMUL), ATTR_PAGE_FORMULAS, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTGRID), ATTR_PAGE_GRID, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTHEADER), ATTR_PAGE_HEADERS, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTOBJS), ATTR_PAGE_OBJECTS, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTZERO), ATTR_PAGE_NULLVALS, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ATTR_PAGE_FOOTERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ATTR_PAGE_HEADERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ATTR_PAGE_SCALETOPAGES,&::getCppuType((const sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ATTR_PAGE_SCALETO, &::getCppuType((const sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ATTR_PAGE_SCALETO, &::getCppuType((const sal_Int16*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_SIZE), ATTR_PAGE_SIZE, &::getCppuType((const awt::Size*)0), 0, MID_SIZE_SIZE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_TOPMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_WIDTH), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_WIDTH | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; - static SfxItemPropertySet aPageStyleSet_Impl( aPageStyleMap_Impl ); + static SfxItemPropertySet aPageStyleSet_Impl( aPageStyleMap_Impl ); return &aPageStyleSet_Impl; } -// Map mit Inhalten des Header-Item-Sets +// Map mit Inhalten des Header-Item-Sets const SfxItemPropertyMap* lcl_GetHeaderStyleMap() { static SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {0,0,0,0,0,0} }; static SfxItemPropertyMap aHeaderStyleMap( aHeaderStyleMap_Impl ); return &aHeaderStyleMap; } -// Map mit Inhalten des Footer-Item-Sets +// Map mit Inhalten des Footer-Item-Sets const SfxItemPropertyMap* lcl_GetFooterStyleMap() { static SfxItemPropertyMapEntry aFooterStyleMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS }, - {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS }, + {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {0,0,0,0,0,0} }; static SfxItemPropertyMap aFooterStyleMap( aFooterStyleMap_Impl ); @@ -373,52 +373,52 @@ const SfxItemPropertyMap* lcl_GetFooterStyleMap() //------------------------------------------------------------------------ -// Index-Access auf die Style-Typen: 0 = Cell, 1 = Page +// Index-Access auf die Style-Typen: 0 = Cell, 1 = Page #define SC_STYLE_FAMILY_COUNT 2 -#define SC_FAMILYNAME_CELL "CellStyles" -#define SC_FAMILYNAME_PAGE "PageStyles" +#define SC_FAMILYNAME_CELL "CellStyles" +#define SC_FAMILYNAME_PAGE "PageStyles" static UINT16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE }; //------------------------------------------------------------------------ -//! diese Funktionen in einen allgemeinen Header verschieben -inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } -inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } +//! diese Funktionen in einen allgemeinen Header verschieben +inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } +inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } //------------------------------------------------------------------------ -#define SCSTYLE_SERVICE "com.sun.star.style.Style" -#define SCCELLSTYLE_SERVICE "com.sun.star.style.CellStyle" -#define SCPAGESTYLE_SERVICE "com.sun.star.style.PageStyle" +#define SCSTYLE_SERVICE "com.sun.star.style.Style" +#define SCCELLSTYLE_SERVICE "com.sun.star.style.CellStyle" +#define SCPAGESTYLE_SERVICE "com.sun.star.style.PageStyle" SC_SIMPLE_SERVICE_INFO( ScStyleFamiliesObj, "ScStyleFamiliesObj", "com.sun.star.style.StyleFamilies" ) SC_SIMPLE_SERVICE_INFO( ScStyleFamilyObj, "ScStyleFamilyObj", "com.sun.star.style.StyleFamily" ) //------------------------------------------------------------------------ -#define SC_PAPERBIN_DEFAULTNAME "[From printer settings]" +#define SC_PAPERBIN_DEFAULTNAME "[From printer settings]" //------------------------------------------------------------------------ -// conversion programmatic <-> display (visible) name -// currently, the core always has the visible names -// the api is required to use programmatic names for default styles -// these programmatic names must never change! +// conversion programmatic <-> display (visible) name +// currently, the core always has the visible names +// the api is required to use programmatic names for default styles +// these programmatic names must never change! -#define SC_STYLE_PROG_STANDARD "Default" -#define SC_STYLE_PROG_RESULT "Result" -#define SC_STYLE_PROG_RESULT1 "Result2" -#define SC_STYLE_PROG_HEADLINE "Heading" -#define SC_STYLE_PROG_HEADLINE1 "Heading1" -#define SC_STYLE_PROG_REPORT "Report" +#define SC_STYLE_PROG_STANDARD "Default" +#define SC_STYLE_PROG_RESULT "Result" +#define SC_STYLE_PROG_RESULT1 "Result2" +#define SC_STYLE_PROG_HEADLINE "Heading" +#define SC_STYLE_PROG_HEADLINE1 "Heading1" +#define SC_STYLE_PROG_REPORT "Report" struct ScDisplayNameMap { - String aDispName; - String aProgName; + String aDispName; + String aProgName; }; const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType ) @@ -444,7 +444,7 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType ) aCellMap[4].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE1 ); aCellMap[4].aProgName = String::CreateFromAscii( SC_STYLE_PROG_HEADLINE1 ); - // last entry remains empty + // last entry remains empty bCellMapFilled = TRUE; } @@ -462,7 +462,7 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType ) aPageMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_REPORT ); aPageMap[1].aProgName = String::CreateFromAscii( SC_STYLE_PROG_REPORT ); - // last entry remains empty + // last entry remains empty bPageMapFilled = TRUE; } @@ -472,11 +472,11 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType ) return NULL; } -// programmatic name suffix for display names that match other programmatic names -// is " (user)" including a space +// programmatic name suffix for display names that match other programmatic names +// is " (user)" including a space -#define SC_SUFFIX_USER " (user)" -#define SC_SUFFIX_USER_LEN 7 +#define SC_SUFFIX_USER " (user)" +#define SC_SUFFIX_USER_LEN 7 BOOL lcl_EndsWithUser( const String& rString ) { @@ -505,15 +505,15 @@ String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName if (pNames->aDispName == rDispName) return pNames->aProgName; else if (pNames->aProgName == rDispName) - bDisplayIsProgrammatic = TRUE; // display name matches any programmatic name + bDisplayIsProgrammatic = TRUE; // display name matches any programmatic name } while( (++pNames)->aDispName.Len() ); } if ( bDisplayIsProgrammatic || lcl_EndsWithUser( rDispName ) ) { - // add the (user) suffix if the display name matches any style's programmatic name - // or if it already contains the suffix + // add the (user) suffix if the display name matches any style's programmatic name + // or if it already contains the suffix String aRet(rDispName); aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SC_SUFFIX_USER ) ); @@ -528,7 +528,7 @@ String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName { if ( lcl_EndsWithUser( rProgName ) ) { - // remove the (user) suffix, don't compare to map entries + // remove the (user) suffix, don't compare to map entries return rProgName.Copy( 0, rProgName.Len() - SC_SUFFIX_USER_LEN ); } @@ -572,12 +572,12 @@ ScStyleFamiliesObj::~ScStyleFamiliesObj() void ScStyleFamiliesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -601,7 +601,7 @@ ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByIndex_Impl(UINT32 nIndex) const if ( nIndex < SC_STYLE_FAMILY_COUNT ) return GetObjectByType_Impl(aStyleFamilyTypes[nIndex]); - return NULL; // ungueltiger Index + return NULL; // ungueltiger Index } ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const rtl::OUString& aName) const @@ -641,7 +641,7 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScStyleFamiliesObj::getElementType() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< container::XNameContainer >*)0); // muss zu getByIndex passen + return ::getCppuType((const uno::Reference< container::XNameContainer >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException) @@ -690,19 +690,19 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const rtl::OUString& aURL, const uno::Sequence<beans::PropertyValue>& aOptions ) throw(io::IOException, uno::RuntimeException) { - //! use aOptions (like Writer) - //! set flag to disable filter option dialogs when importing + //! use aOptions (like Writer) + //! set flag to disable filter option dialogs when importing - String aFilter; // empty - detect + String aFilter; // empty - detect String aFiltOpt; ScDocumentLoader aLoader( aURL, aFilter, aFiltOpt ); ScDocShell* pSource = aLoader.GetDocShell(); if ( pSource && pDocShell ) { - // collect options + // collect options - BOOL bLoadReplace = TRUE; // defaults + BOOL bLoadReplace = TRUE; // defaults BOOL bLoadCellStyles = TRUE; BOOL bLoadPageStyles = TRUE; @@ -722,14 +722,14 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const rtl::OUString& aURL, } pDocShell->LoadStylesArgs( *pSource, bLoadReplace, bLoadCellStyles, bLoadPageStyles ); - pDocShell->SetDocumentModified(); // paint is inside LoadStyles + pDocShell->SetDocumentModified(); // paint is inside LoadStyles } } uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderOptions() throw(uno::RuntimeException) { - // return defaults for options (?) + // return defaults for options (?) uno::Sequence<beans::PropertyValue> aSequence(3); beans::PropertyValue* pArray = aSequence.getArray(); @@ -763,12 +763,12 @@ ScStyleFamilyObj::~ScStyleFamilyObj() void ScStyleFamilyObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -814,32 +814,32 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const { SolarMutexGuard aGuard; sal_Bool bDone = sal_False; - // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein... + // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein... uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY); if ( xInterface.is() ) { ScStyleObj* pStyleObj = ScStyleObj::getImplementation( xInterface ); if ( pStyleObj && pStyleObj->GetFamily() == eFamily && - !pStyleObj->IsInserted() ) // noch nicht eingefuegt? + !pStyleObj->IsInserted() ) // noch nicht eingefuegt? { String aNameStr(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<UINT16>(eFamily) )); ScDocument* pDoc = pDocShell->GetDocument(); ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - //! DocFunc-Funktion?? - //! Undo ????????????? + //! DocFunc-Funktion?? + //! Undo ????????????? - if ( !pStylePool->Find( aNameStr, eFamily ) ) // noch nicht vorhanden + if ( !pStylePool->Find( aNameStr, eFamily ) ) // noch nicht vorhanden { (void)pStylePool->Make( aNameStr, eFamily, SFXSTYLEBIT_USERDEF ); if ( eFamily == SFX_STYLE_FAMILY_PARA && !pDoc->IsImportingXML() ) pDoc->GetPool()->CellStyleCreated( aNameStr ); - pStyleObj->InitDoc( pDocShell, aNameStr ); // Objekt kann benutzt werden + pStyleObj->InitDoc( pDocShell, aNameStr ); // Objekt kann benutzt werden - pDocShell->SetDocumentModified(); // verwendet wird der neue Style noch nicht + pDocShell->SetDocumentModified(); // verwendet wird der neue Style noch nicht bDone = sal_True; } else @@ -849,7 +849,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const if (!bDone) { - // other errors are handled above + // other errors are handled above throw lang::IllegalArgumentException(); } } @@ -859,7 +859,7 @@ void SAL_CALL ScStyleFamilyObj::replaceByName( const rtl::OUString& aName, const lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; - //! zusammenfassen? + //! zusammenfassen? removeByName( aName ); insertByName( aName, aElement ); } @@ -877,8 +877,8 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName ) ScDocument* pDoc = pDocShell->GetDocument(); ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - //! DocFunc-Funktion?? - //! Undo ????????????? + //! DocFunc-Funktion?? + //! Undo ????????????? SfxStyleSheetBase* pStyle = pStylePool->Find( aString, eFamily ); if (pStyle) @@ -898,7 +898,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName ) pStylePool->Remove( pStyle ); - //! InvalidateAttribs(); // Bindings-Invalidate + //! InvalidateAttribs(); // Bindings-Invalidate } else { @@ -951,7 +951,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScStyleFamilyObj::getElementType() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< style::XStyle >*)0); // muss zu getByIndex passen + return ::getCppuType((const uno::Reference< style::XStyle >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException) @@ -1088,7 +1088,7 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const ::rtl::OUStr //------------------------------------------------------------------------ -// Default-ctor wird fuer die Reflection gebraucht +// Default-ctor wird fuer die Reflection gebraucht ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName) : pPropSet( (eFam == SFX_STYLE_FAMILY_PARA) ? lcl_GetCellStyleSet() : lcl_GetPageStyleSet() ), @@ -1096,7 +1096,7 @@ ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rN eFamily( eFam ), aStyleName( rName ) { - // pDocShell ist Null, wenn per ServiceProvider erzeugt + // pDocShell ist Null, wenn per ServiceProvider erzeugt if (pDocShell) pDocShell->GetDocument()->AddUnoObject(*this); @@ -1162,12 +1162,12 @@ ScStyleObj* ScStyleObj::getImplementation( void ScStyleObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - // Referenz-Update interessiert hier nicht + // Referenz-Update interessiert hier nicht if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - pDocShell = NULL; // ungueltig geworden + pDocShell = NULL; // ungueltig geworden } } @@ -1218,23 +1218,23 @@ void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) { - // #70909# cell styles cannot be modified if any sheet is protected + // #70909# cell styles cannot be modified if any sheet is protected if ( eFamily == SFX_STYLE_FAMILY_PARA && lcl_AnyTabProtected( *pDocShell->GetDocument() ) ) - return; //! exception? + return; //! exception? - //! DocFunc-Funktion?? - //! Undo ????????????? + //! DocFunc-Funktion?? + //! Undo ????????????? String aString(ScStyleNameConversion::ProgrammaticToDisplayName( rParentStyle, sal::static_int_cast<UINT16>(eFamily) )); sal_Bool bOk = pStyle->SetParent( aString ); if (bOk) { - // wie bei setPropertyValue + // wie bei setPropertyValue ScDocument* pDoc = pDocShell->GetDocument(); if ( eFamily == SFX_STYLE_FAMILY_PARA ) { - // Zeilenhoehen anpassen... + // Zeilenhoehen anpassen... VirtualDevice aVDev; Point aLogic = aVDev.LogicToPixel( Point(1000,1000), MAP_TWIP ); @@ -1248,7 +1248,7 @@ void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) } else { - //! ModifyStyleSheet am Dokument (alte Werte merken) + //! ModifyStyleSheet am Dokument (alte Werte merken) pDocShell->PageStyleModified( aStyleName, sal_True ); } @@ -1274,24 +1274,24 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName ) SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) { - // #71225# cell styles cannot be renamed if any sheet is protected + // #71225# cell styles cannot be renamed if any sheet is protected if ( eFamily == SFX_STYLE_FAMILY_PARA && lcl_AnyTabProtected( *pDocShell->GetDocument() ) ) - return; //! exception? + return; //! exception? - //! DocFunc-Funktion?? - //! Undo ????????????? + //! DocFunc-Funktion?? + //! Undo ????????????? String aString(aNewName); sal_Bool bOk = pStyle->SetName( aString ); if (bOk) { - aStyleName = aString; //! notify other objects for this style? + aStyleName = aString; //! notify other objects for this style? ScDocument* pDoc = pDocShell->GetDocument(); if ( eFamily == SFX_STYLE_FAMILY_PARA && !pDoc->IsImportingXML() ) pDoc->GetPool()->CellStyleCreated( aString ); - // Zellvorlagen = 2, Seitenvorlagen = 4 + // Zellvorlagen = 2, Seitenvorlagen = 4 UINT16 nId = ( eFamily == SFX_STYLE_FAMILY_PARA ) ? SID_STYLE_FAMILY2 : SID_STYLE_FAMILY4; SfxBindings* pBindings = pDocShell->GetViewBindings(); @@ -1307,7 +1307,7 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName ) // static uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules() { - SvxNumRule aRule( 0, 0, TRUE ); // nothing supported + SvxNumRule aRule( 0, 0, TRUE ); // nothing supported return SvxCreateNumRule( &aRule ); } @@ -1316,7 +1316,7 @@ uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules() const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rPropName, const SfxItemPropertySimpleEntry*& rpResultEntry ) { - //! OUString as argument? + //! OUString as argument? SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) @@ -1379,7 +1379,7 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString& else if ( eState == SFX_ITEM_DEFAULT ) eRet = beans::PropertyState_DEFAULT_VALUE; else if ( eState == SFX_ITEM_DONTCARE ) - eRet = beans::PropertyState_AMBIGUOUS_VALUE; // kann eigentlich nicht sein... + eRet = beans::PropertyState_AMBIGUOUS_VALUE; // kann eigentlich nicht sein... else { DBG_ERROR("unbekannter ItemState"); @@ -1393,8 +1393,8 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( const uno::Sequence<rtl::OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - // duemmliche Default-Implementierung: alles einzeln per getPropertyState holen - //! sollte optimiert werden! + // duemmliche Default-Implementierung: alles einzeln per getPropertyState holen + //! sollte optimiert werden! SolarMutexGuard aGuard; const rtl::OUString* pNames = aPropertyNames.getConstArray(); @@ -1434,11 +1434,11 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty if ( IsScItemWid( nWhich ) ) { - // Default ist Default vom ItemPool, nicht vom Standard-Style, - // damit es zu setPropertyToDefault passt + // Default ist Default vom ItemPool, nicht vom Standard-Style, + // damit es zu setPropertyToDefault passt SfxItemSet aEmptySet( *pStyleSet->GetPool(), pStyleSet->GetRanges() ); - // #65253# Default-Items mit falscher Slot-ID funktionieren im SfxItemPropertySet3 nicht - //! Slot-IDs aendern... + // #65253# Default-Items mit falscher Slot-ID funktionieren im SfxItemPropertySet3 nicht + //! Slot-IDs aendern... if ( aEmptySet.GetPool()->GetSlotId(nWhich) == nWhich && aEmptySet.GetItemState(nWhich, sal_False) == SFX_ITEM_DEFAULT ) { @@ -1446,10 +1446,10 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty } const SfxItemSet* pItemSet = &aEmptySet; - switch ( nWhich ) // fuer Item-Spezial-Behandlungen + switch ( nWhich ) // fuer Item-Spezial-Behandlungen { case ATTR_VALUE_FORMAT: - // default has no language set + // default has no language set aAny <<= sal_Int32( ((const SfxUInt32Item&)pItemSet->Get(nWhich)).GetValue() ); break; case ATTR_INDENT: @@ -1464,7 +1464,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty case ATTR_PAGE_CHARTS: case ATTR_PAGE_OBJECTS: case ATTR_PAGE_DRAWINGS: - //! sal_Bool-MID fuer ScViewObjectModeItem definieren? + //! sal_Bool-MID fuer ScViewObjectModeItem definieren? aAny <<= sal_Bool( ((const ScViewObjectModeItem&)pItemSet->Get(nWhich)). GetValue() == VOBJ_MODE_SHOW ); break; @@ -1542,7 +1542,7 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( { SolarMutexGuard aGuard; - //! optimize + //! optimize sal_Int32 nCount = aPropertyNames.getLength(); uno::Sequence<uno::Any> aSequence( nCount ); @@ -1586,19 +1586,19 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault() throw (uno::RuntimeExcepti SfxStyleSheetBase* pStyle = GetStyle_Impl(); if ( pStyle ) { - // #70909# cell styles cannot be modified if any sheet is protected + // #70909# cell styles cannot be modified if any sheet is protected if ( eFamily == SFX_STYLE_FAMILY_PARA && lcl_AnyTabProtected( *pDocShell->GetDocument() ) ) throw uno::RuntimeException(); SfxItemSet& rSet = pStyle->GetItemSet(); - rSet.ClearItem(); // set all items to default + rSet.ClearItem(); // set all items to default - //! merge with SetOneProperty + //! merge with SetOneProperty ScDocument* pDoc = pDocShell->GetDocument(); if ( eFamily == SFX_STYLE_FAMILY_PARA ) { - // row heights + // row heights VirtualDevice aVDev; Point aLogic = aVDev.LogicToPixel( Point(1000,1000), MAP_TWIP ); @@ -1651,7 +1651,7 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( { SolarMutexGuard aGuard; - //! optimize + //! optimize sal_Int32 nCount = aPropertyNames.getLength(); uno::Sequence<uno::Any> aSequence( nCount ); @@ -1694,11 +1694,11 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons SfxStyleSheetBase* pStyle = GetStyle_Impl(); if ( pStyle && pEntry ) { - // #70909# cell styles cannot be modified if any sheet is protected + // #70909# cell styles cannot be modified if any sheet is protected if ( eFamily == SFX_STYLE_FAMILY_PARA && lcl_AnyTabProtected( *pDocShell->GetDocument() ) ) throw uno::RuntimeException(); - SfxItemSet& rSet = pStyle->GetItemSet(); // direkt im lebenden Style aendern... + SfxItemSet& rSet = pStyle->GetItemSet(); // direkt im lebenden Style aendern... sal_Bool bDone = sal_False; if ( eFamily == SFX_STYLE_FAMILY_PAGE ) { @@ -1763,7 +1763,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons if ( eNewLang != eOldLang && eNewLang != LANGUAGE_DONTKNOW ) rSet.Put( SvxLanguageItem( eNewLang, ATTR_LANGUAGE_FORMAT ) ); - //! keep default state of number format if only language changed? + //! keep default state of number format if only language changed? } break; case ATTR_INDENT: @@ -1778,7 +1778,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons sal_Int32 nRotVal = 0; if ( *pValue >>= nRotVal ) { - // stored value is always between 0 and 360 deg. + // stored value is always between 0 and 360 deg. nRotVal %= 36000; if ( nRotVal < 0 ) nRotVal += 36000; @@ -1839,7 +1839,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons { sal_Bool bBool = sal_False; *pValue >>= bBool; - //! sal_Bool-MID fuer ScViewObjectModeItem definieren? + //! sal_Bool-MID fuer ScViewObjectModeItem definieren? rSet.Put( ScViewObjectModeItem( pEntry->nWID, bBool ? VOBJ_MODE_SHOW : VOBJ_MODE_HIDE ) ); } @@ -1894,9 +1894,9 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons } break; default: - // #65253# Default-Items mit falscher Slot-ID - // funktionieren im SfxItemPropertySet3 nicht - //! Slot-IDs aendern... + // #65253# Default-Items mit falscher Slot-ID + // funktionieren im SfxItemPropertySet3 nicht + //! Slot-IDs aendern... if ( rSet.GetPool()->GetSlotId(pEntry->nWID) == pEntry->nWID && rSet.GetItemState(pEntry->nWID, sal_False) == SFX_ITEM_DEFAULT ) { @@ -1912,7 +1912,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons if ( pEntry->nWID == ATTR_VALUE_FORMAT ) rSet.ClearItem( ATTR_LANGUAGE_FORMAT ); - //! for ATTR_ROTATE_VALUE, also reset ATTR_ORIENTATION? + //! for ATTR_ROTATE_VALUE, also reset ATTR_ORIENTATION? } } else if ( IsScUnoWid( pEntry->nWID ) ) @@ -1943,13 +1943,13 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons } } - //! DocFunc-Funktion?? - //! Undo ????????????? + //! DocFunc-Funktion?? + //! Undo ????????????? ScDocument* pDoc = pDocShell->GetDocument(); if ( eFamily == SFX_STYLE_FAMILY_PARA ) { - // Zeilenhoehen anpassen... + // Zeilenhoehen anpassen... VirtualDevice aVDev; Point aLogic = aVDev.LogicToPixel( Point(1000,1000), MAP_TWIP ); @@ -1963,7 +1963,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons } else { - //! ModifyStyleSheet am Dokument (alte Werte merken) + //! ModifyStyleSheet am Dokument (alte Werte merken) pDocShell->PageStyleModified( aStyleName, sal_True ); } @@ -2115,7 +2115,7 @@ sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName { BOOL bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE ); return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SCSTYLE_SERVICE ) )|| - rServiceName.equalsAsciiL( + rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( bPage ? SCPAGESTYLE_SERVICE : SCCELLSTYLE_SERVICE )); } diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 6509b03d864d..41da7ccc3b4b 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,17 +57,17 @@ using namespace ::com::sun::star; sal_uInt16 nTypeResIds[SC_LINKTARGETTYPE_COUNT] = { - SCSTR_CONTENT_TABLE, // SC_LINKTARGETTYPE_SHEET - SCSTR_CONTENT_RANGENAME, // SC_LINKTARGETTYPE_RANGENAME - SCSTR_CONTENT_DBAREA // SC_LINKTARGETTYPE_DBAREA + SCSTR_CONTENT_TABLE, // SC_LINKTARGETTYPE_SHEET + SCSTR_CONTENT_RANGENAME, // SC_LINKTARGETTYPE_RANGENAME + SCSTR_CONTENT_DBAREA // SC_LINKTARGETTYPE_DBAREA }; const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() { static SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((const uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((const uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {0,0,0,0,0,0} }; return aLinkTargetMap_Impl; @@ -76,7 +76,7 @@ const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() //------------------------------------------------------------------------ // service for ScLinkTargetTypeObj is not defined -// must not support document::LinkTarget because the target type cannot be used as a target +// must not support document::LinkTarget because the target type cannot be used as a target SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypesObj, "ScLinkTargetTypesObj", "com.sun.star.document.LinkTargets" ) SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypeObj, "ScLinkTargetTypeObj", "com.sun.star.document.LinkTargetSupplier" ) @@ -102,7 +102,7 @@ ScLinkTargetTypesObj::~ScLinkTargetTypesObj() void ScLinkTargetTypesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) - pDocShell = NULL; // document gone + pDocShell = NULL; // document gone } // container::XNameAccess @@ -158,7 +158,7 @@ ScLinkTargetTypeObj::ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT) : nType( nT ) { pDocShell->GetDocument()->AddUnoObject(*this); - aName = String( ScResId( nTypeResIds[nType] ) ); //! on demand? + aName = String( ScResId( nTypeResIds[nType] ) ); //! on demand? } ScLinkTargetTypeObj::~ScLinkTargetTypeObj() @@ -170,7 +170,7 @@ ScLinkTargetTypeObj::~ScLinkTargetTypeObj() void ScLinkTargetTypeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) - pDocShell = NULL; // document gone + pDocShell = NULL; // document gone } // document::XLinkTargetSupplier @@ -197,8 +197,8 @@ uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks } } - // wrap collection in ScLinkTargetsObj because service document::LinkTargets requires - // beans::XPropertySet as ElementType in container::XNameAccess. + // wrap collection in ScLinkTargetsObj because service document::LinkTargets requires + // beans::XPropertySet as ElementType in container::XNameAccess. if ( xCollection.is() ) return new ScLinkTargetsObj( xCollection ); return NULL; @@ -215,17 +215,17 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getProp void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const rtl::OUString& /* aPropertyName */, const uno::Any& /* aValue */) - throw( beans::UnknownPropertyException, + throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - // everything is read-only - //! exception? + // everything is read-only + //! exception? } -// static +// static void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType ) { sal_uInt16 nImgId = 0; diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index d97cce02b426..0de4ab2b976f 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,15 +73,15 @@ const SvxItemPropertySet * lcl_GetHdFtPropertySet() SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties + SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties {0,0,0,0,0,0} }; static BOOL bTwipsSet = FALSE; if (!bTwipsSet) { - // modify PropertyMap to include CONVERT_TWIPS flag for font height - // (headers/footers are in twips) + // modify PropertyMap to include CONVERT_TWIPS flag for font height + // (headers/footers are in twips) SfxItemPropertyMapEntry* pEntry = aHdFtPropertyMap_Impl; while (pEntry->pName) @@ -98,7 +98,7 @@ const SvxItemPropertySet * lcl_GetHdFtPropertySet() } bTwipsSet = TRUE; } - static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); + static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aHdFtPropertySet_Impl; } @@ -112,16 +112,16 @@ SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* pLeft, const EditTextObject* pCenter, const EditTextObject* pRight ) : - pLeftText ( NULL ), - pCenterText ( NULL ), - pRightText ( NULL ) + pLeftText ( NULL ), + pCenterText ( NULL ), + pRightText ( NULL ) { if ( pLeft ) - pLeftText = pLeft->Clone(); + pLeftText = pLeft->Clone(); if ( pCenter ) - pCenterText = pCenter->Clone(); + pCenterText = pCenter->Clone(); if ( pRight ) - pRightText = pRight->Clone(); + pRightText = pRight->Clone(); } ScHeaderFooterContentObj::~ScHeaderFooterContentObj() @@ -154,7 +154,7 @@ void ScHeaderFooterContentObj::UpdateText( USHORT nPart, EditEngine& rSource ) delete pCenterText; pCenterText = pNew; break; - default: // SC_HDFT_RIGHT + default: // SC_HDFT_RIGHT delete pRightText; pRightText = pNew; break; @@ -240,13 +240,13 @@ ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterContentObj& rConte bDataValid( FALSE ), bInUpdate( FALSE ) { - rContentObj.acquire(); // must not go away + rContentObj.acquire(); // must not go away rContentObj.AddListener( *this ); } ScHeaderFooterTextData::~ScHeaderFooterTextData() { - SolarMutexGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor rContentObj.RemoveListener( *this ); @@ -262,8 +262,8 @@ void ScHeaderFooterTextData::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( ((const ScHeaderFooterChangedHint&)rHint).GetPart() == nPart ) { - if (!bInUpdate) // not for own updates - bDataValid = FALSE; // text has to be fetched again + if (!bInUpdate) // not for own updates + bDataValid = FALSE; // text has to be fetched again } } } @@ -279,14 +279,14 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder() pHdrEngine->EnableUndo( FALSE ); pHdrEngine->SetRefMapMode( MAP_TWIP ); - // default font must be set, independently of document - // -> use global pool from module + // default font must be set, independently of document + // -> use global pool from module SfxItemSet aDefaults( pHdrEngine->GetEmptyItemSet() ); const ScPatternAttr& rPattern = (const ScPatternAttr&)SC_MOD()->GetPool().GetDefaultItem(ATTR_PATTERN); rPattern.FillEditItemSet( &aDefaults ); - // FillEditItemSet adjusts font height to 1/100th mm, - // but for header/footer twips is needed, as in the PatternAttr: + // FillEditItemSet adjusts font height to 1/100th mm, + // but for header/footer twips is needed, as in the PatternAttr: aDefaults.Put( rPattern.GetItem(ATTR_FONT_HEIGHT), EE_CHAR_FONTHEIGHT ); aDefaults.Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CJK ); aDefaults.Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CTL ); @@ -322,7 +322,7 @@ void ScHeaderFooterTextData::UpdateData() { if ( pEditEngine ) { - bInUpdate = TRUE; // don't reset bDataValid during UpdateText + bInUpdate = TRUE; // don't reset bDataValid during UpdateText rContentObj.UpdateText( nPart, *pEditEngine ); @@ -337,15 +337,15 @@ ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent aTextData( rContent, nP ), pUnoText( NULL ) { - // ScHeaderFooterTextData acquires rContent - // pUnoText is created on demand (getString/setString work without it) + // ScHeaderFooterTextData acquires rContent + // pUnoText is created on demand (getString/setString work without it) } void ScHeaderFooterTextObj::CreateUnoText_Impl() { if ( !pUnoText ) { - // can't be aggregated because getString/setString is handled here + // can't be aggregated because getString/setString is handled here ScSharedHeaderFooterEditSource aEditSource( &aTextData ); pUnoText = new SvxUnoText( &aEditSource, lcl_GetHdFtPropertySet(), uno::Reference<text::XText>() ); pUnoText->acquire(); @@ -382,18 +382,18 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs if (!pUnoText) CreateUnoText_Impl(); return pUnoText->createTextCursorByRange(aTextPosition); - //! wie ScCellObj::createTextCursorByRange, wenn SvxUnoTextRange_getReflection verfuegbar + //! wie ScCellObj::createTextCursorByRange, wenn SvxUnoTextRange_getReflection verfuegbar } -void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) // static +void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) // static { String aDummy(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "???" ))); - rData.aTitle = aDummy; - rData.aLongDocName = aDummy; - rData.aShortDocName = aDummy; - rData.aTabName = aDummy; - rData.nPageNo = 1; - rData.nTotalPages = 99; + rData.aTitle = aDummy; + rData.aLongDocName = aDummy; + rData.aShortDocName = aDummy; + rData.aTabName = aDummy; + rData.nPageNo = 1; + rData.nTotalPages = 99; } rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException) @@ -480,7 +480,7 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent( if (!bAbsorb) { - // don't replace -> append at end + // don't replace -> append at end aSelection.Adjust(); aSelection.nStartPara = aSelection.nEndPara; aSelection.nStartPos = aSelection.nEndPos; @@ -492,14 +492,14 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent( pForwarder->QuickInsertField( aItem, aSelection ); pEditSource->UpdateData(); - // neue Selektion: ein Zeichen + // neue Selektion: ein Zeichen aSelection.Adjust(); aSelection.nEndPara = aSelection.nStartPara; aSelection.nEndPos = aSelection.nStartPos + 1; pHeaderField->InitDoc( &aTextData.GetContentObj(), aTextData.GetPart(), aSelection ); - // #91431# for bAbsorb=FALSE, the new selection must be behind the inserted content - // (the xml filter relies on this) + // #91431# for bAbsorb=FALSE, the new selection must be behind the inserted content + // (the xml filter relies on this) if (!bAbsorb) aSelection.nStartPos = aSelection.nEndPos; @@ -524,7 +524,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent( ScHeaderFieldObj* pHeaderField = ScHeaderFieldObj::getImplementation( xContent ); if ( pHeaderField && pHeaderField->IsInserted() ) { - //! Testen, ob das Feld in dieser Zelle ist + //! Testen, ob das Feld in dieser Zelle ist pHeaderField->DeleteField(); return; } @@ -571,7 +571,7 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::ge uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFieldMasters() throw(uno::RuntimeException) { - // sowas gibts nicht im Calc (?) + // sowas gibts nicht im Calc (?) return NULL; } @@ -650,7 +650,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno { SolarMutexGuard aGuard; - //! use other object for range than cursor? + //! use other object for range than cursor? ScCellTextCursor* pNew = new ScCellTextCursor( *this ); uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) ); @@ -667,7 +667,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno:: { SolarMutexGuard aGuard; - //! use other object for range than cursor? + //! use other object for range than cursor? ScCellTextCursor* pNew = new ScCellTextCursor( *this ); uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) ); @@ -754,7 +754,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() t { SolarMutexGuard aGuard; - //! use other object for range than cursor? + //! use other object for range than cursor? ScHeaderFooterTextCursor* pNew = new ScHeaderFooterTextCursor( *this ); uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) ); @@ -771,7 +771,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() thr { SolarMutexGuard aGuard; - //! use other object for range than cursor? + //! use other object for range than cursor? ScHeaderFooterTextCursor* pNew = new ScHeaderFooterTextCursor( *this ); uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) ); @@ -858,7 +858,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno { SolarMutexGuard aGuard; - //! use other object for range than cursor? + //! use other object for range than cursor? ScDrawTextCursor* pNew = new ScDrawTextCursor( *this ); uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) ); @@ -875,7 +875,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno:: { SolarMutexGuard aGuard; - //! use other object for range than cursor? + //! use other object for range than cursor? ScDrawTextCursor* pNew = new ScDrawTextCursor( *this ); uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) ); @@ -937,14 +937,14 @@ ScSimpleEditSourceHelper::ScSimpleEditSourceHelper() pEnginePool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); pEnginePool->FreezeIdRanges(); - pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE ); // TRUE: become owner of pool + pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE ); // TRUE: become owner of pool pForwarder = new SvxEditEngineForwarder( *pEditEngine ); pOriginalSource = new ScSimpleEditSource( pForwarder ); } ScSimpleEditSourceHelper::~ScSimpleEditSourceHelper() { - SolarMutexGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor delete pOriginalSource; delete pForwarder; @@ -993,7 +993,7 @@ ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) : ScCellTextData::~ScCellTextData() { - SolarMutexGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor if (pDocShell) { @@ -1039,9 +1039,9 @@ SvxTextForwarder* ScCellTextData::GetTextForwarder() pEnginePool->FreezeIdRanges(); pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE ); } - // currently, GetPortions doesn't work if UpdateMode is FALSE, - // this will be fixed (in EditEngine) by src600 -// pEditEngine->SetUpdateMode( FALSE ); + // currently, GetPortions doesn't work if UpdateMode is FALSE, + // this will be fixed (in EditEngine) by src600 +// pEditEngine->SetUpdateMode( FALSE ); pEditEngine->EnableUndo( FALSE ); if (pDocShell) pEditEngine->SetRefDevice(pDocShell->GetRefDevice()); @@ -1091,14 +1091,14 @@ void ScCellTextData::UpdateData() DBG_ASSERT(pEditEngine != NULL, "no EditEngine for UpdateData()"); if ( pDocShell && pEditEngine ) { - // during the own UpdateData call, bDataValid must not be reset, - // or things like attributes after the text would be lost - // (are not stored in the cell) + // during the own UpdateData call, bDataValid must not be reset, + // or things like attributes after the text would be lost + // (are not stored in the cell) - bInUpdate = TRUE; // prevents bDataValid from being reset + bInUpdate = TRUE; // prevents bDataValid from being reset ScDocFunc aFunc(*pDocShell); - aFunc.PutData( aCellPos, *pEditEngine, FALSE, TRUE ); // always as text + aFunc.PutData( aCellPos, *pEditEngine, FALSE, TRUE ); // always as text bInUpdate = FALSE; bDirty = FALSE; @@ -1114,22 +1114,22 @@ void ScCellTextData::Notify( SfxBroadcaster&, const SfxHint& rHint ) { // const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - //! Ref-Update + //! Ref-Update } else if ( rHint.ISA( SfxSimpleHint ) ) { ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) { - pDocShell = NULL; // invalid now + pDocShell = NULL; // invalid now DELETEZ( pForwarder ); - DELETEZ( pEditEngine ); // EditEngine uses document's pool + DELETEZ( pEditEngine ); // EditEngine uses document's pool } else if ( nId == SFX_HINT_DATACHANGED ) { - if (!bInUpdate) // not for own UpdateData calls - bDataValid = FALSE; // text has to be read from the cell again + if (!bInUpdate) // not for own UpdateData calls + bDataValid = FALSE; // text has to be read from the cell again } } } diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index fff4fe64d8ba..9112d18e563c 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index 0350546cce2a..6fa0a4710a90 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/unoobj/unoreflist.cxx b/sc/source/ui/unoobj/unoreflist.cxx index 1a80e1e8b2c7..f67499419e07 100644 --- a/sc/source/ui/unoobj/unoreflist.cxx +++ b/sc/source/ui/unoobj/unoreflist.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 297ae74b5de1..041ecf707674 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -79,9 +79,9 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -//! Clipping-Markierungen +//! Clipping-Markierungen -// alles ohne Which-ID, Map nur fuer PropertySetInfo +// alles ohne Which-ID, Map nur fuer PropertySetInfo const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() { @@ -129,8 +129,8 @@ SV_IMPL_PTRARR( XViewPropertyChangeListenerArr_Impl, XViewPropertyChangeListener SV_IMPL_PTRARR( XMouseClickHandlerArr_Impl, XMouseClickHandlerPtr ); SV_IMPL_PTRARR( XActivationEventListenerArr_Impl, XActivationEventListenerPtr ); -#define SCTABVIEWOBJ_SERVICE "com.sun.star.sheet.SpreadsheetView" -#define SCVIEWSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetViewSettings" +#define SCTABVIEWOBJ_SERVICE "com.sun.star.sheet.SpreadsheetView" +#define SCVIEWSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetViewSettings" SC_SIMPLE_SERVICE_INFO( ScViewPaneBase, "ScViewPaneObj", "com.sun.star.sheet.SpreadsheetViewPane" ) @@ -167,7 +167,7 @@ uno::Any SAL_CALL ScViewPaneBase::queryInterface( const uno::Type& rType ) SC_QUERYINTERFACE( lang::XServiceInfo ) SC_QUERYINTERFACE( lang::XTypeProvider ) - return uno::Any(); // OWeakObject is in derived objects + return uno::Any(); // OWeakObject is in derived objects } uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeException) @@ -213,7 +213,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeExc return pViewData->GetPosX( eWhichH ); } - DBG_ERROR("keine View ?!?"); //! Exception? + DBG_ERROR("keine View ?!?"); //! Exception? return 0; } @@ -247,7 +247,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeExcept return pViewData->GetPosY( eWhichV ); } - DBG_ERROR("keine View ?!?"); //! Exception? + DBG_ERROR("keine View ?!?"); //! Exception? return 0; } @@ -281,19 +281,19 @@ table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() throw(uno::Ru ScHSplitPos eWhichH = WhichH( eWhich ); ScVSplitPos eWhichV = WhichV( eWhich ); - // VisibleCellsX gibt nur komplett sichtbare Zellen, - // VisibleRange in Excel auch teilweise sichtbare. - //! anpassen ??? + // VisibleCellsX gibt nur komplett sichtbare Zellen, + // VisibleRange in Excel auch teilweise sichtbare. + //! anpassen ??? SCCOL nVisX = pViewData->VisibleCellsX( eWhichH ); SCROW nVisY = pViewData->VisibleCellsY( eWhichV ); - if (!nVisX) nVisX = 1; // irgendwas muss ja im Range sein + if (!nVisX) nVisX = 1; // irgendwas muss ja im Range sein if (!nVisY) nVisY = 1; - aAdr.Sheet = pViewData->GetTabNo(); + aAdr.Sheet = pViewData->GetTabNo(); aAdr.StartColumn = pViewData->GetPosX( eWhichH ); - aAdr.StartRow = pViewData->GetPosY( eWhichV ); - aAdr.EndColumn = aAdr.StartColumn + nVisX - 1; - aAdr.EndRow = aAdr.StartRow + nVisY - 1; + aAdr.StartRow = pViewData->GetPosY( eWhichV ); + aAdr.EndColumn = aAdr.StartColumn + nVisX - 1; + aAdr.EndRow = aAdr.StartRow + nVisY - 1; } return aAdr; } @@ -308,7 +308,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScViewPaneBase::getReferredCells() { ScDocShell* pDocSh = pViewShell->GetViewData()->GetDocShell(); - table::CellRangeAddress aAdr(getVisibleRange()); //! Hilfsfunktion mit ScRange? + table::CellRangeAddress aAdr(getVisibleRange()); //! Hilfsfunktion mit ScRange? ScRange aRange( (SCCOL)aAdr.StartColumn, (SCROW)aAdr.StartRow, aAdr.Sheet, (SCCOL)aAdr.EndColumn, (SCROW)aAdr.EndRow, aAdr.Sheet ); if ( aRange.aStart == aRange.aEnd ) @@ -395,7 +395,7 @@ uno::Reference<awt::XControl> SAL_CALL ScViewPaneBase::getControl( pFormShell->GetFormControl( xModel, *pSdrView, *pWindow, xRet ); if ( !xRet.is() ) - throw container::NoSuchElementException(); // no control found + throw container::NoSuchElementException(); // no control found return xRet; } @@ -443,7 +443,7 @@ ScViewPaneObj::~ScViewPaneObj() uno::Any SAL_CALL ScViewPaneObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException) { - // ScViewPaneBase has everything except OWeakObject + // ScViewPaneBase has everything except OWeakObject uno::Any aRet(ScViewPaneBase::queryInterface( rType )); if (!aRet.hasValue()) @@ -548,7 +548,7 @@ void SAL_CALL ScTabViewEventListener::selectionChanged( const lang::EventObject& //------------------------------------------------------------------------ -// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht +// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) : ScViewPaneBase( pViewSh, SC_VIEWPANE_ACTIVE ), @@ -580,7 +580,7 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) : ScTabViewObj::~ScTabViewObj() { - //! Listening oder so + //! Listening oder so if (aMouseClickHandlers.Count()) { acquire(); @@ -732,7 +732,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeExc long i; for (i=0; i<nViewPaneLen; i++) - pPtr[i] = pViewPanePtr[i]; // parent types first + pPtr[i] = pViewPanePtr[i]; // parent types first for (i=0; i<nControllerLen; i++) pPtr[nViewPaneLen+i] = pControllerPtr[i]; } @@ -807,7 +807,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) if ( !pViewSh ) return FALSE; - //! Type of aSelection can be some specific interface instead of XInterface + //! Type of aSelection can be some specific interface instead of XInterface BOOL bRet = FALSE; uno::Reference<uno::XInterface> xInterface(aSelection, uno::UNO_QUERY); @@ -840,13 +840,13 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) uno::Reference<drawing::XShape> xShapeSel( xInterface, uno::UNO_QUERY ); SvxShape* pShapeImp = SvxShape::getImplementation( xShapeSel ); - if (pRangesImp) // Zell-Ranges + if (pRangesImp) // Zell-Ranges { ScViewData* pViewData = pViewSh->GetViewData(); if ( pViewData->GetDocShell() == pRangesImp->GetDocShell() ) { - // Zuerst evtl. Drawing-Selektion aufheben - // (MarkListHasChanged hebt Tabellen-Selektion auf) + // Zuerst evtl. Drawing-Selektion aufheben + // (MarkListHasChanged hebt Tabellen-Selektion auf) ScDrawView* pDrawView = pViewSh->GetScDrawView(); if (pDrawView) @@ -857,15 +857,15 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) FuPoor* pFunc = pViewSh->GetDrawFuncPtr(); if ( pFunc && pFunc->GetSlotID() != SID_OBJECT_SELECT ) { - // Slot der Zeichenfunktion nochmal ausfuehren -> abschalten + // Slot der Zeichenfunktion nochmal ausfuehren -> abschalten SfxDispatcher* pDisp = pViewSh->GetDispatcher(); if (pDisp) pDisp->Execute( pFunc->GetSlotID(), SFX_CALLMODE_SYNCHRON ); } pViewSh->SetDrawShell(FALSE); - pViewSh->SetDrawSelMode(FALSE); // nach dem Dispatcher-Execute + pViewSh->SetDrawSelMode(FALSE); // nach dem Dispatcher-Execute - // Ranges selektieren + // Ranges selektieren const ScRangeList& rRanges = pRangesImp->GetRangeList(); ULONG nRangeCount = rRanges.Count(); @@ -876,7 +876,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) pViewSh->MarkRange( *rRanges.GetObject(0) ); else { - // Mehrfachselektion + // Mehrfachselektion const ScRange* pFirst = rRanges.GetObject(0); if ( pFirst && !lcl_TabInRanges( pViewData->GetTabNo(), rRanges ) ) @@ -885,7 +885,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) pViewSh->InitOwnBlockMode(); pViewData->GetMarkData().MarkFromRangeList( rRanges, TRUE ); pViewSh->MarkDataChanged(); - pViewData->GetDocShell()->PostPaintGridAll(); // Markierung (alt&neu) + pViewData->GetDocShell()->PostPaintGridAll(); // Markierung (alt&neu) if ( pFirst ) { pViewSh->AlignToCursor( pFirst->aStart.Col(), pFirst->aStart.Row(), @@ -893,12 +893,12 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) pViewSh->SetCursor( pFirst->aStart.Col(), pFirst->aStart.Row() ); } - //! Methode an der View, um RangeList zu selektieren + //! Methode an der View, um RangeList zu selektieren } bRet = TRUE; } } - else if ( pShapeImp || xShapeColl.is() ) // Drawing-Layer + else if ( pShapeImp || xShapeColl.is() ) // Drawing-Layer { ScDrawView* pDrawView = pViewSh->GetScDrawView(); if (pDrawView) @@ -906,7 +906,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) pDrawView->ScEndTextEdit(); pDrawView->UnmarkAll(); - if (pShapeImp) // einzelnes Shape + if (pShapeImp) // einzelnes Shape { SdrObject *pObj = pShapeImp->GetSdrObject(); if (pObj) @@ -920,11 +920,11 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) } } } - else // Shape-Collection (xShapeColl ist nicht 0) + else // Shape-Collection (xShapeColl ist nicht 0) { - // Es wird auf die Tabelle des ersten Objekts umgeschaltet, - // und alle Objekte selektiert, die auf dieser Tabelle liegen - //! Exception, wenn Objekte auf verschiedenen Tabellen? + // Es wird auf die Tabelle des ersten Objekts umgeschaltet, + // und alle Objekte selektiert, die auf dieser Tabelle liegen + //! Exception, wenn Objekte auf verschiedenen Tabellen? SdrPageView* pPV = NULL; long nCount = xShapeColl->getCount(); @@ -948,7 +948,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) pViewSh->UpdateLayerLocks(); bDrawSelModeSet = sal_True; } - if (!pPV) // erstes Objekt + if (!pPV) // erstes Objekt { lcl_ShowObject( *pViewSh, *pDrawView, pObj ); pPV = pDrawView->GetSdrPageView(); @@ -989,7 +989,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException) ScCellRangesBase* pObj = NULL; if (pViewSh) { - // Ist auf dem Drawing-Layer etwas selektiert? + // Ist auf dem Drawing-Layer etwas selektiert? SdrView* pDrawView = pViewSh->GetSdrView(); if (pDrawView) @@ -998,8 +998,8 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException) ULONG nMarkCount = rMarkList.GetMarkCount(); if (nMarkCount) { - // ShapeCollection erzeugen (wie in SdXImpressView::getSelection im Draw) - // Zurueckgegeben wird XInterfaceRef, das muss das UsrObject-XInterface sein + // ShapeCollection erzeugen (wie in SdXImpressView::getSelection im Draw) + // Zurueckgegeben wird XInterfaceRef, das muss das UsrObject-XInterface sein SvxShapeCollection* pShapes = new SvxShapeCollection(); uno::Reference<uno::XInterface> xRet(static_cast<cppu::OWeakObject*>(pShapes)); @@ -1018,7 +1018,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException) } } - // sonst Tabellen-(Zellen-)Selektion + // sonst Tabellen-(Zellen-)Selektion ScViewData* pViewData = pViewSh->GetViewData(); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -1062,13 +1062,13 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException) pObj = new ScCellRangesObj( pDocSh, aRangeList ); } } - else // Mehrfachselektion + else // Mehrfachselektion { ScRangeListRef xRanges; pViewData->GetMultiArea( xRanges ); - // bei mehreren Tabellen Ranges kopieren - //! sollte eigentlich schon in ScMarkData::FillRangeListWithMarks passieren? + // bei mehreren Tabellen Ranges kopieren + //! sollte eigentlich schon in ScMarkData::FillRangeListWithMarks passieren? if ( nTabs > 1 ) rMark.ExtendRangeListTables( xRanges ); @@ -1077,8 +1077,8 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException) if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) { - // remember if the selection was from the cursor position without anything selected - // (used when rendering the selection) + // remember if the selection was from the cursor position without anything selected + // (used when rendering the selection) pObj->SetCursorOnly( TRUE ); } @@ -1150,14 +1150,14 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(USHORT nIndex) const ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { - ScSplitPos eWhich = SC_SPLIT_BOTTOMLEFT; // default Position + ScSplitPos eWhich = SC_SPLIT_BOTTOMLEFT; // default Position BOOL bError = FALSE; ScViewData* pViewData = pViewSh->GetViewData(); BOOL bHor = ( pViewData->GetHSplitMode() != SC_SPLIT_NONE ); BOOL bVer = ( pViewData->GetVSplitMode() != SC_SPLIT_NONE ); if ( bHor && bVer ) { - // links oben, links unten, rechts oben, rechts unten - wie in Excel + // links oben, links unten, rechts oben, rechts unten - wie in Excel if ( nIndex < 4 ) eWhich = ePosHV[nIndex]; else @@ -1180,7 +1180,7 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(USHORT nIndex) const // sonst SC_SPLIT_BOTTOMLEFT } else if ( nIndex > 0 ) - bError = TRUE; // nicht geteilt: nur 0 gueltig + bError = TRUE; // nicht geteilt: nur 0 gueltig if (!bError) return new ScViewPaneObj( pViewSh, sal::static_int_cast<USHORT>(eWhich) ); @@ -1221,7 +1221,7 @@ ScTabViewObj::selectSheet( const uno::Reference<sheet::XSpreadsheet>& xActiveShe ScTabViewShell* pViewSh = GetViewShell(); if ( pViewSh && xActiveSheet.is() ) { - // XSpreadsheet und ScCellRangesBase -> muss ein Sheet sein + // XSpreadsheet und ScCellRangesBase -> muss ein Sheet sein ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xActiveSheet ); if ( pRangesImp && pViewSh->GetViewData()->GetDocShell() == pRangesImp->GetDocShell() ) @@ -1551,7 +1551,7 @@ INT16 ScTabViewObj::GetZoom(void) const ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { - const Fraction& rZoomY = pViewSh->GetViewData()->GetZoomY(); // Y wird angezeigt + const Fraction& rZoomY = pViewSh->GetViewData()->GetZoomY(); // Y wird angezeigt return (INT16)(( rZoomY.GetNumerator() * 100 ) / rZoomY.GetDenominator()); } return 0; @@ -1645,8 +1645,8 @@ void ScTabViewObj::SetZoomType(INT16 aZoomType) sal_Int16 nOldZoom(nZoom); if ( eZoomType == SVX_ZOOM_PERCENT ) { - if ( nZoom < MINZOOM ) nZoom = MINZOOM; - if ( nZoom > MAXZOOM ) nZoom = MAXZOOM; + if ( nZoom < MINZOOM ) nZoom = MINZOOM; + if ( nZoom > MAXZOOM ) nZoom = MAXZOOM; } else nZoom = pView->CalcZoom( eZoomType, nOldZoom ); @@ -1669,7 +1669,7 @@ void ScTabViewObj::SetZoomType(INT16 aZoomType) sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // wie Menue-Slot SID_WINDOW_SPLIT + // wie Menue-Slot SID_WINDOW_SPLIT ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) @@ -1685,7 +1685,7 @@ sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException) sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - // wie Menue-Slot SID_WINDOW_FIX + // wie Menue-Slot SID_WINDOW_FIX ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) @@ -1760,7 +1760,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException) { long nSplit = pViewData->GetVSplitPos(); - ScSplitPos ePos = SC_SPLIT_TOPLEFT; // es ist vertikal geteilt + ScSplitPos ePos = SC_SPLIT_TOPLEFT; // es ist vertikal geteilt SCsCOL nCol; SCsROW nRow; pViewData->GetPosFromPixel( 0, nSplit, ePos, nCol, nRow, FALSE ); @@ -1791,7 +1791,7 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { - // erst alles aufheben -> kein Stress mit Scrolling zwischendurch o.ae. + // erst alles aufheben -> kein Stress mit Scrolling zwischendurch o.ae. pViewSh->RemoveSplit(); @@ -1829,7 +1829,7 @@ void SAL_CALL ScTabViewObj::removeSelectionChangeListener( for ( USHORT n=nCount; n--; ) { uno::Reference<view::XSelectionChangeListener> *pObj = aSelectionListeners[n]; - if ( *pObj == xListener ) //! wozu der Mumpitz mit queryInterface? + if ( *pObj == xListener ) //! wozu der Mumpitz mit queryInterface? { aSelectionListeners.DeleteAndDestroy( n ); break; @@ -1869,8 +1869,8 @@ void ScTabViewObj::SelectionChanged() } -// XPropertySet (View-Optionen) -//! auch an der Applikation anbieten? +// XPropertySet (View-Optionen) +//! auch an der Applikation anbieten? uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInfo() throw(uno::RuntimeException) @@ -1983,16 +1983,16 @@ void SAL_CALL ScTabViewObj::setPropertyValue( SetZoom(nIntVal); } - // Optionen werden an der View und am Dokument (fuer neue Views) gesetzt, - // damit sie beim Speichern erhalten bleiben. - //! An der App (Module) braeuchte man noch eine Extra-Moeglichkeit, - //! das einzustellen (fuer neue Dokumente) + // Optionen werden an der View und am Dokument (fuer neue Views) gesetzt, + // damit sie beim Speichern erhalten bleiben. + //! An der App (Module) braeuchte man noch eine Extra-Moeglichkeit, + //! das einzustellen (fuer neue Dokumente) if ( aNewOpt != rOldOpt ) { pViewData->SetOptions( aNewOpt ); pViewData->GetDocument()->SetViewOptions( aNewOpt ); - pViewData->GetDocShell()->SetDocumentModified(); //! wirklich? + pViewData->GetDocShell()->SetDocumentModified(); //! wirklich? pViewSh->UpdateFixPos(); pViewSh->PaintGrid(); @@ -2036,21 +2036,21 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty else if ( aString.EqualsAscii( SC_UNO_SHEETTABS ) || aString.EqualsAscii( OLD_UNO_SHEETTABS ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_TABCONTROLS ) ); else if ( aString.EqualsAscii( SC_UNO_SHOWANCHOR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_ANCHOR ) ); - else if ( aString.EqualsAscii( SC_UNO_SHOWFORM ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_FORMULAS ) ); - else if ( aString.EqualsAscii( SC_UNO_SHOWGRID ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_GRID ) ); - else if ( aString.EqualsAscii( SC_UNO_SHOWHELP ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_HELPLINES ) ); - else if ( aString.EqualsAscii( SC_UNO_SHOWNOTES ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NOTES ) ); + else if ( aString.EqualsAscii( SC_UNO_SHOWFORM ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_FORMULAS ) ); + else if ( aString.EqualsAscii( SC_UNO_SHOWGRID ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_GRID ) ); + else if ( aString.EqualsAscii( SC_UNO_SHOWHELP ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_HELPLINES ) ); + else if ( aString.EqualsAscii( SC_UNO_SHOWNOTES ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NOTES ) ); else if ( aString.EqualsAscii( SC_UNO_SHOWPAGEBR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_PAGEBREAKS ) ); - else if ( aString.EqualsAscii( SC_UNO_SHOWZERO ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NULLVALS ) ); - else if ( aString.EqualsAscii( SC_UNO_SHOWSOLID ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SOLIDHANDLES ) ); + else if ( aString.EqualsAscii( SC_UNO_SHOWZERO ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NULLVALS ) ); + else if ( aString.EqualsAscii( SC_UNO_SHOWSOLID ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SOLIDHANDLES ) ); else if ( aString.EqualsAscii( SC_UNO_VALUEHIGH ) || aString.EqualsAscii( OLD_UNO_VALUEHIGH ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SYNTAX ) ); else if ( aString.EqualsAscii( SC_UNO_VERTSCROLL ) || aString.EqualsAscii( OLD_UNO_VERTSCROLL ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_VSCROLL ) ); - else if ( aString.EqualsAscii( SC_UNO_SHOWOBJ ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_OLE ) ); + else if ( aString.EqualsAscii( SC_UNO_SHOWOBJ ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_OLE ) ); else if ( aString.EqualsAscii( SC_UNO_SHOWCHARTS ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_CHART ) ); - else if ( aString.EqualsAscii( SC_UNO_SHOWDRAW ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_DRAW ) ); - else if ( aString.EqualsAscii( SC_UNO_GRIDCOLOR ) ) aRet <<= (sal_Int32)( rOpt.GetGridColor().GetColor() ); + else if ( aString.EqualsAscii( SC_UNO_SHOWDRAW ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_DRAW ) ); + else if ( aString.EqualsAscii( SC_UNO_GRIDCOLOR ) ) aRet <<= (sal_Int32)( rOpt.GetGridColor().GetColor() ); else if ( aString.EqualsAscii( SC_UNO_VISAREA ) ) aRet <<= GetVisArea(); else if ( aString.EqualsAscii( SC_UNO_ZOOMTYPE ) ) aRet <<= GetZoomType(); else if ( aString.EqualsAscii( SC_UNO_ZOOMVALUE ) ) aRet <<= GetZoom(); @@ -2082,7 +2082,7 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString& for ( USHORT n=nCount; n--; ) { uno::Reference<beans::XPropertyChangeListener> *pObj = aPropertyChgListeners[n]; - if ( *pObj == xListener ) //! wozu der Mumpitz mit queryInterface? + if ( *pObj == xListener ) //! wozu der Mumpitz mit queryInterface? { aPropertyChgListeners.DeleteAndDestroy( n ); break; diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index c00df0a3eedf..426644d9f736 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,10 +62,10 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium ) { OUString empty; - Any xException( makeAny(InteractiveAppException(empty, - Reference <XInterface> (), - InteractionClassification_QUERY, - ERRCODE_SVX_EXPORT_FILTER_CRYPT))); + Any xException( makeAny(InteractiveAppException(empty, + Reference <XInterface> (), + InteractionClassification_QUERY, + ERRCODE_SVX_EXPORT_FILTER_CRYPT))); Reference< ucbhelper::SimpleInteractionRequest > xRequest = new ucbhelper::SimpleInteractionRequest( @@ -83,7 +83,7 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium ) break; case ucbhelper::CONTINUATION_APPROVE: - // Continue + // Continue break; case ucbhelper::CONTINUATION_DISAPPROVE: |