diff options
Diffstat (limited to 'sc/source/ui')
767 files changed, 22914 insertions, 22920 deletions
diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx index d0b9d3192da6..349cca39a58d 100644 --- a/sc/source/ui/Accessibility/AccessibilityHints.cxx +++ b/sc/source/ui/Accessibility/AccessibilityHints.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 @@ -33,7 +33,7 @@ #include "AccessibilityHints.hxx" -using namespace ::com::sun::star; +using namespace ::com::sun::star; // ----------------------------------------------------------------------- diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index aaf38396ac42..79f9957aa9c2 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.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,8 +57,8 @@ #include <float.h> #include <vcl/svapp.hxx> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ============================================================ diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 5e59d9b09eee..1ba7938a6a9b 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.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 @@ -54,8 +54,8 @@ #include <float.h> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ============================================================ diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 621a55ae0c18..da2075947bc3 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.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 @@ -48,9 +48,9 @@ #include <comphelper/accessibleeventnotifier.hxx> #include <vcl/svapp.hxx> -using namespace ::rtl; -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::rtl; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ============================================================ @@ -100,7 +100,7 @@ void ScAccessibleContextBase::Init() void SAL_CALL ScAccessibleContextBase::disposing() { SolarMutexGuard aGuard; -// CommitDefunc(); not necessary and should not be send, because it cost a lot of time +// CommitDefunc(); not necessary and should not be send, because it cost a lot of time // hold reference to make sure that the destructor is not called uno::Reference< XAccessibleContext > xOwnContext(this); @@ -292,12 +292,12 @@ sal_Int32 SAL_CALL { SolarMutexGuard aGuard; IsObjectValid(); - // Use a simple but slow solution for now. Optimize later. - // Return -1 to indicate that this object's parent does not know about the - // object. + // Use a simple but slow solution for now. Optimize later. + // Return -1 to indicate that this object's parent does not know about the + // object. sal_Int32 nIndex(-1); - // Iterate over all the parent's children and search for this object. + // Iterate over all the parent's children and search for this object. if (mxParent.is()) { uno::Reference<XAccessibleContext> xParentContext ( @@ -336,7 +336,7 @@ sal_Int16 SAL_CALL if (!msDescription.getLength()) { OUString sDescription(createAccessibleDescription()); -// DBG_ASSERT(sDescription.getLength(), "We should give always a descripition."); +// DBG_ASSERT(sDescription.getLength(), "We should give always a descripition."); if (msDescription != sDescription) { @@ -410,8 +410,8 @@ lang::Locale SAL_CALL return xParentContext->getLocale (); } - // No locale and no parent. Therefore throw exception to indicate this - // cluelessness. + // No locale and no parent. Therefore throw exception to indicate this + // cluelessness. throw IllegalAccessibleComponentStateException (); } diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index c70aa3a5e56e..b6829243ecf8 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.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 @@ -75,7 +75,7 @@ using ::com::sun::star::lang::DisposedException; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::beans::PropertyValue; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; // ---------------------------------------------------------------------------- diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index ea4865c91724..198223430a26 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.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 @@ -42,11 +42,11 @@ #include <tools/debug.hxx> #include <vcl/svapp.hxx> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; class ScAccessibleDataPilotButton - : public ScAccessibleContextBase + : public ScAccessibleContextBase { public: //===== internal ======================================================== @@ -89,22 +89,22 @@ public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -112,7 +112,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -120,28 +120,28 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index ae1d1b590350..debe93c44a5f 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.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,8 +70,8 @@ #include <list> #include <algorithm> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; using ::std::for_each; //===== internal ======================================================== @@ -84,7 +84,7 @@ struct ScAccessibleShapeData mutable ScAddress* pRelationCell; // if it is NULL this shape is anchored on the table // SdrObject* pShape; com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape; - mutable sal_Bool bSelected; + mutable sal_Bool bSelected; sal_Bool bSelectable; }; @@ -240,7 +240,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException); + ) throw (::com::sun::star::uno::RuntimeException); ///===== Internal ======================================================== void SetDrawBroadcaster(); @@ -425,7 +425,7 @@ sal_Bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurr ::accessibility::AccessibleShapeInfo ( _rxShape, pCurrentChild->getAccessibleParent(), this, _nIndex ), _rShapeTreeInfo ); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xNewChild( pReplacement ); // keep this alive (do this before calling Init!) + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xNewChild( pReplacement ); // keep this alive (do this before calling Init!) if ( pReplacement ) pReplacement->Init(); @@ -1005,8 +1005,8 @@ ScAddress* ScChildrenShapes::GetAnchor(const uno::Reference<drawing::XShape>& xS pAddress = new ScAddress(aRange.aStart); } } -// else -// do nothing, because it is always a NULL Pointer +// else +// do nothing, because it is always a NULL Pointer } } } @@ -1561,7 +1561,7 @@ void SAL_CALL ScAccessibleDocument::grabFocus( ) //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. sal_Int32 SAL_CALL ScAccessibleDocument::getAccessibleChildCount(void) throw (uno::RuntimeException) @@ -1578,7 +1578,7 @@ sal_Int32 SAL_CALL return nCount; } - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. uno::Reference<XAccessible> SAL_CALL ScAccessibleDocument::getAccessibleChild(sal_Int32 nIndex) throw (uno::RuntimeException, @@ -1610,7 +1610,7 @@ uno::Reference<XAccessible> SAL_CALL return xAccessible; } - /// Return the set of current states. + /// Return the set of current states. uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocument::getAccessibleStateSet(void) throw (uno::RuntimeException) diff --git a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx index 6c48fbffb388..acc814b2bebb 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentBase.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 @@ -34,8 +34,8 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ======================================================== diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index f1ffe5dbd580..cc2fc0faeae5 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.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,8 +69,8 @@ #include <algorithm> #include <memory> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //========================================================================= @@ -707,7 +707,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException); + ) throw (::com::sun::star::uno::RuntimeException); ///===== Internal ======================================================== @@ -1358,7 +1358,7 @@ SdrPage* ScShapeChilds::GetDrawPage() const struct ScPagePreviewCountData { - // order is background shapes, header, table or notes, footer, foreground shapes, controls + // order is background shapes, header, table or notes, footer, foreground shapes, controls Rectangle aVisRect; long nBackShapes; @@ -1406,7 +1406,7 @@ ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rDa if ( rData.HasCellsInRange( aVisRect ) ) nTables = 1; - //! shapes... + //! shapes... nBackShapes = pShapeChilds->GetBackShapeCount(); nForeShapes = pShapeChilds->GetForeShapeCount(); nControls = pShapeChilds->GetControlCount(); @@ -1523,7 +1523,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint if (aCount.nTables > 0) { - //! order is background shapes, header, table or notes, footer, foreground shapes, controls + //! order is background shapes, header, table or notes, footer, foreground shapes, controls sal_Int32 nIndex (aCount.nBackShapes + aCount.nHeaders); mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex ); @@ -1592,11 +1592,11 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces const ScPreviewLocationData& rData = mpViewShell->GetLocationData(); ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() ); -/* if ( rData.HasCellsInRange( Rectangle( rPoint, rPoint ) ) ) +/* if ( rData.HasCellsInRange( Rectangle( rPoint, rPoint ) ) ) { if ( !mpTable && (aCount.nTables > 0) ) { - //! order is background shapes, header, table or notes, footer, foreground shapes, controls + //! order is background shapes, header, table or notes, footer, foreground shapes, controls sal_Int32 nIndex (aCount.nBackShapes + aCount.nHeaders); mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex ); @@ -1607,7 +1607,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces }*/ if ( !mpTable && (aCount.nTables > 0) ) { - //! order is background shapes, header, table or notes, footer, foreground shapes, controls + //! order is background shapes, header, table or notes, footer, foreground shapes, controls sal_Int32 nIndex (aCount.nBackShapes + aCount.nHeaders); mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex ); @@ -1750,7 +1750,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi return xAccessible; } - /// Return the set of current states. + /// Return the set of current states. uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet(void) throw (uno::RuntimeException) { @@ -1871,7 +1871,7 @@ ScNotesChilds* ScAccessibleDocumentPagePreview::GetNotesChilds() const ScPreviewLocationData& rData = mpViewShell->GetLocationData(); ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() ); - //! order is background shapes, header, table or notes, footer, foreground shapes, controls + //! order is background shapes, header, table or notes, footer, foreground shapes, controls mpNotesChilds->Init(aCount.aVisRect, aCount.nBackShapes + aCount.nHeaders); } return mpNotesChilds; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 6df608748c3a..b0cc9e936725 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.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,8 +47,8 @@ #include <svx/svdmodel.hxx> #include <vcl/svapp.hxx> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ============================================================ @@ -171,7 +171,7 @@ Rectangle ScAccessibleEditObject::GetBoundingBox(void) const uno::Reference< XAccessible > xParent( xContext->getAccessibleParent() ); if ( xParent.is() ) { - uno::Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), uno::UNO_QUERY ); + uno::Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), uno::UNO_QUERY ); if ( xParentComponent.is() ) { Point aScreenLoc = aBounds.TopLeft(); diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index b4948460be42..2bbb515b952a 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.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 @@ -71,7 +71,7 @@ namespace { class AddRemoveEventListener : public ::std::unary_function<void, Reference<XAccessible> > { public: - explicit AddRemoveEventListener(const Reference<XAccessibleEventListener>& rListener, bool bAdd) : + explicit AddRemoveEventListener(const Reference<XAccessibleEventListener>& rListener, bool bAdd) : mxListener(rListener), mbAdd(bAdd) {} void operator() (const Reference<XAccessible>& xAccessible) const @@ -129,13 +129,13 @@ void ScAccessibleFilterMenu::grabFocus() { } -sal_Int32 ScAccessibleFilterMenu::getForeground() +sal_Int32 ScAccessibleFilterMenu::getForeground() throw (RuntimeException) { return 0; } -sal_Int32 ScAccessibleFilterMenu::getBackground() +sal_Int32 ScAccessibleFilterMenu::getBackground() throw (RuntimeException) { return 0; @@ -148,13 +148,13 @@ OUString ScAccessibleFilterMenu::getAccessibleName() throw (RuntimeException) return ScAccessibleContextBase::getAccessibleName(); } -sal_Int32 ScAccessibleFilterMenu::getAccessibleChildCount() +sal_Int32 ScAccessibleFilterMenu::getAccessibleChildCount() throw (RuntimeException) { return getMenuItemCount(); } -Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nIndex) +Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nIndex) throw (RuntimeException, IndexOutOfBoundsException) { if (maMenuItems.size() <= static_cast<size_t>(nIndex)) @@ -163,14 +163,14 @@ Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nInd return maMenuItems[nIndex]; } -Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet() +Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet() throw (RuntimeException) { updateStates(); return mxStateSet; } -OUString ScAccessibleFilterMenu::getImplementationName() +OUString ScAccessibleFilterMenu::getImplementationName() throw (RuntimeException) { return OUString::createFromAscii("ScAccessibleFilterMenu"); @@ -198,7 +198,7 @@ void ScAccessibleFilterMenu::removeEventListener( // XAccessibleSelection -void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex) +void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex) throw (IndexOutOfBoundsException, RuntimeException) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) @@ -207,7 +207,7 @@ void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex) mpWindow->setSelectedMenuItem(nChildIndex, false, true); } -sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex) +sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex) throw (IndexOutOfBoundsException, RuntimeException) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) @@ -232,7 +232,7 @@ sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount() throw (Runti return mpWindow->getSelectedMenuItem() == ScMenuFloatingWindow::MENU_NOT_SELECTED ? 0 : 1; } -Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_Int32 nChildIndex) +Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_Int32 nChildIndex) throw (IndexOutOfBoundsException, RuntimeException) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) @@ -273,7 +273,7 @@ void SAL_CALL ScAccessibleFilterMenu::release() throw () // XTypeProvider -Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId() +Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId() throw (RuntimeException) { Sequence<sal_Int8> aId(16); @@ -285,8 +285,8 @@ Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const { if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED) return Rectangle(); - - // Menu object's bounding box is the bounding box of the menu item that + + // Menu object's bounding box is the bounding box of the menu item that // launches the menu, which belongs to the parent window. ScMenuFloatingWindow* pParentWin = mpWindow->getParentMenuWindow(); if (!pParentWin) @@ -309,7 +309,7 @@ Rectangle ScAccessibleFilterMenu::GetBoundingBox() const if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED) return Rectangle(); - // Menu object's bounding box is the bounding box of the menu item that + // Menu object's bounding box is the bounding box of the menu item that // launches the menu, which belongs to the parent window. ScMenuFloatingWindow* pParentWin = mpWindow->getParentMenuWindow(); if (!pParentWin) @@ -333,7 +333,7 @@ void ScAccessibleFilterMenu::appendMenuItem(const OUString& rName, bool bEnabled if (pSubMenu) { xAccessible = pSubMenu->CreateAccessible(); - ScAccessibleFilterMenu* p = + ScAccessibleFilterMenu* p = static_cast<ScAccessibleFilterMenu*>(xAccessible.get()); p->setEnabled(bEnabled); p->setMenuPos(nMenuPos); @@ -341,7 +341,7 @@ void ScAccessibleFilterMenu::appendMenuItem(const OUString& rName, bool bEnabled else { xAccessible.set(new ScAccessibleFilterMenuItem(this, mpWindow, rName, nMenuPos)); - ScAccessibleFilterMenuItem* p = + ScAccessibleFilterMenuItem* p = static_cast<ScAccessibleFilterMenuItem*>(xAccessible.get()); p->setEnabled(bEnabled); } diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index 1c70ee6ba5c5..e02aa923deb0 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.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/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index fb649eba5f4f..f5a8027b16b1 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.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 @@ -72,7 +72,7 @@ Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild( sal_Int32 nMenuCount = getMenuItemCount(); if (nIndex < nMenuCount) return ScAccessibleFilterMenu::getAccessibleChild(nIndex); - + nIndex -= nMenuCount; switch (nIndex) { @@ -108,16 +108,16 @@ void ScAccessibleFilterTopWindow::setAccessibleChild( case LISTBOX: mxAccListBox = rAccessible; break; - case TOGGLE_ALL: + case TOGGLE_ALL: mxAccToggleAll = rAccessible; break; - case SINGLE_ON_BTN: + case SINGLE_ON_BTN: mxAccSingleOnBtn = rAccessible; break; - case SINGLE_OFF_BTN: + case SINGLE_OFF_BTN: mxAccSingleOffBtn = rAccessible; break; - case OK_BTN: + case OK_BTN: mxAccOkBtn = rAccessible; break; case CANCEL_BTN: diff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxx index 2ddc53694c89..5698954771c3 100644 --- a/sc/source/ui/Accessibility/AccessibleGlobal.cxx +++ b/sc/source/ui/Accessibility/AccessibleGlobal.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 @@ sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty() throw (RuntimeException) return maStates.empty(); } -sal_Bool SAL_CALL ScAccessibleStateSet::contains(sal_Int16 nState) +sal_Bool SAL_CALL ScAccessibleStateSet::contains(sal_Int16 nState) throw (RuntimeException) { return maStates.count(nState) != 0; @@ -71,7 +71,7 @@ sal_Bool SAL_CALL ScAccessibleStateSet::containsAll( return true; } -Sequence<sal_Int16> SAL_CALL ScAccessibleStateSet::getStates() +Sequence<sal_Int16> SAL_CALL ScAccessibleStateSet::getStates() throw (RuntimeException) { Sequence<sal_Int16> aSeq(0); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 20e50119d680..ff9f21b820ea 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.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,8 +57,8 @@ #include <algorithm> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; const sal_uInt8 MAX_AREAS = 3; @@ -181,7 +181,7 @@ void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) CommitChange(aEvent); } } - + ScAccessibleContextBase::Notify(rBC, rHint); } @@ -251,7 +251,7 @@ sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno: nPageWhichId = mpViewShell->GetLocationData().IsHeaderLeft() ? ATTR_PAGE_HEADERLEFT : ATTR_PAGE_HEADERRIGHT; else nPageWhichId = mpViewShell->GetLocationData().IsFooterLeft() ? ATTR_PAGE_FOOTERLEFT : ATTR_PAGE_FOOTERRIGHT; - + const ScPageHFItem& rPageItem = static_cast<const ScPageHFItem&>(pStyle->GetItemSet().Get(nPageWhichId)); AddChild(rPageItem.GetLeftArea(), 0, SVX_ADJUST_LEFT); AddChild(rPageItem.GetCenterArea(), 1, SVX_ADJUST_CENTER); @@ -399,7 +399,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeExce } if (aRect.IsEmpty()) aRect.SetSize(Size(-1, -1)); - + return aRect; } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 37eac80cec14..ea167540ebcd 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.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 @@ #include <toolkit/helper/convert.hxx> #include <vcl/svapp.hxx> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ======================================================== @@ -231,7 +231,7 @@ uno::Sequence<sal_Int8> SAL_CALL } //===== internal ============================================================== -rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) +rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) throw(uno::RuntimeException) { rtl::OUString sDesc; @@ -292,7 +292,7 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen(void) const return aRect; } -Rectangle ScAccessiblePageHeaderArea::GetBoundingBox(void) const +Rectangle ScAccessiblePageHeaderArea::GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException) { Rectangle aRect; @@ -307,7 +307,7 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBox(void) const aRect = aNewRect; } } - + return aRect; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index bf99d3d26951..70355c65c889 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.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,8 +47,8 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ============================================================ @@ -284,7 +284,7 @@ sal_Bool ScAccessiblePreviewCell::IsOpaque( const uno::Reference<XAccessibleStateSet>& /* rxParentStates */) { // test whether there is a background color - //! could be moved to ScAccessibleCellBase + //! could be moved to ScAccessibleCellBase sal_Bool bOpaque(sal_True); if (mpDoc) diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index d55fcdd3aac3..e83feaf075ff 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.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,8 +52,8 @@ #include <comphelper/sequence.hxx> #include <toolkit/helper/convert.hxx> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ============================================================ @@ -111,8 +111,8 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint& } else if ( nId == SFX_HINT_DATACHANGED ) { - // column / row layout may change with any document change, - // so it must be invalidated + // column / row layout may change with any document change, + // so it must be invalidated DELETEZ( mpTableInfo ); } } @@ -162,7 +162,7 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::R sal_Bool SAL_CALL ScAccessiblePreviewHeaderCell::setCurrentValue( const uno::Any& /* aNumber */ ) throw (uno::RuntimeException) { - // it is not possible to set a value + // it is not possible to set a value return sal_False; } @@ -387,9 +387,9 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr { if ( mbRowHeader ) { - //! name for corner cell? + //! name for corner cell? -// sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column/Row Header")); +// sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column/Row Header")); } else { diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index fd98a67dbd7e..d0fb20d19e10 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.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,8 +52,8 @@ #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/sequence.hxx> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ============================================================ @@ -104,8 +104,8 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ULONG nId = rRef.GetId(); if ( nId == SFX_HINT_DATACHANGED ) { - // column / row layout may change with any document change, - // so it must be invalidated + // column / row layout may change with any document change, + // so it must be invalidated DELETEZ( mpTableInfo ); } else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED) @@ -173,7 +173,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { // is not supported or specified so not implemented -/* SolarMutexGuard aGuard; +/* SolarMutexGuard aGuard; IsObjectValid(); FillTableInfo(); @@ -184,7 +184,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa const ScPreviewColRowInfo& rInfo = mpTableInfo->GetRowInfo()[nRow]; if ( rInfo.bIsHeader ) { - //! name of column headers row? + //! name of column headers row? sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column Headers")); } @@ -209,7 +209,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { // is not supported or specified so not implemented -/* SolarMutexGuard aGuard; +/* SolarMutexGuard aGuard; IsObjectValid(); FillTableInfo(); @@ -220,7 +220,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( const ScPreviewColRowInfo& rInfo = mpTableInfo->GetColInfo()[nColumn]; if ( rInfo.bIsHeader ) { - //! name of row headers column? + //! name of row headers column? sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Row Headers")); } @@ -258,7 +258,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32 if ( rColInfo.bIsHeader || rRowInfo.bIsHeader ) { - // header cells only span a single cell + // header cells only span a single cell } else { @@ -292,7 +292,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnExtentAt( sal_In if ( rColInfo.bIsHeader || rRowInfo.bIsHeader ) { - // header cells only span a single cell + // header cells only span a single cell } else { @@ -323,20 +323,20 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessi uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleRows() throw (uno::RuntimeException) { - // in the page preview, there is no selection + // in the page preview, there is no selection return uno::Sequence<sal_Int32>(0); } uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleColumns() throw (uno::RuntimeException) { - // in the page preview, there is no selection + // in the page preview, there is no selection return uno::Sequence<sal_Int32>(0); } sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - // in the page preview, there is no selection + // in the page preview, there is no selection SolarMutexGuard aGuard; FillTableInfo(); @@ -349,7 +349,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 n sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - // in the page preview, there is no selection + // in the page preview, there is no selection SolarMutexGuard aGuard; FillTableInfo(); @@ -370,7 +370,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCe uno::Reference<XAccessible> xRet; if ( mpTableInfo && nColumn >= 0 && nRow >= 0 && nColumn < mpTableInfo->GetCols() && nRow < mpTableInfo->GetRows() ) { - // index iterates horizontally + // index iterates horizontally long nNewIndex = nRow * mpTableInfo->GetCols() + nColumn; const ScPreviewColRowInfo& rColInfo = mpTableInfo->GetColInfo()[nColumn]; @@ -413,7 +413,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleSu sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - // in the page preview, there is no selection + // in the page preview, there is no selection SolarMutexGuard aGuard; IsObjectValid(); @@ -421,7 +421,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow if ( mpTableInfo && nColumn >= 0 && nRow >= 0 && nColumn < mpTableInfo->GetCols() && nRow < mpTableInfo->GetRows() ) { - // index iterates horizontally + // index iterates horizontally } else throw lang::IndexOutOfBoundsException(); @@ -440,7 +440,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nRet = 0; if ( mpTableInfo && nColumn >= 0 && nRow >= 0 && nColumn < mpTableInfo->GetCols() && nRow < mpTableInfo->GetRows() ) { - // index iterates horizontally + // index iterates horizontally nRet = nRow * mpTableInfo->GetCols() + nColumn; } else diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 5d18beb574b4..49e345a93039 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.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,8 +52,8 @@ #include <algorithm> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ============================================================ @@ -271,7 +271,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint mbDelIns = sal_False; } // no longer needed, because the document calls the VisAreaChanged method -/* else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED) +/* else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED) { AccessibleEventObject aEvent; aEvent.EventId = AccessibleEventId::VISIBLE_DATA_CHANGED; @@ -280,7 +280,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint CommitChange(aEvent);*/ // commented out, because to use a ModelChangeEvent is not the right way // at the moment there is no way, but the Java/Gnome Api should be extended sometime -/* if (mpViewShell) +/* if (mpViewShell) { Rectangle aNewVisCells(GetVisCells(GetVisArea(mpViewShell, meSplitPos))); diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index e998fd7fd4fa..bf0ef109cf68 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.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,8 +45,8 @@ #include <vcl/svapp.hxx> -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; //===== internal ============================================================ @@ -328,7 +328,7 @@ sal_Int32 SAL_CALL IsObjectValid(); return static_cast<sal_Int32>(maRange.aEnd.Row() - maRange.aStart.Row() + 1) * (maRange.aEnd.Col() - maRange.aStart.Col() + 1); -// return 1; +// return 1; } uno::Reference< XAccessible > SAL_CALL @@ -355,7 +355,7 @@ uno::Reference< XAccessible > SAL_CALL throw (uno::RuntimeException) { String sDesc(ScResId(STR_ACC_TABLE_DESCR)); -/* String sCoreName; +/* String sCoreName; if (mpDoc && mpDoc->GetName( maRange.aStart.Tab(), sCoreName )) sDesc.SearchAndReplaceAscii("%1", sCoreName); sDesc.SearchAndReplaceAscii("%2", String(ScResId(SCSTR_UNKNOWN)));*/ diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index a4c470093398..2f7c5e861b6f 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.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 @@ -61,17 +61,17 @@ class ScViewForwarder : public SvxViewForwarder { - ScTabViewShell* mpViewShell; - ScAddress maCellPos; - ScSplitPos meSplitPos; + ScTabViewShell* mpViewShell; + ScAddress maCellPos; + ScSplitPos meSplitPos; public: ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell); - virtual ~ScViewForwarder(); + virtual ~ScViewForwarder(); - virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual BOOL IsValid() const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; void SetInvalid(); }; @@ -166,12 +166,12 @@ class ScEditObjectViewForwarder : public SvxViewForwarder public: ScEditObjectViewForwarder( Window* pWindow, const EditView* _pEditView); - virtual ~ScEditObjectViewForwarder(); + virtual ~ScEditObjectViewForwarder(); - virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual BOOL IsValid() const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; void SetInvalid(); }; @@ -261,16 +261,16 @@ void ScEditObjectViewForwarder::SetInvalid() class ScPreviewViewForwarder : public SvxViewForwarder { protected: - ScPreviewShell* mpViewShell; - mutable ScPreviewTableInfo* mpTableInfo; + ScPreviewShell* mpViewShell; + mutable ScPreviewTableInfo* mpTableInfo; public: ScPreviewViewForwarder(ScPreviewShell* pViewShell); - virtual ~ScPreviewViewForwarder(); + virtual ~ScPreviewViewForwarder(); - virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual BOOL IsValid() const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; void SetInvalid(); @@ -396,9 +396,9 @@ class ScPreviewHeaderFooterViewForwarder : public ScPreviewViewForwarder sal_Bool mbHeader; public: ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, sal_Bool bHeader); - virtual ~ScPreviewHeaderFooterViewForwarder(); + virtual ~ScPreviewHeaderFooterViewForwarder(); - virtual Rectangle GetVisArea() const; + virtual Rectangle GetVisArea() const; }; ScPreviewHeaderFooterViewForwarder::ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, sal_Bool bHeader) @@ -438,9 +438,9 @@ class ScPreviewCellViewForwarder : public ScPreviewViewForwarder public: ScPreviewCellViewForwarder(ScPreviewShell* pViewShell, ScAddress aCellPos); - virtual ~ScPreviewCellViewForwarder(); + virtual ~ScPreviewCellViewForwarder(); - virtual Rectangle GetVisArea() const; + virtual Rectangle GetVisArea() const; }; ScPreviewCellViewForwarder::ScPreviewCellViewForwarder(ScPreviewShell* pViewShell, @@ -481,9 +481,9 @@ public: ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell, ScAddress aCellPos, sal_Bool bColHeader, sal_Bool bRowHeader); - virtual ~ScPreviewHeaderCellViewForwarder(); + virtual ~ScPreviewHeaderCellViewForwarder(); - virtual Rectangle GetVisArea() const; + virtual Rectangle GetVisArea() const; }; ScPreviewHeaderCellViewForwarder::ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell, @@ -526,9 +526,9 @@ public: ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell, ScAddress aCellPos, sal_Bool bNoteMark); - virtual ~ScPreviewNoteViewForwarder(); + virtual ~ScPreviewNoteViewForwarder(); - virtual Rectangle GetVisArea() const; + virtual Rectangle GetVisArea() const; }; ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell, @@ -568,19 +568,19 @@ class ScEditViewForwarder : public SvxEditViewForwarder Window* mpWindow; public: ScEditViewForwarder(EditView* pEditView, Window* pWin); - virtual ~ScEditViewForwarder(); + virtual ~ScEditViewForwarder(); - virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; - virtual sal_Bool GetSelection( ESelection& rSelection ) const; - virtual sal_Bool SetSelection( const ESelection& rSelection ); - virtual sal_Bool Copy(); - virtual sal_Bool Cut(); - virtual sal_Bool Paste(); + virtual BOOL IsValid() const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual sal_Bool GetSelection( ESelection& rSelection ) const; + virtual sal_Bool SetSelection( const ESelection& rSelection ); + virtual sal_Bool Copy(); + virtual sal_Bool Cut(); + virtual sal_Bool Paste(); - void GrabFocus(); + void GrabFocus(); void SetInvalid(); }; @@ -729,7 +729,7 @@ void ScEditViewForwarder::SetInvalid() mpEditView = NULL; } -// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object +// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object ScAccessibleCellTextData::ScAccessibleCellTextData(ScTabViewShell* pViewShell, const ScAddress& rP, ScSplitPos eSplitPos, ScAccessibleCell* pAccCell) @@ -760,7 +760,7 @@ void ScAccessibleCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) { - mpViewShell = NULL; // invalid now + mpViewShell = NULL; // invalid now if (mpViewForwarder) mpViewForwarder->SetInvalid(); if (mpEditViewForwarder) @@ -804,7 +804,7 @@ void ScAccessibleCellTextData::GetCellText(const ScAddress& rCellPos, String& rT SvxTextForwarder* ScAccessibleCellTextData::GetTextForwarder() { -/* sal_Bool bHasForwarder(sal_False); +/* sal_Bool bHasForwarder(sal_False); if (mpViewShell && mpViewShell->GetViewData() && (mpViewShell->GetViewData()->GetCurPos() == aCellPos) && (mpViewShell->GetViewData()->HasEditView(meSplitPos)) && @@ -1004,7 +1004,7 @@ SvxViewForwarder* ScAccessibleCellTextData::GetViewForwarder() SvxEditViewForwarder* ScAccessibleCellTextData::GetEditViewForwarder( sal_Bool /* bCreate */ ) { //#102219#; there should no EditViewForwarder be, because the cell is now readonly in this interface -/* if (!mpEditViewForwarder) +/* if (!mpEditViewForwarder) { SCCOL nCol; SCROW nRow; @@ -1220,9 +1220,9 @@ SvxTextForwarder* ScAccessibleEditLineTextData::GetTextForwarder() pEnginePool->FreezeIdRanges(); mpEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE ); mbEditEngineCreated = sal_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 ); mpEditEngine->EnableUndo( FALSE ); mpEditEngine->SetRefMapMode( MAP_100TH_MM ); mpForwarder = new SvxEditEngineForwarder(*mpEditEngine); @@ -1255,8 +1255,8 @@ SvxEditViewForwarder* ScAccessibleEditLineTextData::GetEditViewForwarder( sal_Bo { pTxtWnd->StartEditEngine(); pTxtWnd->GrabFocus(); -// pTxtWnd->SetTextString( rText ); -// pTxtWnd->GetEditView()->SetSelection( rSel ); +// pTxtWnd->SetTextString( rText ); +// pTxtWnd->GetEditView()->SetSelection( rSel ); mpEditView = pTxtWnd->GetEditView(); } @@ -1314,7 +1314,7 @@ void ScAccessibleEditLineTextData::EndEdit() } -// ScAccessiblePreviewCellTextData: shared data between sub objects of a accessible cell text object +// ScAccessiblePreviewCellTextData: shared data between sub objects of a accessible cell text object ScAccessiblePreviewCellTextData::ScAccessiblePreviewCellTextData(ScPreviewShell* pViewShell, const ScAddress& rP) @@ -1339,7 +1339,7 @@ void ScAccessiblePreviewCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) { - mpViewShell = NULL; // invalid now + mpViewShell = NULL; // invalid now if (mpViewForwarder) mpViewForwarder->SetInvalid(); } @@ -1389,7 +1389,7 @@ ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewSh } -// ScAccessiblePreviewHeaderCellTextData: shared data between sub objects of a accessible cell text object +// ScAccessiblePreviewHeaderCellTextData: shared data between sub objects of a accessible cell text object ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell, const String& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader) @@ -1417,7 +1417,7 @@ void ScAccessiblePreviewHeaderCellTextData::Notify( SfxBroadcaster& rBC, const S ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if ( nId == SFX_HINT_DYING ) { - mpViewShell = NULL; // invalid now + mpViewShell = NULL; // invalid now if (mpViewForwarder) mpViewForwarder->SetInvalid(); } @@ -1445,9 +1445,9 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::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()); @@ -1522,7 +1522,7 @@ ScAccessibleHeaderTextData::ScAccessibleHeaderTextData(ScPreviewShell* pViewShel ScAccessibleHeaderTextData::~ScAccessibleHeaderTextData() { - SolarMutexGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor if (mpDocSh) mpDocSh->GetDocument()->RemoveUnoObject(*this); @@ -1563,14 +1563,14 @@ SvxTextForwarder* ScAccessibleHeaderTextData::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 ); @@ -1636,7 +1636,7 @@ ScAccessibleNoteTextData::ScAccessibleNoteTextData(ScPreviewShell* pViewShell, ScAccessibleNoteTextData::~ScAccessibleNoteTextData() { - SolarMutexGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor if (mpDocSh) mpDocSh->GetDocument()->RemoveUnoObject(*this); @@ -1681,9 +1681,9 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder() pEnginePool->FreezeIdRanges(); mpEditEngine = 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 ); mpEditEngine->EnableUndo( FALSE ); if (mpDocSh) mpEditEngine->SetRefDevice(mpDocSh->GetRefDevice()); diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx index 053d0c11dd94..5954c167248b 100644 --- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx +++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.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 @@ -33,7 +33,7 @@ #include <svx/unomod.hxx> #include <tools/debug.hxx> -using namespace ::com::sun::star; +using namespace ::com::sun::star; ScDrawModelBroadcaster::ScDrawModelBroadcaster( SdrModel *pDrawModel ) : maEventListeners( maListenerMutex ), diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 1553f37cc05c..68cefe7825a1 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.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 @@ -123,8 +123,8 @@ void __EXPORT ScClient::RequestNewObjectArea( Rectangle& aLogicRect ) Size aSize = pPage->GetSize(); if ( aSize.Width() < 0 ) { - aPos.X() = aSize.Width() + 1; // negative - aSize.Width() = -aSize.Width(); // positive + aPos.X() = aSize.Width() + 1; // negative + aSize.Width() = -aSize.Width(); // positive } Rectangle aPageRect( aPos, aSize ); @@ -166,7 +166,7 @@ void __EXPORT ScClient::ObjectAreaChanged() return; } - // Position und Groesse ins Dokument uebernehmen + // Position und Groesse ins Dokument uebernehmen SdrOle2Obj* pDrawObj = GetDrawObj(); if (pDrawObj) { @@ -209,7 +209,7 @@ void __EXPORT ScClient::ViewChanged() MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( GetAspect() ) ); Size aVisSize = OutputDevice::LogicToLogic( Size( aSz.Width, aSz.Height ), aMapUnit, MAP_100TH_MM ); - // Groesse ins Dokument uebernehmen + // Groesse ins Dokument uebernehmen SdrOle2Obj* pDrawObj = GetDrawObj(); if (pDrawObj) { @@ -236,7 +236,7 @@ void __EXPORT ScClient::ViewChanged() aLogicRect.SetSize( aVisSize ); pDrawObj->SetLogicRect( aLogicRect ); - // set document modified (SdrModel::SetChanged is not used) + // set document modified (SdrModel::SetChanged is not used) pViewSh->GetViewData()->GetDocShell()->SetDrawModified(); } } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index cba682688f1f..c41bd8762d76 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.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/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 697f573cf630..d50a5818f193 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -84,31 +84,31 @@ #include "userlist.hxx" #include "rfindlst.hxx" #include "inputopt.hxx" -#include "cell.hxx" // fuer Formel-Preview -#include "compiler.hxx" // fuer Formel-Preview +#include "cell.hxx" // fuer Formel-Preview +#include "compiler.hxx" // fuer Formel-Preview #include "editable.hxx" #include "funcdesc.hxx" #define _INPUTHDL_CXX #include "inputhdl.hxx" -// max. Ranges im RangeFinder -#define RANGEFIND_MAX 32 +// max. Ranges im RangeFinder +#define RANGEFIND_MAX 32 using namespace formula; // STATIC DATA ----------------------------------------------------------- -BOOL ScInputHandler::bOptLoaded = FALSE; // App-Optionen ausgewertet -BOOL ScInputHandler::bAutoComplete = FALSE; // wird in KeyInput gesetzt +BOOL ScInputHandler::bOptLoaded = FALSE; // App-Optionen ausgewertet +BOOL ScInputHandler::bAutoComplete = FALSE; // wird in KeyInput gesetzt -// delimiters (in addition to ScEditUtil) needed for range finder: -// only characters that are allowed in formulas next to references -// and the quotation mark (so string constants can be skipped) +// delimiters (in addition to ScEditUtil) needed for range finder: +// only characters that are allowed in formulas next to references +// and the quotation mark (so string constants can be skipped) static const sal_Char __FAR_DATA pMinDelimiters[] = " !\""; -extern USHORT nEditAdjust; //! Member an ViewData +extern USHORT nEditAdjust; //! Member an ViewData //================================================================== @@ -129,16 +129,16 @@ void ScInputHandler::InitRangeFinder( const String& rFormula ) if ( !pActiveViewSh || !SC_MOD()->GetInputOptions().GetRangeFinder() ) return; -// String aDelimiters = pEngine->GetWordDelimiters(); +// String aDelimiters = pEngine->GetWordDelimiters(); String aDelimiters = ScEditUtil::ModifyDelimiters( String::CreateFromAscii( pMinDelimiters ) ); xub_StrLen nColon = aDelimiters.Search(':'); if ( nColon != STRING_NOTFOUND ) - aDelimiters.Erase( nColon, 1 ); // Delimiter ohne Doppelpunkt + aDelimiters.Erase( nColon, 1 ); // Delimiter ohne Doppelpunkt xub_StrLen nDot = aDelimiters.Search(cSheetSep); if ( nDot != STRING_NOTFOUND ) - aDelimiters.Erase( nDot, 1 ); // Delimiter ohne Punkt + aDelimiters.Erase( nDot, 1 ); // Delimiter ohne Punkt const sal_Unicode* pChar = rFormula.GetBuffer(); xub_StrLen nLen = rFormula.Len(); @@ -148,19 +148,19 @@ void ScInputHandler::InitRangeFinder( const String& rFormula ) ScRange aRange; while ( nPos < nLen && nCount < RANGEFIND_MAX ) { - // Trenner ueberlesen + // Trenner ueberlesen while ( nPos<nLen && ScGlobal::UnicodeStrChr( aDelimiters.GetBuffer(), pChar[nPos] ) ) { - if ( pChar[nPos] == '"' ) // String + if ( pChar[nPos] == '"' ) // String { ++nPos; - while (nPos<nLen && pChar[nPos] != '"') // bis zum Ende ueberlesen + while (nPos<nLen && pChar[nPos] != '"') // bis zum Ende ueberlesen ++nPos; } - ++nPos; // Trennzeichen oder schliessender Quote + ++nPos; // Trennzeichen oder schliessender Quote } - // Text zwischen Trennern + // Text zwischen Trennern nStart = nPos; handle_r1c1: while ( nPos<nLen && !ScGlobal::UnicodeStrChr( aDelimiters.GetBuffer(), pChar[nPos] ) ) @@ -185,7 +185,7 @@ handle_r1c1: USHORT nFlags = aRange.ParseAny( aTest, pDoc, aAddrDetails ); if ( nFlags & SCA_VALID ) { - // Tabelle setzen, wenn nicht angegeben + // Tabelle setzen, wenn nicht angegeben if ( (nFlags & SCA_TAB_3D) == 0 ) aRange.aStart.SetTab( pActiveViewSh->GetViewData()->GetTabNo() ); if ( (nFlags & SCA_TAB2_3D) == 0 ) @@ -217,7 +217,7 @@ handle_r1c1: } } - // letzten Trenner nicht ueberlesen, koennte ja ein Quote sein (?) + // letzten Trenner nicht ueberlesen, koennte ja ein Quote sein (?) } if (nCount) @@ -240,13 +240,13 @@ void lcl_Replace( EditView* pView, const String& rNewStr, const ESelection& rOld EditEngine* pEngine = pView->GetEditEngine(); pEngine->QuickInsertText( rNewStr, rOldSel ); - // Dummy-InsertText fuer Update und Paint - // dafuer muss oben die Selektion aufgehoben werden (vor QuickInsertText) + // Dummy-InsertText fuer Update und Paint + // dafuer muss oben die Selektion aufgehoben werden (vor QuickInsertText) pView->InsertText( EMPTY_STRING, FALSE ); xub_StrLen nLen = pEngine->GetTextLen(0); ESelection aSel( 0, nLen, 0, nLen ); - pView->SetSelection( aSel ); // Cursor ans Ende + pView->SetSelection( aSel ); // Cursor ans Ende } } @@ -260,7 +260,7 @@ void ScInputHandler::UpdateRange( USHORT nIndex, const ScRange& rNew ) xub_StrLen nOldEnd = pData->nSelEnd; ScRange aJustified = rNew; - aJustified.Justify(); // Ref in der Formel immer richtigherum anzeigen + aJustified.Justify(); // Ref in der Formel immer richtigherum anzeigen String aNewStr; ScDocument* pDoc = pDocView->GetViewData()->GetDocument(); const ScAddress::Details aAddrDetails( pDoc, aCursorPos ); @@ -302,7 +302,7 @@ void ScInputHandler::DeleteRangeFinder() { ScDocShell* pDocSh = pActiveViewSh->GetViewData()->GetDocShell(); pRangeFindList->SetHidden(TRUE); - pDocSh->Broadcast( SfxSimpleHint( SC_HINT_SHOWRANGEFINDER ) ); // wegnehmen + pDocSh->Broadcast( SfxSimpleHint( SC_HINT_SHOWRANGEFINDER ) ); // wegnehmen DELETEZ(pRangeFindList); } } @@ -406,7 +406,7 @@ xub_StrLen lcl_MatchParenthesis( const String& rStr, xub_StrLen nPos ) { bInString = !bInString; if ( bLookInString && !bInString ) - p = p1; //That's it then + p = p1; //That's it then } else if ( bInString == bLookInString ) { @@ -465,20 +465,20 @@ ScInputHandler::ScInputHandler() pDelayTimer( NULL ), pRangeFindList( NULL ) { - // The InputHandler is constructed with the view, so SfxViewShell::Current - // doesn't have the right view yet. pActiveViewSh is updated in NotifyChange. + // The InputHandler is constructed with the view, so SfxViewShell::Current + // doesn't have the right view yet. pActiveViewSh is updated in NotifyChange. pActiveViewSh = NULL; - // Bindings (nur noch fuer Invalidate benutzt) werden bei Bedarf aktuell geholt + // Bindings (nur noch fuer Invalidate benutzt) werden bei Bedarf aktuell geholt } __EXPORT ScInputHandler::~ScInputHandler() { - // Wenn dies der Applikations-InputHandler ist, wird der dtor erst nach SfxApplication::Main - // gerufen, darf sich also auf keine Sfx-Funktionen mehr verlassen + // Wenn dies der Applikations-InputHandler ist, wird der dtor erst nach SfxApplication::Main + // gerufen, darf sich also auf keine Sfx-Funktionen mehr verlassen - if ( !SFX_APP()->IsDowning() ) // inplace - EnterHandler(); // Eingabe noch abschliessen + if ( !SFX_APP()->IsDowning() ) // inplace + EnterHandler(); // Eingabe noch abschliessen if (SC_MOD()->GetRefInputHdl()==this) SC_MOD()->SetRefInputHdl(NULL); @@ -524,8 +524,8 @@ void ScInputHandler::UpdateRefDevice() MapMode aMode( MAP_100TH_MM, Point(), aScaleX, aScaleY ); pEngine->SetRefMapMode( aMode ); - // SetRefDevice(NULL) uses VirtualDevice, SetRefMapMode forces creation of a local VDev, - // so the DigitLanguage can be safely modified (might use an own VDev instead of NULL). + // SetRefDevice(NULL) uses VirtualDevice, SetRefMapMode forces creation of a local VDev, + // so the DigitLanguage can be safely modified (might use an own VDev instead of NULL). if ( !( bTextWysiwyg && pActiveViewSh ) ) { pEngine->GetRefDevice()->SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() ); @@ -544,7 +544,7 @@ void ScInputHandler::ImplCreateEditEngine() else pEngine = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE ); pEngine->SetWordDelimiters( ScEditUtil::ModifyDelimiters( pEngine->GetWordDelimiters() ) ); - UpdateRefDevice(); // also sets MapMode + UpdateRefDevice(); // also sets MapMode pEngine->SetPaperSize( Size( 1000000, 1000000 ) ); pEditDefaults = new SfxItemSet( pEngine->GetEmptyItemSet() ); @@ -558,7 +558,7 @@ void ScInputHandler::UpdateAutoCorrFlag() ULONG nCntrl = pEngine->GetControlWord(); ULONG nOld = nCntrl; - // don't use pLastPattern here (may be invalid because of AutoStyle) + // don't use pLastPattern here (may be invalid because of AutoStyle) BOOL bDisable = bLastIsSymbol || bFormulaMode; if ( bDisable ) @@ -577,14 +577,14 @@ void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab ) ScViewData* pViewData = pActiveViewSh->GetViewData(); BOOL bOnlineSpell = pViewData->GetDocument()->GetDocOptions().IsAutoSpell(); - // SetDefaultLanguage is independent of the language attributes, - // ScGlobal::GetEditDefaultLanguage is always used. - // It must be set every time in case the office language was changed. + // SetDefaultLanguage is independent of the language attributes, + // ScGlobal::GetEditDefaultLanguage is always used. + // It must be set every time in case the office language was changed. pEngine->SetDefaultLanguage( ScGlobal::GetEditDefaultLanguage() ); - // if called for changed options, update flags only if already editing - // if called from StartTable, always update flags + // if called for changed options, update flags only if already editing + // if called from StartTable, always update flags if ( bFromStartTab || eMode != SC_INPUT_NONE ) { @@ -611,8 +611,8 @@ void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab ) pEngine->SetFirstWordCapitalization( FALSE ); } - // language is set separately, so the speller is needed only if online - // spelling is active + // language is set separately, so the speller is needed only if online + // spelling is active if ( bOnlineSpell ) { com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() ); @@ -628,11 +628,11 @@ void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab ) } // -// Funktionen/Bereichsnamen etc. als Tip-Hilfe +// Funktionen/Bereichsnamen etc. als Tip-Hilfe // -#define SC_STRTYPE_FUNCTIONS 1 -// die anderen Typen sind in ScDocument::GetFormulaEntries festgelegt +#define SC_STRTYPE_FUNCTIONS 1 +// die anderen Typen sind in ScDocument::GetFormulaEntries festgelegt void ScInputHandler::GetFormulaData() { @@ -650,8 +650,8 @@ void ScInputHandler::GetFormulaData() else pFormulaDataPara = new TypedScStrCollection; - // MRU-Funktionen aus dem Funktions-Autopiloten - // wie in ScPosWnd::FillFunctions (inputwin.cxx) + // MRU-Funktionen aus dem Funktions-Autopiloten + // wie in ScPosWnd::FillFunctions (inputwin.cxx) const ScAppOptions& rOpt = SC_MOD()->GetAppOptions(); USHORT nMRUCount = rOpt.GetLRUFuncListCount(); @@ -760,7 +760,7 @@ void ScInputHandler::ShowTipCursor() xub_StrLen nArgPos = 0; const IFunctionDescription* ppFDesc; ::std::vector< ::rtl::OUString> aArgs; - USHORT nArgs; + USHORT nArgs; BOOL bFound = FALSE; FormulaHelper aHelper(ScGlobal::GetStarCalcFunctionMgr()); @@ -914,7 +914,7 @@ void ScInputHandler::ShowTipCursor() void ScInputHandler::ShowTip( const String& rText ) { - // aManualTip muss hinterher von aussen gesetzt werden + // aManualTip muss hinterher von aussen gesetzt werden HideTip(); EditView* pActiveView = pTopView ? pTopView : pTableView; @@ -965,21 +965,21 @@ void ScInputHandler::UseFormulaData() const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); const sal_Unicode cSheetSep = lcl_getSheetSeparator(pDocSh->GetDocument()); - // Formeln duerfen nur 1 Absatz haben + // Formeln duerfen nur 1 Absatz haben if ( pActiveView && pFormulaData && pEngine->GetParagraphCount() == 1 ) { String aTotal = pEngine->GetText( (USHORT) 0 ); ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); - // #59348# Durch Differenzen zwischen Tabelle und Eingabezeile - // (z.B. Clipboard mit Zeilenumbruechen) kann es sein, dass die Selektion - // nicht mehr zur EditEngine passt. Dann halt kommentarlos abbrechen: + // #59348# Durch Differenzen zwischen Tabelle und Eingabezeile + // (z.B. Clipboard mit Zeilenumbruechen) kann es sein, dass die Selektion + // nicht mehr zur EditEngine passt. Dann halt kommentarlos abbrechen: if ( aSel.nEndPos > aTotal.Len() ) return; - // steht der Cursor am Ende eines Wortes? + // steht der Cursor am Ende eines Wortes? if ( aSel.nEndPos > 0 ) { @@ -991,7 +991,7 @@ void ScInputHandler::UseFormulaData() xub_StrLen nArgPos = 0; const IFunctionDescription* ppFDesc; ::std::vector< ::rtl::OUString> aArgs; - USHORT nArgs; + USHORT nArgs; BOOL bFound = FALSE; String aText = pEngine->GetWord( 0, aSel.nEndPos-1 ); @@ -1137,10 +1137,10 @@ void ScInputHandler::NextFormulaEntry( BOOL bBack ) { String aNew; if ( pFormulaData->FindText( aAutoSearch, aNew, nAutoPos, bBack ) ) - ShowTip( aNew ); // als QuickHelp anzeigen + ShowTip( aNew ); // als QuickHelp anzeigen } - // bei Tab wird vorher immer HideCursor gerufen + // bei Tab wird vorher immer HideCursor gerufen if (pActiveView) pActiveView->ShowCursor(); @@ -1162,9 +1162,9 @@ void lcl_CompleteFunction( EditView* pView, const String& rInsert, BOOL& rParIns && aInsStr.GetChar(nInsLen-1) == ')' ); if ( bDoParen ) { - // Klammern hinter Funktionsnamen nicht einfuegen, wenn direkt dahinter - // schon eine Klammer steht (z.B. wenn der Funktionsname geaendert wurde, - // #39393#). + // Klammern hinter Funktionsnamen nicht einfuegen, wenn direkt dahinter + // schon eine Klammer steht (z.B. wenn der Funktionsname geaendert wurde, + // #39393#). ESelection aWordSel = pView->GetSelection(); String aOld = pView->GetEditEngine()->GetText((USHORT)0); @@ -1172,13 +1172,13 @@ void lcl_CompleteFunction( EditView* pView, const String& rInsert, BOOL& rParIns if ( cNext == '(' ) { bDoParen = FALSE; - aInsStr.Erase( nInsLen - 2 ); // Klammern weglassen + aInsStr.Erase( nInsLen - 2 ); // Klammern weglassen } } pView->InsertText( aInsStr, FALSE ); - if ( bDoParen ) // Cursor zwischen die Klammern setzen + if ( bDoParen ) // Cursor zwischen die Klammern setzen { aSel = pView->GetSelection(); --aSel.nStartPos; @@ -1200,7 +1200,7 @@ void ScInputHandler::PasteFunctionData() String aInsert = pData->GetString(); BOOL bParInserted = FALSE; - DataChanging(); // kann nicht neu sein + DataChanging(); // kann nicht neu sein lcl_CompleteFunction( pTopView, aInsert, bParInserted ); lcl_CompleteFunction( pTableView, aInsert, bParInserted ); DataChanged(); @@ -1219,13 +1219,13 @@ void ScInputHandler::PasteFunctionData() } // -// Selektion berechnen und als Tip-Hilfe anzeigen +// Selektion berechnen und als Tip-Hilfe anzeigen // String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress &rPos ) { - //! mit ScFormulaDlg::CalcValue zusammenfassen und ans Dokument verschieben !!!! - //! (Anfuehrungszeichen bei Strings werden nur hier eingefuegt) + //! mit ScFormulaDlg::CalcValue zusammenfassen und ans Dokument verschieben !!!! + //! (Anfuehrungszeichen bei Strings werden nur hier eingefuegt) String aValue; @@ -1242,7 +1242,7 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress { // ColRowName im RPN-Code? if ( pCell->GetCode()->GetCodeLen() <= 1 ) - { // ==1: einzelner ist als Parameter immer Bereich + { // ==1: einzelner ist als Parameter immer Bereich // ==0: es waere vielleicht einer, wenn.. String aBraced( '(' ); aBraced += rFormula; @@ -1265,7 +1265,7 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress ULONG nFormat = aFormatter.GetStandardFormat( n, 0, pCell->GetFormatType(), ScGlobal::eLnge ); aFormatter.GetInputLineString( n, nFormat, aValue ); - //! display OutputString but insert InputLineString + //! display OutputString but insert InputLineString } else { @@ -1277,14 +1277,14 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress aFormatter.GetOutputString( aStr, nFormat, aValue, &pColor ); - aValue.Insert('"',0); // in Anfuehrungszeichen + aValue.Insert('"',0); // in Anfuehrungszeichen aValue+='"'; - //! Anfuehrungszeichen im String escapen ???? + //! Anfuehrungszeichen im String escapen ???? } ScRange aTestRange; if ( bColRowName || (aTestRange.Parse(rFormula) & SCA_VALID) ) - aValue.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ..." )); // Bereich + aValue.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ..." )); // Bereich } else aValue = ScGlobal::GetErrorString(nErrCode); @@ -1309,27 +1309,27 @@ void ScInputHandler::FormulaPreview() if (aValue.Len()) { - ShowTip( aValue ); // als QuickHelp anzeigen - aManualTip = aValue; // nach ShowTip setzen - nAutoPos = SCPOS_INVALID; // Formel-Autocomplete aufheben + ShowTip( aValue ); // als QuickHelp anzeigen + aManualTip = aValue; // nach ShowTip setzen + nAutoPos = SCPOS_INVALID; // Formel-Autocomplete aufheben } } void ScInputHandler::PasteManualTip() { - // drei Punkte am Ende -> Bereichsreferenz -> nicht einfuegen - // (wenn wir mal Matrix-Konstanten haben, kann das geaendert werden) + // drei Punkte am Ende -> Bereichsreferenz -> nicht einfuegen + // (wenn wir mal Matrix-Konstanten haben, kann das geaendert werden) xub_StrLen nTipLen = aManualTip.Len(); if ( nTipLen && ( nTipLen < 3 || !aManualTip.Copy( nTipLen-3 ).EqualsAscii("...") ) ) { - DataChanging(); // kann nicht neu sein + DataChanging(); // kann nicht neu sein String aInsert = aManualTip; EditView* pActiveView = pTopView ? pTopView : pTableView; if (!pActiveView->HasSelection()) { - // nichts selektiert -> alles selektieren + // nichts selektiert -> alles selektieren xub_StrLen nOldLen = pEngine->GetTextLen(0); ESelection aAllSel( 0, 0, 0, nOldLen ); if ( pTopView ) @@ -1341,11 +1341,11 @@ void ScInputHandler::PasteManualTip() ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); DBG_ASSERT( !aSel.nStartPara && !aSel.nEndPara, "Zuviele Absaetze in Formel" ); - if ( !aSel.nStartPos ) // Selektion ab Anfang? + if ( !aSel.nStartPos ) // Selektion ab Anfang? { if ( aSel.nEndPos == pEngine->GetTextLen(0) ) { - // alles selektiert -> Anfuehrungszeichen weglassen + // alles selektiert -> Anfuehrungszeichen weglassen if ( aInsert.GetChar(0) == '"' ) aInsert.Erase(0,1); xub_StrLen nInsLen = aInsert.Len(); @@ -1354,8 +1354,8 @@ void ScInputHandler::PasteManualTip() } else if ( aSel.nEndPos ) { - // nicht alles selektiert -> Gleichheitszeichen nicht ueberschreiben - //! doppelte Gleichheitszeichen auch ??? + // nicht alles selektiert -> Gleichheitszeichen nicht ueberschreiben + //! doppelte Gleichheitszeichen auch ??? aSel.nStartPos = 1; if ( pTopView ) @@ -1382,14 +1382,14 @@ void ScInputHandler::ResetAutoPar() void ScInputHandler::AutoParAdded() { - ++nAutoPar; // closing parenthesis can be overwritten + ++nAutoPar; // closing parenthesis can be overwritten } BOOL ScInputHandler::CursorAtClosingPar() { - // test if the cursor is before a closing parenthesis + // test if the cursor is before a closing parenthesis - // selection from SetReference has been removed before + // selection from SetReference has been removed before EditView* pActiveView = pTopView ? pTopView : pTableView; if ( pActiveView && !pActiveView->HasSelection() && bFormulaMode ) { @@ -1404,8 +1404,8 @@ BOOL ScInputHandler::CursorAtClosingPar() void ScInputHandler::SkipClosingPar() { - // this is called when a ')' is typed and the cursor is before a ')' - // that can be overwritten -> just set the cursor behind the ')' + // this is called when a ')' is typed and the cursor is before a ')' + // that can be overwritten -> just set the cursor behind the ')' EditView* pActiveView = pTopView ? pTopView : pTableView; if (pActiveView) @@ -1414,8 +1414,8 @@ void ScInputHandler::SkipClosingPar() ++aSel.nStartPos; ++aSel.nEndPos; - // this is in a formula (only one paragraph), so the selection - // can be used directly for the TopView + // this is in a formula (only one paragraph), so the selection + // can be used directly for the TopView if ( pTopView ) pTopView->SetSelection( aSel ); @@ -1428,7 +1428,7 @@ void ScInputHandler::SkipClosingPar() } // -// Auto-Eingabe +// Auto-Eingabe // void ScInputHandler::GetColData() @@ -1442,7 +1442,7 @@ void ScInputHandler::GetColData() else { pColumnData = new TypedScStrCollection; - pColumnData->SetCaseSensitive( TRUE ); // equal strings are handled in FindText + pColumnData->SetCaseSensitive( TRUE ); // equal strings are handled in FindText } pDoc->GetDataEntries( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), @@ -1450,12 +1450,12 @@ void ScInputHandler::GetColData() } } -void ScInputHandler::UseColData() // beim Tippen +void ScInputHandler::UseColData() // beim Tippen { EditView* pActiveView = pTopView ? pTopView : pTableView; if ( pActiveView && pColumnData ) { - // nur anpassen, wenn Cursor am Ende steht + // nur anpassen, wenn Cursor am Ende steht ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); @@ -1470,27 +1470,27 @@ void ScInputHandler::UseColData() // beim Tippen if (aText.Len()) { String aNew; - nAutoPos = SCPOS_INVALID; // nix + nAutoPos = SCPOS_INVALID; // nix if ( pColumnData->FindText( aText, aNew, nAutoPos, FALSE ) ) { - // #45434# durch dBase Import etc. koennen Umbrueche im String sein, - // das wuerde hier mehrere Absaetze ergeben -> nicht gut - //! GetExactMatch funktioniert dann auch nicht + // #45434# durch dBase Import etc. koennen Umbrueche im String sein, + // das wuerde hier mehrere Absaetze ergeben -> nicht gut + //! GetExactMatch funktioniert dann auch nicht lcl_RemoveLineEnd( aNew ); // Absaetze beibehalten, nur den Rest anfuegen - //! genaue Ersetzung im EnterHandler !!! + //! genaue Ersetzung im EnterHandler !!! // ein Space zwischen Absaetzen: ULONG nEdLen = pEngine->GetTextLen() + nParCnt - 1; String aIns = aNew.Copy( (xub_StrLen)nEdLen ); - // selection must be "backwards", so the cursor stays behind the last - // typed character + // selection must be "backwards", so the cursor stays behind the last + // typed character ESelection aSelection( aSel.nEndPara, aSel.nEndPos + aIns.Len(), aSel.nEndPara, aSel.nEndPos ); - // when editing in input line, apply to both edit views + // when editing in input line, apply to both edit views if ( pTableView ) { pTableView->InsertText( aIns, FALSE ); @@ -1502,12 +1502,12 @@ void ScInputHandler::UseColData() // beim Tippen pTopView->SetSelection( aSelection ); } - aAutoSearch = aText; // zum Weitersuchen - nAutoPos ist gesetzt + aAutoSearch = aText; // zum Weitersuchen - nAutoPos ist gesetzt if ( aText.Len() == aNew.Len() ) { - // Wenn der eingegebene Text gefunden wurde, TAB nur dann - // verschlucken, wenn noch etwas kommt + // Wenn der eingegebene Text gefunden wurde, TAB nur dann + // verschlucken, wenn noch etwas kommt String aDummy; USHORT nNextPos = nAutoPos; @@ -1529,7 +1529,7 @@ void ScInputHandler::NextAutoEntry( BOOL bBack ) { if ( nAutoPos != SCPOS_INVALID && aAutoSearch.Len() ) { - // stimmt die Selektion noch? (kann per Maus geaendert sein) + // stimmt die Selektion noch? (kann per Maus geaendert sein) ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); @@ -1544,12 +1544,12 @@ void ScInputHandler::NextAutoEntry( BOOL bBack ) String aNew; if ( pColumnData->FindText( aAutoSearch, aNew, nAutoPos, bBack ) ) { - bInOwnChange = TRUE; // disable ModifyHdl (reset below) + bInOwnChange = TRUE; // disable ModifyHdl (reset below) lcl_RemoveLineEnd( aNew ); String aIns = aNew.Copy( aAutoSearch.Len() ); - // when editing in input line, apply to both edit views + // when editing in input line, apply to both edit views if ( pTableView ) { pTableView->DeleteSelected(); @@ -1580,31 +1580,31 @@ void ScInputHandler::NextAutoEntry( BOOL bBack ) } } - // bei Tab wird vorher immer HideCursor gerufen + // bei Tab wird vorher immer HideCursor gerufen if (pActiveView) pActiveView->ShowCursor(); } // -// Klammern hervorheben +// Klammern hervorheben // void ScInputHandler::UpdateParenthesis() { - // Klammern suchen + // Klammern suchen - //! Klammer-Hervorhebung einzeln abschaltbar ???? + //! Klammer-Hervorhebung einzeln abschaltbar ???? BOOL bFound = FALSE; if ( bFormulaMode && eMode != SC_INPUT_TOP ) { - if ( pTableView && !pTableView->HasSelection() ) // Selektion ist immer unten + if ( pTableView && !pTableView->HasSelection() ) // Selektion ist immer unten { ESelection aSel = pTableView->GetSelection(); if (aSel.nStartPos) { - // Das Zeichen links vom Cursor wird angeschaut + // Das Zeichen links vom Cursor wird angeschaut xub_StrLen nPos = aSel.nStartPos - 1; String aFormula = pEngine->GetText((USHORT)0); @@ -1616,11 +1616,11 @@ void ScInputHandler::UpdateParenthesis() { SfxItemSet aSet( pEngine->GetEmptyItemSet() ); aSet.Put( SvxWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT ) ); - //! Unterscheidung, wenn die Zelle schon fett ist !!!! + //! Unterscheidung, wenn die Zelle schon fett ist !!!! if (bParenthesisShown) { - // alte Hervorhebung wegnehmen + // alte Hervorhebung wegnehmen USHORT nCount = pEngine->GetParagraphCount(); for (USHORT i=0; i<nCount; i++) pEngine->QuickRemoveCharAttribs( i, EE_CHAR_WEIGHT ); @@ -1631,7 +1631,7 @@ void ScInputHandler::UpdateParenthesis() ESelection aSelOther( 0,nOther, 0,nOther+1 ); pEngine->QuickSetAttribs( aSet, aSelOther ); - // Dummy-InsertText fuer Update und Paint (Selektion ist leer) + // Dummy-InsertText fuer Update und Paint (Selektion ist leer) pTableView->InsertText( EMPTY_STRING, FALSE ); bFound = TRUE; @@ -1639,12 +1639,12 @@ void ScInputHandler::UpdateParenthesis() } } - // mark parenthesis right of cursor if it will be overwritten (nAutoPar) - // with different color (COL_LIGHTBLUE) ?? + // mark parenthesis right of cursor if it will be overwritten (nAutoPar) + // with different color (COL_LIGHTBLUE) ?? } } - // alte Hervorhebung wegnehmen, wenn keine neue gesetzt + // alte Hervorhebung wegnehmen, wenn keine neue gesetzt if ( bParenthesisShown && !bFound && pTableView ) { @@ -1656,7 +1656,7 @@ void ScInputHandler::UpdateParenthesis() bParenthesisShown = bFound; } -void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // wird synchron aufgerufen! +void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // wird synchron aufgerufen! { if ( pViewSh == pActiveViewSh ) { @@ -1668,7 +1668,7 @@ void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // wird synchron if ( pViewSh == pRefViewSh ) { //! Die Eingabe kommt aus dem EnterHandler nicht mehr an - // Trotzdem wird immerhin der Editmodus beendet + // Trotzdem wird immerhin der Editmodus beendet EnterHandler(); bFormulaMode = FALSE; @@ -1689,7 +1689,7 @@ void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // wird synchron } if ( SC_MOD()->GetInputOptions().GetTextWysiwyg() ) - UpdateRefDevice(); // don't keep old document's printer as RefDevice + UpdateRefDevice(); // don't keep old document's printer as RefDevice } void ScInputHandler::UpdateActiveView() @@ -1731,7 +1731,7 @@ void ScInputHandler::StopInputWinEngine( BOOL bAll ) if (pInputWin) pInputWin->StopEditEngine( bAll ); - pTopView = NULL; // invalid now + pTopView = NULL; // invalid now } EditView* ScInputHandler::GetActiveView() @@ -1744,7 +1744,7 @@ void ScInputHandler::ForgetLastPattern() { pLastPattern = NULL; if ( !pLastState && pActiveViewSh ) - pActiveViewSh->UpdateInputHandler( TRUE ); // Status neu holen + pActiveViewSh->UpdateInputHandler( TRUE ); // Status neu holen else NotifyChange( pLastState, TRUE ); } @@ -1757,8 +1757,8 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped ) case SVX_HOR_JUSTIFY_STANDARD: { BOOL bNumber = FALSE; - if (cTyped) // neu angefangen - bNumber = (cTyped>='0' && cTyped<='9'); // nur Ziffern sind Zahlen + if (cTyped) // neu angefangen + bNumber = (cTyped>='0' && cTyped<='9'); // nur Ziffern sind Zahlen else if ( pActiveViewSh ) { ScDocument* pDoc = pActiveViewSh->GetViewData()->GetDocShell()->GetDocument(); @@ -1776,7 +1776,7 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped ) case SVX_HOR_JUSTIFY_RIGHT: eSvxAdjust = SVX_ADJUST_RIGHT; break; - default: // SVX_HOR_JUSTIFY_LEFT + default: // SVX_HOR_JUSTIFY_LEFT eSvxAdjust = SVX_ADJUST_LEFT; break; } @@ -1786,7 +1786,7 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped ) ((const SfxBoolItem&)pLastPattern->GetItem( ATTR_VERTICAL_ASIAN )).GetValue(); if ( bAsianVertical ) { - // always edit at top of cell -> LEFT when editing vertically + // always edit at top of cell -> LEFT when editing vertically eSvxAdjust = SVX_ADJUST_LEFT; } @@ -1800,14 +1800,14 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped ) void ScInputHandler::RemoveAdjust() { - // harte Ausrichtungs-Attribute loeschen + // harte Ausrichtungs-Attribute loeschen BOOL bUndo = pEngine->IsUndoEnabled(); if ( bUndo ) pEngine->EnableUndo( FALSE ); - // #89403# non-default paragraph attributes (e.g. from clipboard) - // must be turned into character attributes + // #89403# non-default paragraph attributes (e.g. from clipboard) + // must be turned into character attributes pEngine->RemoveParaAttribs(); if ( bUndo ) @@ -1817,10 +1817,10 @@ void ScInputHandler::RemoveAdjust() void ScInputHandler::RemoveRangeFinder() { - // pRangeFindList und Farben loeschen + // pRangeFindList und Farben loeschen pEngine->SetUpdateMode(FALSE); - USHORT nCount = pEngine->GetParagraphCount(); // koennte gerade neu eingefuegt worden sein + USHORT nCount = pEngine->GetParagraphCount(); // koennte gerade neu eingefuegt worden sein for (USHORT i=0; i<nCount; i++) pEngine->QuickRemoveCharAttribs( i, EE_CHAR_COLOR ); pEngine->SetUpdateMode(TRUE); @@ -1828,7 +1828,7 @@ void ScInputHandler::RemoveRangeFinder() EditView* pActiveView = pTopView ? pTopView : pTableView; pActiveView->ShowCursor( FALSE, TRUE ); - DeleteRangeFinder(); // loescht die Liste und die Markierungen auf der Tabelle + DeleteRangeFinder(); // loescht die Liste und die Markierungen auf der Tabelle } bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bInputActivated ) @@ -2016,14 +2016,14 @@ void lcl_SetTopSelection( EditView* pEditView, ESelection& rSel ) xub_StrLen nParLen = pEngine->GetTextLen(rSel.nStartPara); while (rSel.nStartPos > nParLen && rSel.nStartPara+1 < nCount) { - rSel.nStartPos -= nParLen + 1; // incl. Leerzeichen vom Umbruch + rSel.nStartPos -= nParLen + 1; // incl. Leerzeichen vom Umbruch nParLen = pEngine->GetTextLen(++rSel.nStartPara); } nParLen = pEngine->GetTextLen(rSel.nEndPara); while (rSel.nEndPos > nParLen && rSel.nEndPara+1 < nCount) { - rSel.nEndPos -= nParLen + 1; // incl. Leerzeichen vom Umbruch + rSel.nEndPos -= nParLen + 1; // incl. Leerzeichen vom Umbruch nParLen = pEngine->GetTextLen(++rSel.nEndPara); } } @@ -2059,8 +2059,8 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG ) if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) && pEngine && pEngine->GetUpdateMode() && pInputWin ) { - // #102745# update input line from ModifyHdl for changes that are not - // wrapped by DataChanging/DataChanged calls (like Drag&Drop) + // #102745# update input line from ModifyHdl for changes that are not + // wrapped by DataChanging/DataChanged calls (like Drag&Drop) String aText = GetEditText(pEngine); lcl_RemoveTabs(aText); @@ -2069,10 +2069,10 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG ) return 0; } -BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand ) // return TRUE = new view created +BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand ) // return TRUE = new view created { pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE ); - bInOwnChange = TRUE; // disable ModifyHdl (reset in DataChanged) + bInOwnChange = TRUE; // disable ModifyHdl (reset in DataChanged) if ( eMode == SC_INPUT_NONE ) return StartTable( cTyped, bFromCommand, false ); @@ -2089,13 +2089,13 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify ) if ( eMode == SC_INPUT_TOP && pTopView && !bFromTopNotify ) { - // table EditEngine is formatted below, input line needs formatting after paste - // #i20282# not when called from the input line's modify handler + // table EditEngine is formatted below, input line needs formatting after paste + // #i20282# not when called from the input line's modify handler pTopView->GetEditEngine()->QuickFormatDoc( TRUE ); - // #i23720# QuickFormatDoc hides the cursor, but can't show it again because it - // can't safely access the EditEngine's current view, so the cursor has to be - // shown again here. + // #i23720# QuickFormatDoc hides the cursor, but can't show it again because it + // can't safely access the EditEngine's current view, so the cursor has to be + // shown again here. pTopView->ShowCursor(); } @@ -2103,12 +2103,12 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify ) bSelIsRef = FALSE; if ( pRangeFindList && !bInRangeUpdate ) - RemoveRangeFinder(); // Attribute und Markierung loeschen + RemoveRangeFinder(); // Attribute und Markierung loeschen - UpdateParenthesis(); // Hervorhebung der Klammern neu + UpdateParenthesis(); // Hervorhebung der Klammern neu // ER 31.08.00 New SetDefaults sets ParaAttribs, don't clear them away ... -// RemoveAdjust(); // #40255# harte Ausrichtungs-Attribute loeschen +// RemoveAdjust(); // #40255# harte Ausrichtungs-Attribute loeschen if (eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE) { @@ -2119,12 +2119,12 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify ) pInputWin->SetTextString(aText); } - // wenn der Cursor vor dem Absatzende steht, werden Teile rechts rausgeschoben - // (unabhaengig von eMode) -> View anpassen! - // wenn der Cursor am Ende steht, reicht der Status-Handler an der ViewData + // wenn der Cursor vor dem Absatzende steht, werden Teile rechts rausgeschoben + // (unabhaengig von eMode) -> View anpassen! + // wenn der Cursor am Ende steht, reicht der Status-Handler an der ViewData - // #93767# first make sure the status handler is called now if the cursor - // is outside the visible area + // #93767# first make sure the status handler is called now if the cursor + // is outside the visible area pEngine->QuickFormatDoc(); EditView* pActiveView = pTopView ? pTopView : pTableView; @@ -2132,10 +2132,10 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify ) { ScViewData* pViewData = pActiveViewSh->GetViewData(); - BOOL bNeedGrow = ( nEditAdjust != SVX_ADJUST_LEFT ); // rechtsbuendig immer + BOOL bNeedGrow = ( nEditAdjust != SVX_ADJUST_LEFT ); // rechtsbuendig immer if (!bNeedGrow) { - // Cursor vor dem Ende? + // Cursor vor dem Ende? ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); bNeedGrow = ( aSel.nEndPos != pEngine->GetTextLen(aSel.nEndPara) ); @@ -2153,7 +2153,7 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify ) } UpdateFormulaMode(); - bTextValid = FALSE; // Aenderungen sind nur in der Edit-Engine + bTextValid = FALSE; // Aenderungen sind nur in der Edit-Engine bInOwnChange = FALSE; } @@ -2183,7 +2183,7 @@ void ScInputHandler::UpdateFormulaMode() UpdateAutoCorrFlag(); } } - else // ausschalten + else // ausschalten { if (bFormulaMode) { @@ -2219,12 +2219,12 @@ void ScInputHandler::ShowRefFrame() if (bFound) { - // Hier wird sich darauf verlassen, dass Activate synchron funktioniert - // (dabei wird pActiveViewSh umgesetzt) + // Hier wird sich darauf verlassen, dass Activate synchron funktioniert + // (dabei wird pActiveViewSh umgesetzt) - pRefViewSh->SetActive(); // Appear und SetViewFrame + pRefViewSh->SetActive(); // Appear und SetViewFrame - // pLastState wird im NotifyChange aus dem Activate richtig gesetzt + // pLastState wird im NotifyChange aus dem Activate richtig gesetzt } else { @@ -2272,7 +2272,7 @@ void ScInputHandler::InvalidateAttribs() } // -// --------------- public Methoden -------------------------------------------- +// --------------- public Methoden -------------------------------------------- // void ScInputHandler::SetMode( ScInputMode eNewMode ) @@ -2295,7 +2295,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode ) // Disable paste mode when edit mode starts. pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE ); - bInOwnChange = TRUE; // disable ModifyHdl (reset below) + bInOwnChange = TRUE; // disable ModifyHdl (reset below) ScInputMode eOldMode = eMode; eMode = eNewMode; @@ -2304,7 +2304,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode ) if (eMode==SC_INPUT_TOP || eMode==SC_INPUT_TABLE) { - if (eOldMode == SC_INPUT_NONE) // not when switching between modes + if (eOldMode == SC_INPUT_NONE) // not when switching between modes { if (StartTable(0, false, eMode == SC_INPUT_TABLE)) { @@ -2321,7 +2321,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode ) { if ( eMode == SC_INPUT_TABLE && eOldMode == SC_INPUT_TOP ) { - // Selektion bleibt + // Selektion bleibt } else { @@ -2352,7 +2352,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode ) //---------------------------------------------------------------------------------------- -// lcl_IsNumber - TRUE, wenn nur Ziffern (dann keine Autokorrektur) +// lcl_IsNumber - TRUE, wenn nur Ziffern (dann keine Autokorrektur) BOOL lcl_IsNumber(const String& rString) { @@ -2381,22 +2381,22 @@ void lcl_SelectionToEnd( EditView* pView ) void ScInputHandler::EnterHandler( BYTE nBlockMode ) { - // #62806# Bei Makro-Aufrufen fuer Gueltigkeit kann Tod und Teufel passieren, - // darum dafuer sorgen, dass EnterHandler nicht verschachtelt gerufen wird: + // #62806# Bei Makro-Aufrufen fuer Gueltigkeit kann Tod und Teufel passieren, + // darum dafuer sorgen, dass EnterHandler nicht verschachtelt gerufen wird: if (bInEnterHandler) return; bInEnterHandler = TRUE; - bInOwnChange = TRUE; // disable ModifyHdl (reset below) + bInOwnChange = TRUE; // disable ModifyHdl (reset below) ImplCreateEditEngine(); BOOL bMatrix = ( nBlockMode == SC_ENTER_MATRIX ); - SfxApplication* pSfxApp = SFX_APP(); - EditTextObject* pObject = NULL; - ScPatternAttr* pCellAttrs = NULL; - BOOL bAttrib = FALSE; // Formatierung vorhanden ? - BOOL bForget = FALSE; // wegen Gueltigkeit streichen ? + SfxApplication* pSfxApp = SFX_APP(); + EditTextObject* pObject = NULL; + ScPatternAttr* pCellAttrs = NULL; + BOOL bAttrib = FALSE; // Formatierung vorhanden ? + BOOL bForget = FALSE; // wegen Gueltigkeit streichen ? String aString = GetEditText(pEngine); EditView* pActiveView = pTopView ? pTopView : pTableView; @@ -2414,19 +2414,19 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : NULL; if (pTopView) - pTopView->CompleteAutoCorrect(); // #59759# CompleteAutoCorrect fuer beide Views + pTopView->CompleteAutoCorrect(); // #59759# CompleteAutoCorrect fuer beide Views if (pTableView) pTableView->CompleteAutoCorrect(pFrameWin); aString = GetEditText(pEngine); } lcl_RemoveTabs(aString); - // Test, ob zulaessig (immer mit einfachem String) + // Test, ob zulaessig (immer mit einfachem String) if ( bModified && nValidation && pActiveViewSh ) { ScDocument* pDoc = pActiveViewSh->GetViewData()->GetDocument(); - const ScValidationData* pData = pDoc->GetValidationEntry( nValidation ); + const ScValidationData* pData = pDoc->GetValidationEntry( nValidation ); if (pData && pData->HasErrMsg()) { // #i67990# don't use pLastPattern in EnterHandler @@ -2435,15 +2435,15 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) if (!bOk) { - if ( pActiveViewSh ) // falls aus MouseButtonDown gekommen - pActiveViewSh->StopMarking(); // (die InfoBox verschluckt das MouseButtonUp) + if ( pActiveViewSh ) // falls aus MouseButtonDown gekommen + pActiveViewSh->StopMarking(); // (die InfoBox verschluckt das MouseButtonUp) - //! es gibt noch Probleme, wenn die Eingabe durch Aktivieren einer - //! anderen View ausgeloest wurde + //! es gibt noch Probleme, wenn die Eingabe durch Aktivieren einer + //! anderen View ausgeloest wurde Window* pParent = Application::GetDefDialogParent(); if ( pData->DoError( pParent, aString, aCursorPos ) ) - bForget = TRUE; // Eingabe nicht uebernehmen + bForget = TRUE; // Eingabe nicht uebernehmen } } } @@ -2468,8 +2468,8 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) BOOL bSpellErrors = !bFormulaMode && pEngine->HasOnlineSpellErrors(); if ( bSpellErrors ) { - // #i3820# If the spell checker flags numerical input as error, - // it still has to be treated as number, not EditEngine object. + // #i3820# If the spell checker flags numerical input as error, + // it still has to be treated as number, not EditEngine object. if ( pActiveViewSh ) { @@ -2482,17 +2482,17 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) double nVal; if ( pFormatter->IsNumberFormat( aString, nFormat, nVal ) ) { - bSpellErrors = FALSE; // ignore the spelling errors + bSpellErrors = FALSE; // ignore the spelling errors } } } - // After RemoveAdjust, the EditView must not be repainted (has wrong font size etc). - // SetUpdateMode must come after CompleteOnlineSpelling. - // The view is hidden in any case below (Broadcast). + // After RemoveAdjust, the EditView must not be repainted (has wrong font size etc). + // SetUpdateMode must come after CompleteOnlineSpelling. + // The view is hidden in any case below (Broadcast). pEngine->SetUpdateMode( FALSE ); - if ( bModified && !bForget ) // was wird eingeben (Text/Objekt) ? + if ( bModified && !bForget ) // was wird eingeben (Text/Objekt) ? { USHORT nParCnt = pEngine->GetParagraphCount(); if ( nParCnt == 0 ) @@ -2515,7 +2515,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) SfxItemSet aOldAttribs = pEngine->GetAttribs( aSel ); const SfxPoolItem* pItem = NULL; - // find common (cell) attributes before RemoveAdjust + // find common (cell) attributes before RemoveAdjust if ( pActiveViewSh && bUniformAttribs ) { @@ -2543,11 +2543,11 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) } } - // clear ParaAttribs (including adjustment) + // clear ParaAttribs (including adjustment) RemoveAdjust(); - // check if EditObject is needed + // check if EditObject is needed if ( bSpellErrors || nParCnt > 1 ) bAttrib = TRUE; @@ -2560,7 +2560,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) bAttrib = TRUE; else if (eState == SFX_ITEM_SET) { - // keep same items in EditEngine as in ScEditAttrTester + // keep same items in EditEngine as in ScEditAttrTester if ( nId == EE_CHAR_ESCAPEMENT || nId == EE_CHAR_PAIRKERNING || nId == EE_CHAR_KERNING || nId == EE_CHAR_XMLATTRIBS ) { @@ -2570,20 +2570,20 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) } } - // Feldbefehle enthalten? + // Feldbefehle enthalten? SfxItemState eFieldState = aOldAttribs.GetItemState( EE_FEATURE_FIELD, FALSE ); if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET ) bAttrib = TRUE; - // not converted characters? + // not converted characters? SfxItemState eConvState = aOldAttribs.GetItemState( EE_FEATURE_NOTCONV, FALSE ); if ( eConvState == SFX_ITEM_DONTCARE || eConvState == SFX_ITEM_SET ) bAttrib = TRUE; - // Formeln immer als Formeln erkennen (#38309#) - // (der Test vorher ist trotzdem noetig wegen Zell-Attributen) + // Formeln immer als Formeln erkennen (#38309#) + // (der Test vorher ist trotzdem noetig wegen Zell-Attributen) } if (bMatrix) @@ -2597,7 +2597,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) pEngine->SetControlWord( (nCtrl & ~EE_CNTRL_ALLOWBIGOBJS) | nWantBig ); pObject = pEngine->CreateTextObject(); } - else if (bAutoComplete) // Gross-/Kleinschreibung anpassen + else if (bAutoComplete) // Gross-/Kleinschreibung anpassen { // Perform case-matching only when the typed text is partial. if (pColumnData && aAutoSearch.Len() < aString.Len()) @@ -2605,9 +2605,9 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) } } - // don't rely on ShowRefFrame switching the active view synchronously - // execute the function directly on the correct view's bindings instead - // pRefViewSh is reset in ShowRefFrame - get pointer before ShowRefFrame call + // don't rely on ShowRefFrame switching the active view synchronously + // execute the function directly on the correct view's bindings instead + // pRefViewSh is reset in ShowRefFrame - get pointer before ShowRefFrame call ScTabViewShell* pExecuteSh = pRefViewSh ? pRefViewSh : pActiveViewSh; if (bFormulaMode) @@ -2627,7 +2627,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) pInputWin->SetFormulaMode(FALSE); UpdateAutoCorrFlag(); } - pRefViewSh = NULL; // auch ohne FormulaMode wegen Funktions-AP + pRefViewSh = NULL; // auch ohne FormulaMode wegen Funktions-AP DeleteRangeFinder(); ResetAutoPar(); @@ -2635,7 +2635,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) bModified = FALSE; bSelIsRef = FALSE; - eMode = SC_INPUT_NONE; + eMode = SC_INPUT_NONE; StopInputWinEngine( TRUE ); // #123344# Text input (through number formats) or ApplySelectionPattern modify @@ -2644,7 +2644,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) if (bOldMod && !bProtected && !bForget) { - // keine typographische Anfuehrungszeichen in Formeln + // keine typographische Anfuehrungszeichen in Formeln if ( aString.GetChar(0) == '=' ) { @@ -2698,7 +2698,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) rBindings.Execute( nId, aArgs ); } - delete pLastState; // pLastState enthaelt noch den alten Text + delete pLastState; // pLastState enthaelt noch den alten Text pLastState = NULL; } else @@ -2706,7 +2706,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) if ( bOldMod && pExecuteSh && pCellAttrs && !bForget ) { - // mit Eingabe zusammenfassen ? + // mit Eingabe zusammenfassen ? pExecuteSh->ApplySelectionPattern( *pCellAttrs, TRUE, TRUE ); pExecuteSh->AdjustBlockHeight(); } @@ -2726,15 +2726,15 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) void ScInputHandler::CancelHandler() { - bInOwnChange = TRUE; // disable ModifyHdl (reset below) + bInOwnChange = TRUE; // disable ModifyHdl (reset below) ImplCreateEditEngine(); bModified = FALSE; - // don't rely on ShowRefFrame switching the active view synchronously - // execute the function directly on the correct view's bindings instead - // pRefViewSh is reset in ShowRefFrame - get pointer before ShowRefFrame call + // don't rely on ShowRefFrame switching the active view synchronously + // execute the function directly on the correct view's bindings instead + // pRefViewSh is reset in ShowRefFrame - get pointer before ShowRefFrame call ScTabViewShell* pExecuteSh = pRefViewSh ? pRefViewSh : pActiveViewSh; if (bFormulaMode) @@ -2752,7 +2752,7 @@ void ScInputHandler::CancelHandler() pInputWin->SetFormulaMode(FALSE); UpdateAutoCorrFlag(); } - pRefViewSh = NULL; // auch ohne FormulaMode wegen Funktions-AP + pRefViewSh = NULL; // auch ohne FormulaMode wegen Funktions-AP DeleteRangeFinder(); ResetAutoPar(); @@ -2761,11 +2761,11 @@ void ScInputHandler::CancelHandler() if (pExecuteSh) pExecuteSh->StopEditShell(); - aCursorPos.Set(MAXCOL+1,0,0); // Flag, dass ungueltig + aCursorPos.Set(MAXCOL+1,0,0); // Flag, dass ungueltig pEngine->SetText(String()); if ( !pLastState && pExecuteSh ) - pExecuteSh->UpdateInputHandler( TRUE ); // Status neu holen + pExecuteSh->UpdateInputHandler( TRUE ); // Status neu holen else NotifyChange( pLastState, TRUE ); @@ -2777,7 +2777,7 @@ void ScInputHandler::CancelHandler() BOOL ScInputHandler::IsModalMode( SfxObjectShell* pDocSh ) { - // Referenzen auf unbenanntes Dokument gehen nicht + // Referenzen auf unbenanntes Dokument gehen nicht return bFormulaMode && pRefViewSh && pRefViewSh->GetViewData()->GetDocument()->GetDocumentShell() != pDocSh @@ -2789,9 +2789,9 @@ void ScInputHandler::AddRefEntry() const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); UpdateActiveView(); if (!pTableView && !pTopView) - return; // z.B. FillMode + return; // z.B. FillMode - DataChanging(); // kann nicht neu sein + DataChanging(); // kann nicht neu sein RemoveSelection(); if (pTableView) @@ -2811,26 +2811,26 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc ) if (bOtherDoc) if (!pDoc->GetDocumentShell()->HasName()) { - // Referenzen auf unbenanntes Dokument gehen nicht - // (SetReference sollte dann auch nicht gerufen werden) + // Referenzen auf unbenanntes Dokument gehen nicht + // (SetReference sollte dann auch nicht gerufen werden) return; } UpdateActiveView(); if (!pTableView && !pTopView) - return; // z.B. FillMode + return; // z.B. FillMode - // nie das "=" ueberschreiben! + // nie das "=" ueberschreiben! EditView* pActiveView = pTopView ? pTopView : pTableView; ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); if ( aSel.nStartPara == 0 && aSel.nStartPos == 0 ) return; - DataChanging(); // kann nicht neu sein + DataChanging(); // kann nicht neu sein - // Selektion umdrehen, falls rueckwaerts (noetig ???) + // Selektion umdrehen, falls rueckwaerts (noetig ???) if (pTableView) { @@ -2851,18 +2851,18 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc ) } } - // String aus Referenz erzeugen + // String aus Referenz erzeugen String aRefStr; const ScAddress::Details aAddrDetails( pDoc, aCursorPos ); if (bOtherDoc) { - // Referenz auf anderes Dokument + // Referenz auf anderes Dokument DBG_ASSERT(rRef.aStart.Tab()==rRef.aEnd.Tab(), "nStartTab!=nEndTab"); String aTmp; - rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pDoc, aAddrDetails ); // immer 3d + rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pDoc, aAddrDetails ); // immer 3d SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); // #i75893# convert escaped URL of the document to something user friendly @@ -2906,9 +2906,9 @@ void ScInputHandler::InsertFunction( const String& rFuncName, BOOL bAddPar ) UpdateActiveView(); if (!pTableView && !pTopView) - return; // z.B. FillMode + return; // z.B. FillMode - DataChanging(); // kann nicht neu sein + DataChanging(); // kann nicht neu sein String aText = rFuncName; if (bAddPar) @@ -2953,9 +2953,9 @@ void ScInputHandler::ClearText() UpdateActiveView(); if (!pTableView && !pTopView) - return; // z.B. FillMode + return; // z.B. FillMode - DataChanging(); // darf nicht neu sein + DataChanging(); // darf nicht neu sein String aEmpty; if (pTableView) @@ -2984,7 +2984,7 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE USHORT nModi = aCode.GetModifier(); BOOL bShift = aCode.IsShift(); BOOL bControl = aCode.IsMod1(); - BOOL bAlt = aCode.IsMod2(); + BOOL bAlt = aCode.IsMod2(); USHORT nCode = aCode.GetCode(); sal_Unicode nChar = rKEvt.GetCharCode(); @@ -3043,14 +3043,14 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE { if ( pFormulaData && nTipVisible && nAutoPos != SCPOS_INVALID ) { - // blaettern + // blaettern NextFormulaEntry( bShift ); bUsed = true; } else if ( pColumnData && bUseTab && nAutoPos != SCPOS_INVALID ) { - // in den Eintraegen der AutoEingabe blaettern + // in den Eintraegen der AutoEingabe blaettern NextAutoEntry( bShift ); bUsed = true; @@ -3085,11 +3085,11 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE break; } - // Cursortasten nur ausfuehren, wenn schon im Edit-Modus - // z.B. wegen Shift-Ctrl-PageDn (ist nicht als Accelerator definiert) + // Cursortasten nur ausfuehren, wenn schon im Edit-Modus + // z.B. wegen Shift-Ctrl-PageDn (ist nicht als Accelerator definiert) BOOL bCursorKey = EditEngine::DoesKeyMoveCursor(rKEvt); - BOOL bInsKey = ( nCode == KEY_INSERT && !nModi ); // Insert wie Cursortasten behandeln + BOOL bInsKey = ( nCode == KEY_INSERT && !nModi ); // Insert wie Cursortasten behandeln if ( !bUsed && !bSkip && ( bDoEnter || EditEngine::DoesKeyChangeText(rKEvt) || ( eMode != SC_INPUT_NONE && ( bCursorKey || bInsKey ) ) ) ) { @@ -3105,11 +3105,11 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE UpdateActiveView(); BOOL bNewView = DataChanging( nChar ); - if (bProtected) // Zelle geschuetzt? - bUsed = TRUE; // Key-Event nicht weiterleiten - else // Aenderungen erlaubt + if (bProtected) // Zelle geschuetzt? + bUsed = TRUE; // Key-Event nicht weiterleiten + else // Aenderungen erlaubt { - if (bNewView ) // neu anlegen + if (bNewView ) // neu anlegen { if (pActiveViewSh) pActiveViewSh->GetViewData()->GetDocShell()->PostEditView( pEngine, aCursorPos ); @@ -3126,7 +3126,7 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE { pTableView->GetEditEngine()->SetText( aStrLoP ); if ( aStrLoP.Len() ) - pTableView->SetSelection( ESelection(0,0, 0,0) ); // before the '%' + pTableView->SetSelection( ESelection(0,0, 0,0) ); // before the '%' // don't call SetSelection if the string is empty anyway, // to avoid breaking the bInitial handling in ScViewData::EditGrowY @@ -3135,7 +3135,7 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE { pTopView->GetEditEngine()->SetText( aStrLoP ); if ( aStrLoP.Len() ) - pTopView->SetSelection( ESelection(0,0, 0,0) ); // before the '%' + pTopView->SetSelection( ESelection(0,0, 0,0) ); // before the '%' } } SyncViews(); @@ -3143,7 +3143,7 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE if (pTableView || pTopView) { -// pActiveView->SetEditEngineUpdateMode(TRUE); //! gibt Muell !!!! +// pActiveView->SetEditEngineUpdateMode(TRUE); //! gibt Muell !!!! if (bDoEnter) { @@ -3172,16 +3172,16 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE bUsed = TRUE; } - // Auto-Eingabe: + // Auto-Eingabe: if ( bUsed && bAutoComplete ) { bUseTab = FALSE; - nAutoPos = SCPOS_INVALID; // do not search further + nAutoPos = SCPOS_INVALID; // do not search further KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); - if ( nChar && nChar != 8 && nChar != 127 && // no 'backspace', no 'delete' - KEYFUNC_CUT != eFunc) // and no 'CTRL-X' + if ( nChar && nChar != 8 && nChar != 127 && // no 'backspace', no 'delete' + KEYFUNC_CUT != eFunc) // and no 'CTRL-X' { if (bFormulaMode) UseFormulaData(); @@ -3190,8 +3190,8 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE } } - // when the selection is changed manually or an opening parenthesis - // is typed, stop overwriting parentheses + // when the selection is changed manually or an opening parenthesis + // is typed, stop overwriting parentheses if ( bUsed && nChar == '(' ) ResetAutoPar(); @@ -3207,8 +3207,8 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE } } - DataChanged(); // ruft auch UpdateParenthesis() - InvalidateAttribs(); //! in DataChanged ? + DataChanged(); // ruft auch UpdateParenthesis() + InvalidateAttribs(); //! in DataChanged ? } } @@ -3224,8 +3224,8 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce ) if ( rCEvt.GetCommand() == COMMAND_CURSORPOS ) { - // #90346# for COMMAND_CURSORPOS, do as little as possible, because - // with remote VCL, even a ShowCursor will generate another event. + // #90346# for COMMAND_CURSORPOS, do as little as possible, because + // with remote VCL, even a ShowCursor will generate another event. if ( eMode != SC_INPUT_NONE ) { UpdateActiveView(); @@ -3233,7 +3233,7 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce ) { if (pTableView) pTableView->Command( rCEvt ); - else if (pTopView) // call only once + else if (pTopView) // call only once pTopView->Command( rCEvt ); bUsed = TRUE; } @@ -3261,11 +3261,11 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce ) UpdateActiveView(); BOOL bNewView = DataChanging( 0, TRUE ); - if (bProtected) // cell protected - bUsed = TRUE; // event is used - else // changes allowed + if (bProtected) // cell protected + bUsed = TRUE; // event is used + else // changes allowed { - if (bNewView) // create new edit view + if (bNewView) // create new edit view { if (pActiveViewSh) pActiveViewSh->GetViewData()->GetDocShell()->PostEditView( pEngine, aCursorPos ); @@ -3299,7 +3299,7 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce ) if ( rCEvt.GetCommand() == COMMAND_ENDEXTTEXTINPUT ) { - // AutoInput after ext text input + // AutoInput after ext text input nAutoPos = SCPOS_INVALID; if (bFormulaMode) @@ -3309,8 +3309,8 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce ) } } - DataChanged(); // calls UpdateParenthesis() - InvalidateAttribs(); //! in DataChanged ? + DataChanged(); // calls UpdateParenthesis() + InvalidateAttribs(); //! in DataChanged ? } } @@ -3325,8 +3325,8 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, BOOL bForce, ScTabViewShell* pSourceSh, BOOL bStopEditing) { - // #62806# Wenn der Aufruf aus einem Makro-Aufruf im EnterHandler kommt, - // gleich abbrechen und nicht den Status durcheinander bringen + // #62806# Wenn der Aufruf aus einem Makro-Aufruf im EnterHandler kommt, + // gleich abbrechen und nicht den Status durcheinander bringen if (bInEnterHandler) return; @@ -3336,9 +3336,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, if (bRepeat && !bForce) return; - bInOwnChange = TRUE; // disable ModifyHdl (reset below) + bInOwnChange = TRUE; // disable ModifyHdl (reset below) - if ( pState && !pLastState ) // wieder enablen + if ( pState && !pLastState ) // wieder enablen bForce = TRUE; BOOL bHadObject = pLastState && pLastState->GetEditData(); @@ -3365,8 +3365,8 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, { BOOL bIgnore = FALSE; - // hier auch fremde Referenzeingabe beruecksichtigen (z.B. Funktions-AP), - // FormEditData falls gerade von der Hilfe auf Calc umgeschaltet wird: + // hier auch fremde Referenzeingabe beruecksichtigen (z.B. Funktions-AP), + // FormEditData falls gerade von der Hilfe auf Calc umgeschaltet wird: if ( !bFormulaMode && !pScMod->IsFormulaMode() && !pScMod->GetFormEditData() ) { @@ -3383,15 +3383,15 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, if ( !bIgnore /* || bRepeat */ ) { - const ScAddress& rSPos = pState->GetStartPos(); - const ScAddress& rEPos = pState->GetEndPos(); - const EditTextObject* pData = pState->GetEditData(); - String aString = pState->GetString(); - BOOL bTxtMod = FALSE; + const ScAddress& rSPos = pState->GetStartPos(); + const ScAddress& rEPos = pState->GetEndPos(); + const EditTextObject* pData = pState->GetEditData(); + String aString = pState->GetString(); + BOOL bTxtMod = FALSE; ScDocShell* pDocSh = pActiveViewSh->GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); - aCursorPos = pState->GetPos(); + aCursorPos = pState->GetPos(); if ( pData /* || bRepeat */ ) bTxtMod = TRUE; @@ -3415,26 +3415,26 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, else { aCurrentText = aString; - bTextValid = TRUE; //! erst nur als String merken + bTextValid = TRUE; //! erst nur als String merken } if ( pInputWin ) pInputWin->SetTextString(aString); } - if ( pInputWin ) // Bereichsanzeige + if ( pInputWin ) // Bereichsanzeige { String aPosStr; const ScAddress::Details aAddrDetails( pDoc, aCursorPos ); - // Ist der Bereich ein Name? - //! per Timer suchen ??? + // Ist der Bereich ein Name? + //! per Timer suchen ??? if ( pActiveViewSh ) pActiveViewSh->GetViewData()->GetDocument()-> GetRangeAtBlock( ScRange( rSPos, rEPos ), &aPosStr ); - if ( !aPosStr.Len() ) // kein Name -> formatieren + if ( !aPosStr.Len() ) // kein Name -> formatieren { USHORT nFlags = 0; if( aAddrDetails.eConv == formula::FormulaGrammar::CONV_XL_R1C1 ) @@ -3456,9 +3456,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, if (bStopEditing) SFX_APP()->Broadcast( SfxSimpleHint( FID_KILLEDITVIEW ) ); - // As long as the content is not edited, turn off online spelling. - // Online spelling is turned back on in StartTable, after setting - // the right language from cell attributes. + // As long as the content is not edited, turn off online spelling. + // Online spelling is turned back on in StartTable, after setting + // the right language from cell attributes. ULONG nCntrl = pEngine->GetControlWord(); if ( nCntrl & EE_CNTRL_ONLINESPELLING ) @@ -3472,12 +3472,12 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, } } -// bProtected = FALSE; +// bProtected = FALSE; if ( pInputWin) { - if(!pScMod->IsFormulaMode()&& !pScMod->IsRefDialogOpen()) //BugID 54702 - { //Wenn RefDialog offen, dann nicht enablen + if(!pScMod->IsFormulaMode()&& !pScMod->IsRefDialogOpen()) //BugID 54702 + { //Wenn RefDialog offen, dann nicht enablen if ( !pInputWin->IsEnabled()) { pInputWin->Enable(); @@ -3488,9 +3488,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, } } else if(pScMod->IsRefDialogOpen()) - { // Da jedes Dokument eigenes InputWin hat, sollte - if ( !pDelayTimer ) // nochmals Timer gestartet werden, da sonst Ein- - { // gabezeile evt. noch aktiv ist. + { // Da jedes Dokument eigenes InputWin hat, sollte + if ( !pDelayTimer ) // nochmals Timer gestartet werden, da sonst Ein- + { // gabezeile evt. noch aktiv ist. pDelayTimer = new Timer; pDelayTimer->SetTimeout( 500 ); // 100ms Verzoegerung pDelayTimer->SetTimeoutHdl( LINK( this, ScInputHandler, DelayTimer ) ); @@ -3542,7 +3542,7 @@ IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer ) if ( NULL == pLastState || SC_MOD()->IsFormulaMode() || SC_MOD()->IsRefDialogOpen()) { - //! new method at ScModule to query if function autopilot is open + //! new method at ScModule to query if function autopilot is open SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm && pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ) @@ -3553,9 +3553,9 @@ IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer ) pInputWin->Disable(); } } - else if ( !bFormulaMode ) // #39210# Formel auch z.B. bei Hilfe behalten + else if ( !bFormulaMode ) // #39210# Formel auch z.B. bei Hilfe behalten { - bInOwnChange = TRUE; // disable ModifyHdl (reset below) + bInOwnChange = TRUE; // disable ModifyHdl (reset below) pActiveViewSh = NULL; pEngine->SetText( EMPTY_STRING ); @@ -3577,9 +3577,9 @@ void ScInputHandler::InputSelection( EditView* pView ) { SyncViews( pView ); ShowTipCursor(); - UpdateParenthesis(); // Selektion geaendert -> Klammer-Hervorhebung neu + UpdateParenthesis(); // Selektion geaendert -> Klammer-Hervorhebung neu - // when the selection is changed manually, stop overwriting parentheses + // when the selection is changed manually, stop overwriting parentheses ResetAutoPar(); } @@ -3592,11 +3592,11 @@ void ScInputHandler::InputChanged( EditView* pView, BOOL bFromNotify ) // #i20282# DataChanged needs to know if this is from the input line's modify handler BOOL bFromTopNotify = ( bFromNotify && pView == pTopView ); - BOOL bNewView = DataChanging(); //! kann das hier ueberhaupt sein? - aCurrentText = pView->GetEditEngine()->GetText(); // auch den String merken + BOOL bNewView = DataChanging(); //! kann das hier ueberhaupt sein? + aCurrentText = pView->GetEditEngine()->GetText(); // auch den String merken pEngine->SetText( aCurrentText ); DataChanged( bFromTopNotify ); - bTextValid = TRUE; // wird in DataChanged auf FALSE gesetzt + bTextValid = TRUE; // wird in DataChanged auf FALSE gesetzt if ( pActiveViewSh ) { @@ -3615,7 +3615,7 @@ const String& ScInputHandler::GetEditString() { if (pEngine) { - aCurrentText = pEngine->GetText(); // immer neu aus Engine + aCurrentText = pEngine->GetText(); // immer neu aus Engine bTextValid = TRUE; } @@ -3636,31 +3636,31 @@ BOOL ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine ) BOOL bRet = FALSE; if (pEngine) { - // Feldbefehle enthalten? + // Feldbefehle enthalten? USHORT nParCnt = pEngine->GetParagraphCount(); SfxItemSet aSet = pEngine->GetAttribs( ESelection(0,0,nParCnt,0) ); SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, FALSE ); if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET ) { - // Inhalt kopieren + // Inhalt kopieren EditTextObject* pObj = pEngine->CreateTextObject(); rDestEngine.SetText(*pObj); delete pObj; - // Attribute loeschen + // Attribute loeschen for (USHORT i=0; i<nParCnt; i++) rDestEngine.QuickRemoveCharAttribs( i ); - // Absaetze zusammenfassen + // Absaetze zusammenfassen while ( nParCnt > 1 ) { xub_StrLen nLen = rDestEngine.GetTextLen( (USHORT)0 ); ESelection aSel( 0,nLen, 1,0 ); - rDestEngine.QuickInsertText( ' ', aSel ); // Umbruch durch Space ersetzen + rDestEngine.QuickInsertText( ' ', aSel ); // Umbruch durch Space ersetzen --nParCnt; } @@ -3685,7 +3685,7 @@ void ScInputHandler::InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd ) EditView* ScInputHandler::GetFuncEditView() { - UpdateActiveView(); // wegen pTableView + UpdateActiveView(); // wegen pTableView EditView* pView = NULL; if ( pInputWin ) @@ -3697,7 +3697,7 @@ EditView* ScInputHandler::GetFuncEditView() { if ( eMode != SC_INPUT_TABLE ) { - bCreatingFuncView = TRUE; // RangeFinder nicht anzeigen + bCreatingFuncView = TRUE; // RangeFinder nicht anzeigen SetMode( SC_INPUT_TABLE ); bCreatingFuncView = FALSE; if ( pTableView ) @@ -3752,7 +3752,7 @@ void ScInputHandler::InputReplaceSelection( const String& rStr ) if (pView) { pView->SetEditEngineUpdateMode( FALSE ); -// pView->InsertText( rStr, TRUE ); +// pView->InsertText( rStr, TRUE ); pView->GetEditEngine()->SetText( aFormText ); pView->SetSelection( ESelection(0,nFormSelStart, 0,nFormSelEnd) ); pView->SetEditEngineUpdateMode( TRUE ); @@ -3764,11 +3764,11 @@ void ScInputHandler::InputReplaceSelection( const String& rStr ) String ScInputHandler::InputGetFormulaStr() { - return aFormText; //! eigene Membervariable? + return aFormText; //! eigene Membervariable? } //======================================================================== -// ScInputHdlState +// ScInputHdlState //======================================================================== ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos, @@ -3776,18 +3776,18 @@ ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos, const ScAddress& rEndPos, const String& rString, const EditTextObject* pData ) - : aCursorPos ( rCurPos ), - aStartPos ( rStartPos ), - aEndPos ( rEndPos ), - aString ( rString ), - pEditData ( pData ? pData->Clone() : NULL ) + : aCursorPos ( rCurPos ), + aStartPos ( rStartPos ), + aEndPos ( rEndPos ), + aString ( rString ), + pEditData ( pData ? pData->Clone() : NULL ) { } //------------------------------------------------------------------------ ScInputHdlState::ScInputHdlState( const ScInputHdlState& rCpy ) - : pEditData ( NULL ) + : pEditData ( NULL ) { *this = rCpy; } @@ -3803,10 +3803,10 @@ ScInputHdlState::~ScInputHdlState() int ScInputHdlState::operator==( const ScInputHdlState& r ) const { - return ( (aStartPos == r.aStartPos) - && (aEndPos == r.aEndPos) - && (aCursorPos == r.aCursorPos) - && (aString == r.aString) + return ( (aStartPos == r.aStartPos) + && (aEndPos == r.aEndPos) + && (aCursorPos == r.aCursorPos) + && (aString == r.aString) && ScGlobal::EETextObjEqual( pEditData, r.pEditData ) ); } @@ -3816,11 +3816,11 @@ ScInputHdlState& ScInputHdlState::operator=( const ScInputHdlState& r ) { delete pEditData; - aCursorPos = r.aCursorPos; - aStartPos = r.aStartPos; - aEndPos = r.aEndPos; - aString = r.aString; - pEditData = r.pEditData ? r.pEditData->Clone() : NULL; + aCursorPos = r.aCursorPos; + aStartPos = r.aStartPos; + aEndPos = r.aEndPos; + aString = r.aString; + pEditData = r.pEditData ? r.pEditData->Clone() : NULL; return *this; } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index c49345f3672b..ae77794ff999 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.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 <sfx2/dispatch.hxx> #include <sfx2/event.hxx> #include <sfx2/imgmgr.hxx> -#include <stdlib.h> // qsort +#include <stdlib.h> // qsort #include <editeng/scriptspaceitem.hxx> #include <editeng/scripttypeitem.hxx> #include <vcl/cursor.hxx> @@ -76,9 +76,9 @@ #include "AccessibleEditObject.hxx" #include "AccessibleText.hxx" -#define TEXT_STARTPOS 3 -#define THESIZE 1000000 //!!! langt... :-) -#define TBX_WINDOW_HEIGHT 22 // in Pixeln - fuer alle Systeme gleich? +#define TEXT_STARTPOS 3 +#define THESIZE 1000000 //!!! langt... :-) +#define TBX_WINDOW_HEIGHT 22 // in Pixeln - fuer alle Systeme gleich? enum ScNameInputType { @@ -95,14 +95,14 @@ enum ScNameInputType //================================================================== -// class ScInputWindowWrapper +// class ScInputWindowWrapper //================================================================== SFX_IMPL_CHILDWINDOW(ScInputWindowWrapper,FID_INPUTLINE_STATUS) ScInputWindowWrapper::ScInputWindowWrapper( Window* pParentP, - USHORT nId, - SfxBindings* pBindings, + USHORT nId, + SfxBindings* pBindings, SfxChildWinInfo* /* pInfo */ ) : SfxChildWindow( pParentP, nId ) { @@ -117,7 +117,7 @@ ScInputWindowWrapper::ScInputWindowWrapper( Window* pParentP, pBindings->Invalidate( FID_TOGGLEINPUTLINE ); } -// GetInfo fliegt wieder raus, wenn es ein SFX_IMPL_TOOLBOX gibt !!!! +// GetInfo fliegt wieder raus, wenn es ein SFX_IMPL_TOOLBOX gibt !!!! SfxChildWinInfo __EXPORT ScInputWindowWrapper::GetInfo() const { @@ -130,7 +130,7 @@ SfxChildWinInfo __EXPORT ScInputWindowWrapper::GetInfo() const #define IMAGE(id) pImgMgr->SeekImage(id, bHC) //================================================================== -// class ScInputWindow +// class ScInputWindow //================================================================== ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : @@ -143,15 +143,15 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : #endif aWndPos ( this ), aTextWindow ( this ), - pInputHdl ( NULL ), + pInputHdl ( NULL ), pBindings ( pBind ), - aTextOk ( ScResId( SCSTR_QHELP_BTNOK ) ), // nicht immer neu aus Resource - aTextCancel ( ScResId( SCSTR_QHELP_BTNCANCEL ) ), - aTextSum ( ScResId( SCSTR_QHELP_BTNSUM ) ), - aTextEqual ( ScResId( SCSTR_QHELP_BTNEQUAL ) ), + aTextOk ( ScResId( SCSTR_QHELP_BTNOK ) ), // nicht immer neu aus Resource + aTextCancel ( ScResId( SCSTR_QHELP_BTNCANCEL ) ), + aTextSum ( ScResId( SCSTR_QHELP_BTNSUM ) ), + aTextEqual ( ScResId( SCSTR_QHELP_BTNEQUAL ) ), bIsOkCancelMode ( FALSE ) { - ScModule* pScMod = SC_MOD(); + ScModule* pScMod = SC_MOD(); SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod ); // #i73615# don't rely on SfxViewShell::Current while constructing the input line @@ -169,34 +169,34 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode(); // Positionsfenster, 3 Buttons, Eingabefenster - InsertWindow ( 1, &aWndPos, 0, 0 ); - InsertSeparator ( 1 ); + InsertWindow ( 1, &aWndPos, 0, 0 ); + InsertSeparator ( 1 ); InsertItem ( SID_INPUT_FUNCTION, IMAGE( SID_INPUT_FUNCTION ), 0, 2 ); - InsertItem ( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 ); - InsertItem ( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 ); - InsertSeparator ( 5 ); + InsertItem ( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 ); + InsertItem ( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 ); + InsertSeparator ( 5 ); InsertWindow ( 7, &aTextWindow, 0, 6 ); - aWndPos .SetQuickHelpText( ScResId( SCSTR_QHELP_POSWND ) ); - aWndPos .SetHelpId ( HID_INSWIN_POS ); + aWndPos .SetQuickHelpText( ScResId( SCSTR_QHELP_POSWND ) ); + aWndPos .SetHelpId ( HID_INSWIN_POS ); aTextWindow.SetQuickHelpText( ScResId( SCSTR_QHELP_INPUTWND ) ); - aTextWindow.SetHelpId ( HID_INSWIN_INPUT ); + aTextWindow.SetHelpId ( HID_INSWIN_INPUT ); - // kein SetHelpText, die Hilfetexte kommen aus der Hilfe + // kein SetHelpText, die Hilfetexte kommen aus der Hilfe SetItemText ( SID_INPUT_FUNCTION, ScResId( SCSTR_QHELP_BTNCALC ) ); - SetHelpId ( SID_INPUT_FUNCTION, HID_INSWIN_CALC ); + SetHelpId ( SID_INPUT_FUNCTION, HID_INSWIN_CALC ); SetItemText ( SID_INPUT_SUM, aTextSum ); - SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); + SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); SetItemText ( SID_INPUT_EQUAL, aTextEqual ); - SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); + SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); - SetHelpId( HID_SC_INPUTWIN ); // fuer die ganze Eingabezeile + SetHelpId( HID_SC_INPUTWIN ); // fuer die ganze Eingabezeile - aWndPos .Show(); - aTextWindow .Show(); + aWndPos .Show(); + aTextWindow .Show(); pInputHdl = SC_MOD()->GetInputHdl( pViewSh, FALSE ); // use own handler even if ref-handler is set if (pInputHdl) @@ -204,21 +204,21 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : if ( pInputHdl && pInputHdl->GetFormString().Len() ) { - // Umschalten waehrend der Funktionsautopilot aktiv ist - // -> Inhalt des Funktionsautopiloten wieder anzeigen - //! auch Selektion (am InputHdl gemerkt) wieder anzeigen + // Umschalten waehrend der Funktionsautopilot aktiv ist + // -> Inhalt des Funktionsautopiloten wieder anzeigen + //! auch Selektion (am InputHdl gemerkt) wieder anzeigen aTextWindow.SetTextString( pInputHdl->GetFormString() ); } else if ( pInputHdl && pInputHdl->IsInputMode() ) { - // wenn waehrend des Editierens die Eingabezeile weg war - // (Editieren einer Formel, dann umschalten zu fremdem Dokument/Hilfe), - // wieder den gerade editierten Text aus dem InputHandler anzeigen + // wenn waehrend des Editierens die Eingabezeile weg war + // (Editieren einer Formel, dann umschalten zu fremdem Dokument/Hilfe), + // wieder den gerade editierten Text aus dem InputHandler anzeigen - aTextWindow.SetTextString( pInputHdl->GetEditString() ); // Text anzeigen + aTextWindow.SetTextString( pInputHdl->GetEditString() ); // Text anzeigen if ( pInputHdl->IsTopMode() ) - pInputHdl->SetMode( SC_INPUT_TABLE ); // Focus kommt eh nach unten + pInputHdl->SetMode( SC_INPUT_TABLE ); // Focus kommt eh nach unten } else if ( pViewSh ) pViewSh->UpdateInputHandler( TRUE ); // unbedingtes Update @@ -230,9 +230,9 @@ __EXPORT ScInputWindow::~ScInputWindow() { BOOL bDown = ( ScGlobal::pSysLocale == NULL ); // after Clear? - // if any view's input handler has a pointer to this input window, reset it - // (may be several ones, #74522#) - // member pInputHdl is not used here + // if any view's input handler has a pointer to this input window, reset it + // (may be several ones, #74522#) + // member pInputHdl is not used here if ( !bDown ) { @@ -255,12 +255,12 @@ __EXPORT ScInputWindow::~ScInputWindow() void ScInputWindow::SetInputHandler( ScInputHandler* pNew ) { - // wird im Activate der View gerufen... + // wird im Activate der View gerufen... if ( pNew != pInputHdl ) { - // Bei Reload (letzte Version) ist pInputHdl der Input-Handler der alten, - // geloeschten ViewShell, darum hier auf keinen Fall anfassen! + // Bei Reload (letzte Version) ist pInputHdl der Input-Handler der alten, + // geloeschten ViewShell, darum hier auf keinen Fall anfassen! pInputHdl = pNew; if (pInputHdl) @@ -338,16 +338,16 @@ void __EXPORT ScInputWindow::Select() { case SID_INPUT_FUNCTION: { - //! new method at ScModule to query if function autopilot is open + //! new method at ScModule to query if function autopilot is open SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ) { pViewFrm->GetDispatcher()->Execute( SID_OPENDLG_FUNCTION, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD ); - // die Toolbox wird sowieso disabled, also braucht auch nicht umgeschaltet - // zu werden, egal ob's geklappt hat oder nicht -// SetOkCancelMode(); + // die Toolbox wird sowieso disabled, also braucht auch nicht umgeschaltet + // zu werden, egal ob's geklappt hat oder nicht +// SetOkCancelMode(); } } break; @@ -360,7 +360,7 @@ void __EXPORT ScInputWindow::Select() case SID_INPUT_OK: pScMod->InputEnterHandler(); SetSumAssignMode(); - aTextWindow.Invalidate(); // sonst bleibt Selektion stehen + aTextWindow.Invalidate(); // sonst bleibt Selektion stehen break; case SID_INPUT_SUM: @@ -425,7 +425,7 @@ void __EXPORT ScInputWindow::Select() } } } - else // nur in Eingabezeile einfuegen + else // nur in Eingabezeile einfuegen { ScRangeList aRangeList; const BOOL bDataFound = pViewSh->GetAutoSumArea( aRangeList ); @@ -441,8 +441,8 @@ void __EXPORT ScInputWindow::Select() { pHdl->InitRangeFinder( aFormula ); - //! SetSelection am InputHandler ??? - //! bSelIsRef setzen ??? + //! SetSelection am InputHandler ??? + //! bSelIsRef setzen ??? const xub_StrLen nOpen = aFormula.Search('('); const xub_StrLen nLen = aFormula.Len(); if ( nOpen != STRING_NOTFOUND && nLen > nOpen ) @@ -468,7 +468,7 @@ void __EXPORT ScInputWindow::Select() case SID_INPUT_EQUAL: { aTextWindow.StartEditEngine(); - if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt + if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt { aTextWindow.GrabFocus(); aTextWindow.SetTextString( '=' ); @@ -502,7 +502,7 @@ void __EXPORT ScInputWindow::Resize() void ScInputWindow::SetFuncString( const String& rString, BOOL bDoEdit ) { - //! new method at ScModule to query if function autopilot is open + //! new method at ScModule to query if function autopilot is open SfxViewFrame* pViewFrm = SfxViewFrame::Current(); EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ); aTextWindow.StartEditEngine(); @@ -526,7 +526,7 @@ void ScInputWindow::SetFuncString( const String& rString, BOOL bDoEdit ) pScMod->InputChanged(pView); if ( bDoEdit ) - SetOkCancelMode(); // nicht, wenn gleich hinterher Enter/Cancel + SetOkCancelMode(); // nicht, wenn gleich hinterher Enter/Cancel pView->SetEditEngineUpdateMode(TRUE); } @@ -552,7 +552,7 @@ void ScInputWindow::SetTextString( const String& rString ) void ScInputWindow::SetOkCancelMode() { - //! new method at ScModule to query if function autopilot is open + //! new method at ScModule to query if function autopilot is open SfxViewFrame* pViewFrm = SfxViewFrame::Current(); EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ); @@ -565,18 +565,18 @@ void ScInputWindow::SetOkCancelMode() RemoveItem( 3 ); // SID_INPUT_SUM und SID_INPUT_EQUAL entfernen RemoveItem( 3 ); InsertItem( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ), 0, 3 ); - InsertItem( SID_INPUT_OK, IMAGE( SID_INPUT_OK ), 0, 4 ); - SetItemText ( SID_INPUT_CANCEL, aTextCancel ); - SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL ); - SetItemText ( SID_INPUT_OK, aTextOk ); - SetHelpId ( SID_INPUT_OK, HID_INSWIN_OK ); + InsertItem( SID_INPUT_OK, IMAGE( SID_INPUT_OK ), 0, 4 ); + SetItemText ( SID_INPUT_CANCEL, aTextCancel ); + SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL ); + SetItemText ( SID_INPUT_OK, aTextOk ); + SetHelpId ( SID_INPUT_OK, HID_INSWIN_OK ); bIsOkCancelMode = TRUE; } } void ScInputWindow::SetSumAssignMode() { - //! new method at ScModule to query if function autopilot is open + //! new method at ScModule to query if function autopilot is open SfxViewFrame* pViewFrm = SfxViewFrame::Current(); EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ); @@ -589,15 +589,15 @@ void ScInputWindow::SetSumAssignMode() // SID_INPUT_CANCEL, und SID_INPUT_OK entfernen RemoveItem( 3 ); RemoveItem( 3 ); - InsertItem( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 ); - InsertItem( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 ); - SetItemText ( SID_INPUT_SUM, aTextSum ); - SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); - SetItemText ( SID_INPUT_EQUAL, aTextEqual ); - SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); + InsertItem( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 ); + InsertItem( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 ); + SetItemText ( SID_INPUT_SUM, aTextSum ); + SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); + SetItemText ( SID_INPUT_EQUAL, aTextEqual ); + SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); bIsOkCancelMode = FALSE; - SetFormulaMode(FALSE); // kein editieren -> keine Formel + SetFormulaMode(FALSE); // kein editieren -> keine Formel } } @@ -660,7 +660,7 @@ void ScInputWindow::SwitchToTextWin() { xub_StrLen nLen = pView->GetEditEngine()->GetTextLen(0); ESelection aSel( 0, nLen, 0, nLen ); - pView->SetSelection( aSel ); // set cursor to end of text + pView->SetSelection( aSel ); // set cursor to end of text } } } @@ -672,14 +672,14 @@ void ScInputWindow::PosGrabFocus() void ScInputWindow::EnableButtons( BOOL bEnable ) { - // when enabling buttons, always also enable the input window itself + // when enabling buttons, always also enable the input window itself if ( bEnable && !IsEnabled() ) Enable(); - EnableItem( SID_INPUT_FUNCTION, bEnable ); + EnableItem( SID_INPUT_FUNCTION, bEnable ); EnableItem( bIsOkCancelMode ? SID_INPUT_CANCEL : SID_INPUT_SUM, bEnable ); EnableItem( bIsOkCancelMode ? SID_INPUT_OK : SID_INPUT_EQUAL, bEnable ); -// Invalidate(); +// Invalidate(); } void ScInputWindow::StateChanged( StateChangedType nType ) @@ -693,9 +693,9 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - // update item images + // update item images - ScModule* pScMod = SC_MOD(); + ScModule* pScMod = SC_MOD(); SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod ); BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode(); // IMAGE macro uses pScMod, pImgMgr, bHC @@ -717,26 +717,26 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt ) } //======================================================================== -// Eingabefenster +// Eingabefenster //======================================================================== ScTextWnd::ScTextWnd( Window* pParent ) - : Window ( pParent, WinBits(WB_HIDE | WB_BORDER) ), + : Window ( pParent, WinBits(WB_HIDE | WB_BORDER) ), DragSourceHelper( this ), - pEditEngine ( NULL ), - pEditView ( NULL ), + pEditEngine ( NULL ), + pEditView ( NULL ), bIsInsertMode( TRUE ), bFormulaMode ( FALSE ), bInputMode ( FALSE ) { - EnableRTL( FALSE ); // #106269# EditEngine can't be used with VCL EnableRTL + EnableRTL( FALSE ); // #106269# EditEngine can't be used with VCL EnableRTL bIsRTL = GetSettings().GetLayoutRTL(); - // #79096# always use application font, so a font with cjk chars can be installed + // #79096# always use application font, so a font with cjk chars can be installed Font aAppFont = GetFont(); aTextFont = aAppFont; - aTextFont.SetSize( PixelToLogic( aAppFont.GetSize(), MAP_TWIP ) ); // AppFont ist in Pixeln + aTextFont.SetSize( PixelToLogic( aAppFont.GetSize(), MAP_TWIP ) ); // AppFont ist in Pixeln const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -745,15 +745,15 @@ ScTextWnd::ScTextWnd( Window* pParent ) aTextFont.SetTransparent ( TRUE ); aTextFont.SetFillColor ( aBgColor ); - //aTextFont.SetColor ( COL_FIELDTEXT ); - aTextFont.SetColor (aTxtColor); - aTextFont.SetWeight ( WEIGHT_NORMAL ); + //aTextFont.SetColor ( COL_FIELDTEXT ); + aTextFont.SetColor (aTxtColor); + aTextFont.SetWeight ( WEIGHT_NORMAL ); - SetSizePixel ( Size(1,TBX_WINDOW_HEIGHT) ); - SetBackground ( aBgColor ); - SetLineColor ( COL_BLACK ); - SetMapMode ( MAP_TWIP ); - SetPointer ( POINTER_TEXT ); + SetSizePixel ( Size(1,TBX_WINDOW_HEIGHT) ); + SetBackground ( aBgColor ); + SetLineColor ( COL_BLACK ); + SetMapMode ( MAP_TWIP ); + SetPointer ( POINTER_TEXT ); } __EXPORT ScTextWnd::~ScTextWnd() @@ -775,16 +775,16 @@ void __EXPORT ScTextWnd::Paint( const Rectangle& rRec ) long nDiff = GetOutputSizePixel().Height() - LogicToPixel( Size( 0, GetTextHeight() ) ).Height(); -// if (nDiff<2) nDiff=2; // mind. 1 Pixel +// if (nDiff<2) nDiff=2; // mind. 1 Pixel long nStartPos = TEXT_STARTPOS; if ( bIsRTL ) { - // right-align + // right-align nStartPos += GetOutputSizePixel().Width() - 2*TEXT_STARTPOS - LogicToPixel( Size( GetTextWidth( aString ), 0 ) ).Width(); - // LayoutMode isn't changed as long as ModifyRTLDefaults doesn't include SvxFrameDirectionItem + // LayoutMode isn't changed as long as ModifyRTLDefaults doesn't include SvxFrameDirectionItem } DrawText( PixelToLogic( Point( nStartPos, nDiff/2 ) ), aString ); @@ -800,7 +800,7 @@ void __EXPORT ScTextWnd::Resize() - LogicToPixel( Size( 0, GetTextHeight() ) ).Height(); #ifdef OS2_DOCH_NICHT - nDiff-=2; // wird durch 2 geteilt + nDiff-=2; // wird durch 2 geteilt // passt sonst nicht zur normalen Textausgabe #endif @@ -842,7 +842,7 @@ void __EXPORT ScTextWnd::MouseButtonUp( const MouseEvent& rMEvt ) if ( rMEvt.IsMiddle() && GetSettings().GetMouseSettings().GetMiddleButtonAction() == MOUSE_MIDDLE_PASTESELECTION ) { - // EditView may have pasted from selection + // EditView may have pasted from selection SC_MOD()->InputChanged( pEditView ); } else @@ -867,13 +867,13 @@ void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt ) pEditView->Command( rCEvt ); pScMod->SetInEditCommand( FALSE ); - // #48929# COMMAND_STARTDRAG heiss noch lange nicht, dass der Inhalt geaendert wurde - // darum in dem Fall kein InputChanged - //! erkennen, ob mit Move gedraggt wurde, oder Drag&Move irgendwie verbieten + // #48929# COMMAND_STARTDRAG heiss noch lange nicht, dass der Inhalt geaendert wurde + // darum in dem Fall kein InputChanged + //! erkennen, ob mit Move gedraggt wurde, oder Drag&Move irgendwie verbieten if ( nCommand == COMMAND_STARTDRAG ) { - // ist auf eine andere View gedraggt worden? + // ist auf eine andere View gedraggt worden? ScTabViewShell* pEndViewSh = ScTabViewShell::GetActiveViewShell(); if ( pEndViewSh != pStartViewSh && pStartViewSh != NULL ) { @@ -882,13 +882,13 @@ void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt ) if ( pHdl && pViewData->HasEditView( pViewData->GetActivePart() ) ) { pHdl->CancelHandler(); - pViewData->GetView()->ShowCursor(); // fehlt bei KillEditView, weil nicht aktiv + pViewData->GetView()->ShowCursor(); // fehlt bei KillEditView, weil nicht aktiv } } } else if ( nCommand == COMMAND_CURSORPOS ) { - // don't call InputChanged for COMMAND_CURSORPOS + // don't call InputChanged for COMMAND_CURSORPOS } else if ( nCommand == COMMAND_INPUTLANGUAGECHANGE ) { @@ -907,7 +907,7 @@ void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt ) SC_MOD()->InputChanged( pEditView ); } else - Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern... + Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern... bInputMode = FALSE; } @@ -919,8 +919,8 @@ void ScTextWnd::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, TRUE ); pEditView->Command( aDragEvent ); - // handling of d&d to different view (CancelHandler) can't be done here, - // because the call returns before d&d is complete. + // handling of d&d to different view (CancelHandler) can't be done here, + // because the call returns before d&d is complete. } } @@ -932,7 +932,7 @@ void __EXPORT ScTextWnd::KeyInput(const KeyEvent& rKEvt) BOOL bUsed = FALSE; ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if ( pViewSh ) - bUsed = pViewSh->SfxKeyInput(rKEvt); // nur Acceleratoren, keine Eingabe + bUsed = pViewSh->SfxKeyInput(rKEvt); // nur Acceleratoren, keine Eingabe if (!bUsed) Window::KeyInput( rKEvt ); } @@ -952,7 +952,7 @@ void __EXPORT ScTextWnd::LoseFocus() String __EXPORT ScTextWnd::GetText() const { - // ueberladen, um per Testtool an den Text heranzukommen + // ueberladen, um per Testtool an den Text heranzukommen if ( pEditEngine ) return pEditEngine->GetText(); @@ -976,9 +976,9 @@ void ScTextWnd::UpdateAutoCorrFlag() ULONG nControl = pEditEngine->GetControlWord(); ULONG nOld = nControl; if ( bFormulaMode ) - nControl &= ~EE_CNTRL_AUTOCORRECT; // keine Autokorrektur in Formeln + nControl &= ~EE_CNTRL_AUTOCORRECT; // keine Autokorrektur in Formeln else - nControl |= EE_CNTRL_AUTOCORRECT; // sonst schon + nControl |= EE_CNTRL_AUTOCORRECT; // sonst schon if ( nControl != nOld ) pEditEngine->SetControlWord( nControl ); } @@ -1007,12 +1007,12 @@ void lcl_ModifyRTLDefaults( SfxItemSet& rSet ) { rSet.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); - // always using rtl writing direction would break formulas + // always using rtl writing direction would break formulas //rSet.Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) ); - // PaperSize width is limited to USHRT_MAX in RTL mode (because of EditEngine's - // USHORT values in EditLine), so the text may be wrapped and line spacing must be - // increased to not see the beginning of the next line. + // PaperSize width is limited to USHRT_MAX in RTL mode (because of EditEngine's + // USHORT values in EditLine), so the text may be wrapped and line spacing must be + // increased to not see the beginning of the next line. SvxLineSpacingItem aItem( SVX_LINESPACE_TWO_LINES, EE_PARA_SBL ); aItem.SetPropLineSpace( 200 ); rSet.Put( aItem ); @@ -1030,7 +1030,7 @@ void lcl_ModifyRTLVisArea( EditView* pEditView ) void ScTextWnd::StartEditEngine() { - // #31147# Bei "eigener Modalitaet" (Doc-modale Dialoge) nicht aktivieren + // #31147# Bei "eigener Modalitaet" (Doc-modale Dialoge) nicht aktivieren SfxObjectShell* pObjSh = SfxObjectShell::Current(); if ( pObjSh && pObjSh->IsInModalMode() ) return; @@ -1045,7 +1045,7 @@ void ScTextWnd::StartEditEngine() pNew = new ScFieldEditEngine( pDoc->GetEnginePool(), pDoc->GetEditPool() ); } else - pNew = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE ); + pNew = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE ); pNew->SetExecuteURL( FALSE ); pEditEngine = pNew; @@ -1067,28 +1067,28 @@ void ScTextWnd::StartEditEngine() pEditEngine->SetDefaults( pSet ); } - // #57254# Wenn in der Zelle URL-Felder enthalten sind, muessen die auch in - // die Eingabezeile uebernommen werden, weil sonst die Positionen nicht stimmen. + // #57254# Wenn in der Zelle URL-Felder enthalten sind, muessen die auch in + // die Eingabezeile uebernommen werden, weil sonst die Positionen nicht stimmen. BOOL bFilled = FALSE; ScInputHandler* pHdl = SC_MOD()->GetInputHdl(); - if ( pHdl ) //! Testen, ob's der richtige InputHdl ist? + if ( pHdl ) //! Testen, ob's der richtige InputHdl ist? bFilled = pHdl->GetTextAndFields( *pEditEngine ); pEditEngine->SetUpdateMode( TRUE ); - // aString ist die Wahrheit... + // aString ist die Wahrheit... if ( bFilled && pEditEngine->GetText() == aString ) - Invalidate(); // Repaint fuer (hinterlegte) Felder + Invalidate(); // Repaint fuer (hinterlegte) Felder else - pEditEngine->SetText(aString); // dann wenigstens den richtigen Text + pEditEngine->SetText(aString); // dann wenigstens den richtigen Text pEditView = new EditView( pEditEngine, this ); pEditView->SetInsertMode(bIsInsertMode); // Text aus Clipboard wird als ASCII einzeilig uebernommen ULONG n = pEditView->GetControlWord(); - pEditView->SetControlWord( n | EV_CNTRL_SINGLELINEPASTE ); + pEditView->SetControlWord( n | EV_CNTRL_SINGLELINEPASTE ); pEditEngine->InsertView( pEditView, EE_APPEND ); @@ -1102,12 +1102,12 @@ void ScTextWnd::StartEditEngine() if (!maAccTextDatas.empty()) maAccTextDatas.back()->StartEdit(); - // as long as EditEngine and DrawText sometimes differ for CTL text, - // repaint now to have the EditEngine's version visible + // as long as EditEngine and DrawText sometimes differ for CTL text, + // repaint now to have the EditEngine's version visible // SfxObjectShell* pObjSh = SfxObjectShell::Current(); if ( pObjSh && pObjSh->ISA(ScDocShell) ) { - ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument(); // any document + ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument(); // any document BYTE nScript = pDoc->GetStringScriptType( aString ); if ( nScript & SCRIPTTYPE_COMPLEX ) Invalidate(); @@ -1127,11 +1127,11 @@ IMPL_LINK(ScTextWnd, NotifyHdl, EENotify*, EMPTYARG) { ScInputHandler* pHdl = SC_MOD()->GetInputHdl(); - // #105354# Use the InputHandler's InOwnChange flag to prevent calling InputChanged - // while an InputHandler method is modifying the EditEngine content + // #105354# Use the InputHandler's InOwnChange flag to prevent calling InputChanged + // while an InputHandler method is modifying the EditEngine content if ( pHdl && !pHdl->IsInOwnChange() ) - pHdl->InputChanged( pEditView, TRUE ); // #i20282# InputChanged must know if called from modify handler + pHdl->InputChanged( pEditView, TRUE ); // #i20282# InputChanged must know if called from modify handler } return 0; @@ -1163,7 +1163,7 @@ void ScTextWnd::StopEditEngine( BOOL bAll ) pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT ); if (bSelection) - Invalidate(); // damit Selektion nicht stehenbleibt + Invalidate(); // damit Selektion nicht stehenbleibt } } @@ -1173,7 +1173,7 @@ void ScTextWnd::SetTextString( const String& rNewString ) { bInputMode = TRUE; - // Position der Aenderung suchen, nur Rest painten + // Position der Aenderung suchen, nur Rest painten long nInvPos = 0; long nStartPos = 0; @@ -1186,13 +1186,13 @@ void ScTextWnd::SetTextString( const String& rNewString ) bPaintAll = TRUE; else { - // test if CTL script type is involved + // test if CTL script type is involved BYTE nOldScript = 0; BYTE nNewScript = 0; SfxObjectShell* pObjSh = SfxObjectShell::Current(); if ( pObjSh && pObjSh->ISA(ScDocShell) ) { - // any document can be used (used only for its break iterator) + // any document can be used (used only for its break iterator) ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument(); nOldScript = pDoc->GetStringScriptType( aString ); nNewScript = pDoc->GetStringScriptType( rNewString ); @@ -1218,7 +1218,7 @@ void ScTextWnd::SetTextString( const String& rNewString ) if ( nSize1>0 && nSize2>0 ) nTextSize = Max( nSize1, nSize2 ); else - nTextSize = GetOutputSize().Width(); // Ueberlauf + nTextSize = GetOutputSize().Width(); // Ueberlauf if (nDifPos == STRING_MATCH) nDifPos = 0; @@ -1231,8 +1231,8 @@ void ScTextWnd::SetTextString( const String& rNewString ) nInvPos += GetTextWidth(aString,0,nDifPos); USHORT nFlags = 0; - if ( nDifPos == aString.Len() ) // only new characters appended - nFlags = INVALIDATE_NOERASE; // then background is already clear + if ( nDifPos == aString.Len() ) // only new characters appended + nFlags = INVALIDATE_NOERASE; // then background is already clear Invalidate( Rectangle( nInvPos, 0, nStartPos+nTextSize, GetOutputSize().Height()-1 ), @@ -1280,7 +1280,7 @@ void ScTextWnd::MakeDialogEditView() pNew = new ScFieldEditEngine( pDoc->GetEnginePool(), pDoc->GetEditPool() ); } else - pNew = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE ); + pNew = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE ); pNew->SetExecuteURL( FALSE ); pEditEngine = pNew; @@ -1296,7 +1296,7 @@ void ScTextWnd::MakeDialogEditView() pEditEngine->SetDefaults( pSet ); pEditEngine->SetUpdateMode( TRUE ); - pEditView = new EditView( pEditEngine, this ); + pEditView = new EditView( pEditEngine, this ); pEditEngine->InsertView( pEditView, EE_APPEND ); Resize(); @@ -1318,8 +1318,8 @@ void ScTextWnd::ImplInitSettings() Color aTxtColor= rStyleSettings.GetWindowTextColor(); aTextFont.SetFillColor ( aBgColor ); - aTextFont.SetColor (aTxtColor); - SetBackground ( aBgColor ); + aTextFont.SetColor (aTxtColor); + SetBackground ( aBgColor ); Invalidate(); } @@ -1362,24 +1362,24 @@ void ScTextWnd::DataChanged( const DataChangedEvent& rDCEvt ) //======================================================================== -// Positionsfenster +// Positionsfenster //======================================================================== ScPosWnd::ScPosWnd( Window* pParent ) : - ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ), - pAccel ( NULL ), + ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ), + pAccel ( NULL ), nTipVisible ( 0 ), bFormulaMode( FALSE ) { Size aSize( GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GW99999:GW99999")) ), GetTextHeight() ); - aSize.Width() += 25; // ?? - aSize.Height() = CalcWindowSizePixel(11); // Funktionen: 10 MRU + "andere..." + aSize.Width() += 25; // ?? + aSize.Height() = CalcWindowSizePixel(11); // Funktionen: 10 MRU + "andere..." SetSizePixel( aSize ); FillRangeNames(); - StartListening( *SFX_APP() ); // fuer Navigator-Bereichsnamen-Updates + StartListening( *SFX_APP() ); // fuer Navigator-Bereichsnamen-Updates } __EXPORT ScPosWnd::~ScPosWnd() @@ -1424,7 +1424,7 @@ void ScPosWnd::FillRangeNames() { ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument(); - // per Hand sortieren, weil Funktionen nicht sortiert werden: + // per Hand sortieren, weil Funktionen nicht sortiert werden: ScRangeName* pRangeNames = pDoc->GetRangeName(); USHORT nCount = pRangeNames->GetCount(); @@ -1488,16 +1488,16 @@ void ScPosWnd::FillFunctions() InsertEntry( *pDesc->pFuncName ); if (!aFirstName.Len()) aFirstName = *pDesc->pFuncName; - break; // nicht weitersuchen + break; // nicht weitersuchen } } } } - //! Eintrag "Andere..." fuer Funktions-Autopilot wieder aufnehmen, - //! wenn der Funktions-Autopilot mit dem bisher eingegebenen Text arbeiten kann! + //! Eintrag "Andere..." fuer Funktions-Autopilot wieder aufnehmen, + //! wenn der Funktions-Autopilot mit dem bisher eingegebenen Text arbeiten kann! -// InsertEntry( ScGlobal::GetRscString(STR_FUNCTIONLIST_MORE) ); +// InsertEntry( ScGlobal::GetRscString(STR_FUNCTIONLIST_MORE) ); SetText(aFirstName); } @@ -1506,7 +1506,7 @@ void ScPosWnd::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( !bFormulaMode ) { - // muss die Liste der Bereichsnamen updgedated werden? + // muss die Liste der Bereichsnamen updgedated werden? if ( rHint.ISA(SfxSimpleHint) ) { @@ -1640,7 +1640,7 @@ void ScPosWnd::Modify() void __EXPORT ScPosWnd::Select() { - ComboBox::Select(); // in VCL gibt GetText() erst danach den ausgewaehlten Eintrag + ComboBox::Select(); // in VCL gibt GetText() erst danach den ausgewaehlten Eintrag HideTip(); @@ -1658,10 +1658,10 @@ void ScPosWnd::DoEnter() ScModule* pScMod = SC_MOD(); if ( aText == ScGlobal::GetRscString(STR_FUNCTIONLIST_MORE) ) { - // Funktions-Autopilot - //! mit dem bisher eingegebenen Text weiterarbeiten !!! + // Funktions-Autopilot + //! mit dem bisher eingegebenen Text weiterarbeiten !!! - //! new method at ScModule to query if function autopilot is open + //! new method at ScModule to query if function autopilot is open SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ) pViewFrm->GetDispatcher()->Execute( SID_OPENDLG_FUNCTION, @@ -1783,7 +1783,7 @@ void ScPosWnd::ReleaseFocus_Impl() ScInputHandler* pHdl = SC_MOD()->GetInputHdl( PTR_CAST( ScTabViewShell, pCurSh ) ); if ( pHdl && pHdl->IsTopMode() ) { - // Focus wieder in die Eingabezeile? + // Focus wieder in die Eingabezeile? ScInputWindow* pInputWin = pHdl->GetInputWindow(); if (pInputWin) @@ -1793,7 +1793,7 @@ void ScPosWnd::ReleaseFocus_Impl() } } - // Focus auf die aktive View + // Focus auf die aktive View if ( pCurSh ) { diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 055f8da1a828..3e31b8d1814c 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.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 @@ -60,7 +60,7 @@ void ScLinkTransferObj::AddSupportedFormats() { if ( aLinkURL.Len() ) { - // TransferableHelper::SetINetBookmark formats + // TransferableHelper::SetINetBookmark formats AddFormat( SOT_FORMATSTR_ID_SOLK ); AddFormat( SOT_FORMAT_STRING ); diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index 0de23989202f..9068594c2d53 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.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 @@ -42,49 +42,49 @@ static SfxItemInfo __READONLY_DATA aMsgItemInfos[] = { - { 0, SFX_ITEM_POOLABLE }, // SCITEM_STRING - { 0, SFX_ITEM_POOLABLE }, // SCITEM_SEARCHDATA - nicht mehr benutzt !!! - { SID_SORT, SFX_ITEM_POOLABLE }, // SCITEM_SORTDATA - { SID_QUERY, SFX_ITEM_POOLABLE }, // SCITEM_QUERYDATA - { SID_SUBTOTALS, SFX_ITEM_POOLABLE }, // SCITEM_SUBTDATA - { SID_CONSOLIDATE, SFX_ITEM_POOLABLE }, // SCITEM_CONSOLIDATEDATA - { SID_PIVOT_TABLE, SFX_ITEM_POOLABLE }, // SCITEM_PIVOTDATA - { SID_SOLVE, SFX_ITEM_POOLABLE }, // SCITEM_SOLVEDATA - { SID_SCUSERLISTS, SFX_ITEM_POOLABLE }, // SCITEM_USERLIST - { SID_PRINTER_NOTFOUND_WARN, SFX_ITEM_POOLABLE } // SCITEM_PRINTWARN + { 0, SFX_ITEM_POOLABLE }, // SCITEM_STRING + { 0, SFX_ITEM_POOLABLE }, // SCITEM_SEARCHDATA - nicht mehr benutzt !!! + { SID_SORT, SFX_ITEM_POOLABLE }, // SCITEM_SORTDATA + { SID_QUERY, SFX_ITEM_POOLABLE }, // SCITEM_QUERYDATA + { SID_SUBTOTALS, SFX_ITEM_POOLABLE }, // SCITEM_SUBTDATA + { SID_CONSOLIDATE, SFX_ITEM_POOLABLE }, // SCITEM_CONSOLIDATEDATA + { SID_PIVOT_TABLE, SFX_ITEM_POOLABLE }, // SCITEM_PIVOTDATA + { SID_SOLVE, SFX_ITEM_POOLABLE }, // SCITEM_SOLVEDATA + { SID_SCUSERLISTS, SFX_ITEM_POOLABLE }, // SCITEM_USERLIST + { SID_PRINTER_NOTFOUND_WARN, SFX_ITEM_POOLABLE } // SCITEM_PRINTWARN }; //------------------------------------------------------------------------ ScMessagePool::ScMessagePool() - : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScMessagePool")), + : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScMessagePool")), MSGPOOL_START, MSGPOOL_END, aMsgItemInfos, NULL ), // - aGlobalStringItem ( SfxStringItem ( SCITEM_STRING, String() ) ), - aGlobalSearchItem ( SvxSearchItem ( SCITEM_SEARCHDATA ) ), - aGlobalSortItem ( ScSortItem ( SCITEM_SORTDATA, NULL ) ), - aGlobalQueryItem ( ScQueryItem ( SCITEM_QUERYDATA, NULL, NULL ) ), - aGlobalSubTotalItem ( ScSubTotalItem ( SCITEM_SUBTDATA, NULL, NULL ) ), - aGlobalConsolidateItem ( ScConsolidateItem ( SCITEM_CONSOLIDATEDATA, NULL ) ), - aGlobalPivotItem ( ScPivotItem ( SCITEM_PIVOTDATA, NULL, NULL, FALSE ) ), - aGlobalSolveItem ( ScSolveItem ( SCITEM_SOLVEDATA, NULL ) ), - aGlobalUserListItem ( ScUserListItem ( SCITEM_USERLIST ) ), + aGlobalStringItem ( SfxStringItem ( SCITEM_STRING, String() ) ), + aGlobalSearchItem ( SvxSearchItem ( SCITEM_SEARCHDATA ) ), + aGlobalSortItem ( ScSortItem ( SCITEM_SORTDATA, NULL ) ), + aGlobalQueryItem ( ScQueryItem ( SCITEM_QUERYDATA, NULL, NULL ) ), + aGlobalSubTotalItem ( ScSubTotalItem ( SCITEM_SUBTDATA, NULL, NULL ) ), + aGlobalConsolidateItem ( ScConsolidateItem ( SCITEM_CONSOLIDATEDATA, NULL ) ), + aGlobalPivotItem ( ScPivotItem ( SCITEM_PIVOTDATA, NULL, NULL, FALSE ) ), + aGlobalSolveItem ( ScSolveItem ( SCITEM_SOLVEDATA, NULL ) ), + aGlobalUserListItem ( ScUserListItem ( SCITEM_USERLIST ) ), // - aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, FALSE ) ) + aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, FALSE ) ) { ppPoolDefaults = new SfxPoolItem*[MSGPOOL_END - MSGPOOL_START + 1]; - ppPoolDefaults[SCITEM_STRING - MSGPOOL_START] = &aGlobalStringItem; - ppPoolDefaults[SCITEM_SEARCHDATA - MSGPOOL_START] = &aGlobalSearchItem; - ppPoolDefaults[SCITEM_SORTDATA - MSGPOOL_START] = &aGlobalSortItem; - ppPoolDefaults[SCITEM_QUERYDATA - MSGPOOL_START] = &aGlobalQueryItem; - ppPoolDefaults[SCITEM_SUBTDATA - MSGPOOL_START] = &aGlobalSubTotalItem; - ppPoolDefaults[SCITEM_CONSOLIDATEDATA - MSGPOOL_START] = &aGlobalConsolidateItem; - ppPoolDefaults[SCITEM_PIVOTDATA - MSGPOOL_START] = &aGlobalPivotItem; - ppPoolDefaults[SCITEM_SOLVEDATA - MSGPOOL_START] = &aGlobalSolveItem; - ppPoolDefaults[SCITEM_USERLIST - MSGPOOL_START] = &aGlobalUserListItem; - ppPoolDefaults[SCITEM_PRINTWARN - MSGPOOL_START] = &aPrintWarnItem; + ppPoolDefaults[SCITEM_STRING - MSGPOOL_START] = &aGlobalStringItem; + ppPoolDefaults[SCITEM_SEARCHDATA - MSGPOOL_START] = &aGlobalSearchItem; + ppPoolDefaults[SCITEM_SORTDATA - MSGPOOL_START] = &aGlobalSortItem; + ppPoolDefaults[SCITEM_QUERYDATA - MSGPOOL_START] = &aGlobalQueryItem; + ppPoolDefaults[SCITEM_SUBTDATA - MSGPOOL_START] = &aGlobalSubTotalItem; + ppPoolDefaults[SCITEM_CONSOLIDATEDATA - MSGPOOL_START] = &aGlobalConsolidateItem; + ppPoolDefaults[SCITEM_PIVOTDATA - MSGPOOL_START] = &aGlobalPivotItem; + ppPoolDefaults[SCITEM_SOLVEDATA - MSGPOOL_START] = &aGlobalSolveItem; + ppPoolDefaults[SCITEM_USERLIST - MSGPOOL_START] = &aGlobalUserListItem; + ppPoolDefaults[SCITEM_PRINTWARN - MSGPOOL_START] = &aPrintWarnItem; SetDefaults( ppPoolDefaults ); @@ -97,7 +97,7 @@ ScMessagePool::ScMessagePool() __EXPORT ScMessagePool::~ScMessagePool() { Delete(); - SetSecondaryPool( NULL ); // before deleting defaults (accesses defaults) + SetSecondaryPool( NULL ); // before deleting defaults (accesses defaults) for ( USHORT i=0; i <= MSGPOOL_END-MSGPOOL_START; i++ ) SetRefCount( *ppPoolDefaults[i], 0 ); @@ -110,7 +110,7 @@ __EXPORT ScMessagePool::~ScMessagePool() SfxMapUnit __EXPORT ScMessagePool::GetMetric( USHORT nWhich ) const { - // eigene Attribute: Twips, alles andere 1/100 mm + // eigene Attribute: Twips, alles andere 1/100 mm if ( nWhich >= ATTR_STARTINDEX && nWhich <= ATTR_ENDINDEX ) return SFX_MAPUNIT_TWIP; diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx index 8f2526197787..9831a8b95b04 100644 --- a/sc/source/ui/app/rfindlst.cxx +++ b/sc/source/ui/app/rfindlst.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 @@ -35,7 +35,7 @@ // STATIC DATA ----------------------------------------------------------- -#define SC_RANGECOLORS 8 +#define SC_RANGECOLORS 8 static ColorData aColNames[SC_RANGECOLORS] = { COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN, @@ -59,7 +59,7 @@ ScRangeFindList::~ScRangeFindList() } } -ColorData ScRangeFindList::GetColorName( USHORT nIndex ) // static +ColorData ScRangeFindList::GetColorName( USHORT nIndex ) // static { return aColNames[nIndex % SC_RANGECOLORS]; } diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 8cd7a4e74686..ca15f48364b9 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.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 @@ -55,13 +55,13 @@ #include <sot/formats.hxx> #define SOT_FORMATSTR_ID_STARCALC_30 SOT_FORMATSTR_ID_STARCALC -#include "scitems.hxx" // fuer tbxctrls etc. +#include "scitems.hxx" // fuer tbxctrls etc. #include "scmod.hxx" #include "scresid.hxx" #include "sc.hrc" #include "cfgids.hxx" -//! die Registrierung wird wegen CLOOKs in ein eigenes File wandern muessen... +//! die Registrierung wird wegen CLOOKs in ein eigenes File wandern muessen... // Interface-Registrierung #include "docsh.hxx" @@ -121,7 +121,7 @@ #include <svx/imapdlg.hxx> #include "editutil.hxx" -#include <svx/svdfield.hxx> // SdrRegisterFieldClasses +#include <svx/svdfield.hxx> // SdrRegisterFieldClasses #include <rtl/logfile.hxx> #include "dwfunctr.hxx" @@ -147,86 +147,86 @@ void ScDLL::Init() if ( *ppShlPtr ) return; - ScDocumentPool::InitVersionMaps(); // wird im ScModule ctor gebraucht + ScDocumentPool::InitVersionMaps(); // wird im ScModule ctor gebraucht ScModule* pMod = new ScModule( &ScDocShell::Factory() ); (*ppShlPtr) = pMod; -//REMOVE ScDocShell::RegisterFactory( SDT_SC_DOCFACTPRIO ); +//REMOVE ScDocShell::RegisterFactory( SDT_SC_DOCFACTPRIO ); ScDocShell::Factory().SetDocumentServiceName( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) ); - ScGlobal::Init(); // erst wenn der ResManager initialisiert ist - // erst nach ScGlobal::Init duerfen die App-Optionen - // initialisiert werden + ScGlobal::Init(); // erst wenn der ResManager initialisiert ist + // erst nach ScGlobal::Init duerfen die App-Optionen + // initialisiert werden // register your view-factories here - ScTabViewShell ::RegisterFactory(1); - ScPreviewShell ::RegisterFactory(2); + ScTabViewShell ::RegisterFactory(1); + ScPreviewShell ::RegisterFactory(2); // register your shell-interfaces here - ScModule ::RegisterInterface(pMod); - ScDocShell ::RegisterInterface(pMod); - ScTabViewShell ::RegisterInterface(pMod); - ScPreviewShell ::RegisterInterface(pMod); - ScDrawShell ::RegisterInterface(pMod); - ScDrawFormShell ::RegisterInterface(pMod); - ScDrawTextObjectBar ::RegisterInterface(pMod); - ScEditShell ::RegisterInterface(pMod); - ScPivotShell ::RegisterInterface(pMod); - ScAuditingShell ::RegisterInterface(pMod); - ScFormatShell ::RegisterInterface(pMod); - ScCellShell ::RegisterInterface(pMod); - ScOleObjectShell ::RegisterInterface(pMod); - ScChartShell ::RegisterInterface(pMod); - ScGraphicShell ::RegisterInterface(pMod); - ScMediaShell ::RegisterInterface(pMod); - ScPageBreakShell ::RegisterInterface(pMod); - - // eigene Controller - ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSERT, pMod); - ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSCELLS, pMod); - ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSOBJ, pMod); + ScModule ::RegisterInterface(pMod); + ScDocShell ::RegisterInterface(pMod); + ScTabViewShell ::RegisterInterface(pMod); + ScPreviewShell ::RegisterInterface(pMod); + ScDrawShell ::RegisterInterface(pMod); + ScDrawFormShell ::RegisterInterface(pMod); + ScDrawTextObjectBar ::RegisterInterface(pMod); + ScEditShell ::RegisterInterface(pMod); + ScPivotShell ::RegisterInterface(pMod); + ScAuditingShell ::RegisterInterface(pMod); + ScFormatShell ::RegisterInterface(pMod); + ScCellShell ::RegisterInterface(pMod); + ScOleObjectShell ::RegisterInterface(pMod); + ScChartShell ::RegisterInterface(pMod); + ScGraphicShell ::RegisterInterface(pMod); + ScMediaShell ::RegisterInterface(pMod); + ScPageBreakShell ::RegisterInterface(pMod); + + // eigene Controller + ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSERT, pMod); + ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSCELLS, pMod); + ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSOBJ, pMod); ScZoomSliderControl ::RegisterControl(SID_PREVIEW_SCALINGFACTOR, pMod); - // Svx-Toolbox-Controller + // Svx-Toolbox-Controller SvxTbxCtlDraw ::RegisterControl(SID_INSERT_DRAW, pMod); - SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_BASIC, pMod); - SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_SYMBOL, pMod); - SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_ARROW, pMod); - SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_FLOWCHART, pMod); - SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_CALLOUT, pMod); - SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_STAR, pMod); - SvxTbxCtlAlign ::RegisterControl(SID_OBJECT_ALIGN, pMod); - SvxFillToolBoxControl ::RegisterControl(0, pMod); - SvxLineStyleToolBoxControl ::RegisterControl(0, pMod); - SvxLineWidthToolBoxControl ::RegisterControl(0, pMod); - SvxLineColorToolBoxControl ::RegisterControl(0, pMod); - SvxLineEndToolBoxControl ::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod); - SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod); - SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod); -// SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod); - SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod); - SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod); - SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod); - SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE, pMod); - SvxFrameLineColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod); - SvxClipBoardControl ::RegisterControl(SID_PASTE, pMod ); - SvxUndoRedoControl ::RegisterControl(SID_UNDO, pMod ); - SvxUndoRedoControl ::RegisterControl(SID_REDO, pMod ); + SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_BASIC, pMod); + SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_SYMBOL, pMod); + SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_ARROW, pMod); + SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_FLOWCHART, pMod); + SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_CALLOUT, pMod); + SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_STAR, pMod); + SvxTbxCtlAlign ::RegisterControl(SID_OBJECT_ALIGN, pMod); + SvxFillToolBoxControl ::RegisterControl(0, pMod); + SvxLineStyleToolBoxControl ::RegisterControl(0, pMod); + SvxLineWidthToolBoxControl ::RegisterControl(0, pMod); + SvxLineColorToolBoxControl ::RegisterControl(0, pMod); + SvxLineEndToolBoxControl ::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod); + SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod); + SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod); +// SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod); + SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod); + SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod); + SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod); + SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE, pMod); + SvxFrameLineColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod); + SvxClipBoardControl ::RegisterControl(SID_PASTE, pMod ); + SvxUndoRedoControl ::RegisterControl(SID_UNDO, pMod ); + SvxUndoRedoControl ::RegisterControl(SID_REDO, pMod ); svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, pMod ); - SvxGrafModeToolBoxControl ::RegisterControl(SID_ATTR_GRAF_MODE, pMod); - SvxGrafRedToolBoxControl ::RegisterControl(SID_ATTR_GRAF_RED, pMod); - SvxGrafGreenToolBoxControl ::RegisterControl(SID_ATTR_GRAF_GREEN, pMod); - SvxGrafBlueToolBoxControl ::RegisterControl(SID_ATTR_GRAF_BLUE, pMod); - SvxGrafLuminanceToolBoxControl ::RegisterControl(SID_ATTR_GRAF_LUMINANCE, pMod); - SvxGrafContrastToolBoxControl ::RegisterControl(SID_ATTR_GRAF_CONTRAST, pMod); - SvxGrafGammaToolBoxControl ::RegisterControl(SID_ATTR_GRAF_GAMMA, pMod); + SvxGrafModeToolBoxControl ::RegisterControl(SID_ATTR_GRAF_MODE, pMod); + SvxGrafRedToolBoxControl ::RegisterControl(SID_ATTR_GRAF_RED, pMod); + SvxGrafGreenToolBoxControl ::RegisterControl(SID_ATTR_GRAF_GREEN, pMod); + SvxGrafBlueToolBoxControl ::RegisterControl(SID_ATTR_GRAF_BLUE, pMod); + SvxGrafLuminanceToolBoxControl ::RegisterControl(SID_ATTR_GRAF_LUMINANCE, pMod); + SvxGrafContrastToolBoxControl ::RegisterControl(SID_ATTR_GRAF_CONTRAST, pMod); + SvxGrafGammaToolBoxControl ::RegisterControl(SID_ATTR_GRAF_GAMMA, pMod); SvxGrafTransparenceToolBoxControl::RegisterControl(SID_ATTR_GRAF_TRANSPARENCE, pMod); - SvxGrafFilterToolBoxControl ::RegisterControl(SID_GRFFILTER, pMod); + SvxGrafFilterToolBoxControl ::RegisterControl(SID_GRFFILTER, pMod); SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_CAPTION_VERTICAL, pMod); SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_TEXT_VERTICAL, pMod); @@ -242,77 +242,77 @@ void ScDLL::Init() ::sfx2::TaskPaneWrapper::RegisterChildWindow( FALSE, pMod ); // Svx-StatusBar-Controller - SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod); - SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod); - SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod); + SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod); + SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod); + SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod); SvxZoomSliderControl ::RegisterControl(SID_ATTR_ZOOMSLIDER, pMod); - SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod); + SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod); XmlSecStatusBarControl ::RegisterControl( SID_SIGNATURE, pMod ); - SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod); + SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod); // Svx-Menue-Controller - SvxFontMenuControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod); - SvxFontSizeMenuControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod); + SvxFontMenuControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod); + SvxFontSizeMenuControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod); // CustomShape extrusion controller svx::ExtrusionColorControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, pMod ); - // Child-Windows + // Child-Windows // Hack: Eingabezeile mit 42 registrieren, damit sie im PlugIn immer sichtbar ist - ScInputWindowWrapper ::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK); + ScInputWindowWrapper ::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK); ScNavigatorDialogWrapper ::RegisterChildWindowContext( sal::static_int_cast<sal_uInt16>(ScTabViewShell::GetInterfaceId()), pMod); - ScSolverDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScSolverDlgWrapper ::RegisterChildWindow(FALSE, pMod); ScOptSolverDlgWrapper ::RegisterChildWindow(FALSE, pMod); - ScNameDlgWrapper ::RegisterChildWindow(FALSE, pMod); - ScPivotLayoutWrapper ::RegisterChildWindow(FALSE, pMod); - ScTabOpDlgWrapper ::RegisterChildWindow(FALSE, pMod); - ScFilterDlgWrapper ::RegisterChildWindow(FALSE, pMod); - ScSpecialFilterDlgWrapper ::RegisterChildWindow(FALSE, pMod); - ScDbNameDlgWrapper ::RegisterChildWindow(FALSE, pMod); - ScConsolidateDlgWrapper ::RegisterChildWindow(FALSE, pMod); - ScPrintAreasDlgWrapper ::RegisterChildWindow(FALSE, pMod); - ScCondFormatDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScNameDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScPivotLayoutWrapper ::RegisterChildWindow(FALSE, pMod); + ScTabOpDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScFilterDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScSpecialFilterDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScDbNameDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScConsolidateDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScPrintAreasDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScCondFormatDlgWrapper ::RegisterChildWindow(FALSE, pMod); ScColRowNameRangesDlgWrapper::RegisterChildWindow(FALSE, pMod); - ScFormulaDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScFormulaDlgWrapper ::RegisterChildWindow(FALSE, pMod); // First docking Window for Calc - ScFunctionChildWindow ::RegisterChildWindow(FALSE, pMod); + ScFunctionChildWindow ::RegisterChildWindow(FALSE, pMod); // Redlining- Window - ScAcceptChgDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScAcceptChgDlgWrapper ::RegisterChildWindow(FALSE, pMod); ScSimpleRefDlgWrapper ::RegisterChildWindow(FALSE, pMod, SFX_CHILDWIN_ALWAYSAVAILABLE|SFX_CHILDWIN_NEVERHIDE ); - ScHighlightChgDlgWrapper ::RegisterChildWindow(FALSE, pMod); + ScHighlightChgDlgWrapper ::RegisterChildWindow(FALSE, pMod); SvxSearchDialogWrapper ::RegisterChildWindow(FALSE, pMod); SvxHlinkDlgWrapper ::RegisterChildWindow(FALSE, pMod); - SvxFontWorkChildWindow ::RegisterChildWindow(FALSE, pMod); - SvxHyperlinkDlgWrapper ::RegisterChildWindow(FALSE, pMod, SFX_CHILDWIN_FORCEDOCK); - SvxIMapDlgChildWindow ::RegisterChildWindow(FALSE, pMod); - GalleryChildWindow ::RegisterChildWindow(FALSE, pMod); + SvxFontWorkChildWindow ::RegisterChildWindow(FALSE, pMod); + SvxHyperlinkDlgWrapper ::RegisterChildWindow(FALSE, pMod, SFX_CHILDWIN_FORCEDOCK); + SvxIMapDlgChildWindow ::RegisterChildWindow(FALSE, pMod); + GalleryChildWindow ::RegisterChildWindow(FALSE, pMod); ScSpellDialogChildWindow ::RegisterChildWindow(FALSE, pMod); - ::avmedia::MediaPlayer ::RegisterChildWindow(FALSE, pMod); + ::avmedia::MediaPlayer ::RegisterChildWindow(FALSE, pMod); //<!--Added by PengYunQuan for Validity Cell Range Picker ScValidityRefChildWin::RegisterChildWindow(FALSE, pMod); //-->Added by PengYunQuan for Validity Cell Range Picker - - // Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init + + // Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init SvClassManager& rClassManager = SvxFieldItem::GetClassManager(); -// rClassManager.SV_CLASS_REGISTER( SvxURLField ); -// rClassManager.SV_CLASS_REGISTER( SvxDateField ); -// rClassManager.SV_CLASS_REGISTER( SvxPageField ); +// rClassManager.SV_CLASS_REGISTER( SvxURLField ); +// rClassManager.SV_CLASS_REGISTER( SvxDateField ); +// rClassManager.SV_CLASS_REGISTER( SvxPageField ); rClassManager.SV_CLASS_REGISTER( SvxPagesField ); -// rClassManager.SV_CLASS_REGISTER( SvxTimeField ); +// rClassManager.SV_CLASS_REGISTER( SvxTimeField ); rClassManager.SV_CLASS_REGISTER( SvxFileField ); -// rClassManager.SV_CLASS_REGISTER( SvxExtFileField ); +// rClassManager.SV_CLASS_REGISTER( SvxExtFileField ); rClassManager.SV_CLASS_REGISTER( SvxTableField ); - SdrRegisterFieldClasses(); // SvDraw-Felder registrieren + SdrRegisterFieldClasses(); // SvDraw-Felder registrieren // 3D-Objekt-Factory eintragen E3dObjFactory(); @@ -322,7 +322,7 @@ void ScDLL::Init() pMod->PutItem( SfxUInt16Item( SID_ATTR_METRIC, sal::static_int_cast<UINT16>(pMod->GetAppOptions().GetAppMetric()) ) ); - // StarOne Services are now handled in the registry + // StarOne Services are now handled in the registry } void ScDLL::Exit() @@ -332,14 +332,14 @@ void ScDLL::Exit() delete (*ppShlPtr); (*ppShlPtr) = NULL; - // ScGlobal::Clear ist schon im Module-dtor + // ScGlobal::Clear ist schon im Module-dtor } //------------------------------------------------------------------ -// Statusbar +// Statusbar //------------------------------------------------------------------ -#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) +#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) #undef TEXT_WIDTH diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 66b9fade4d8f..0382970bbb9e 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.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 @@ -114,10 +114,10 @@ #include "scabstdlg.hxx" -#define SC_IDLE_MIN 150 -#define SC_IDLE_MAX 3000 -#define SC_IDLE_STEP 75 -#define SC_IDLE_COUNT 50 +#define SC_IDLE_MIN 150 +#define SC_IDLE_MAX 3000 +#define SC_IDLE_STEP 75 +#define SC_IDLE_COUNT 50 static USHORT nIdleCount = 0; @@ -127,7 +127,7 @@ SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) { SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, ScResId(RID_OBJECTBAR_APP) ); - SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) ); // nur ID wichtig + SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) ); // nur ID wichtig SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() ); } @@ -159,19 +159,19 @@ ScModule::ScModule( SfxObjectFactory* pFact ) : mbIsInSharedDocLoading( false ), mbIsInSharedDocSaving( false ) { - // im ctor ist der ResManager (DLL-Daten) noch nicht initialisiert! + // im ctor ist der ResManager (DLL-Daten) noch nicht initialisiert! - SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("StarCalc"))); // fuer Basic + SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("StarCalc"))); // fuer Basic ResetDragObject(); SetClipObject( NULL, NULL ); - // InputHandler braucht nicht mehr angelegt zu werden + // InputHandler braucht nicht mehr angelegt zu werden - // ErrorHandler anlegen - war in Init() - // zwischen OfficeApplication::Init und ScGlobal::Init + // ErrorHandler anlegen - war in Init() + // zwischen OfficeApplication::Init und ScGlobal::Init SvxErrorHandler::Get(); - pErrorHdl = new SfxErrorHandler( RID_ERRHDLSC, + pErrorHdl = new SfxErrorHandler( RID_ERRHDLSC, ERRCODE_AREA_SC, ERRCODE_AREA_APP2-1, GetResMgr() ); @@ -187,25 +187,25 @@ ScModule::ScModule( SfxObjectFactory* pFact ) : SetPool( pMessagePool ); ScGlobal::InitTextHeight( pMessagePool ); - StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING + StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING } ScModule::~ScModule() { DBG_ASSERT( !pSelTransfer, "Selection Transfer object not deleted" ); - // InputHandler braucht nicht mehr geloescht zu werden (gibt keinen an der App mehr) + // InputHandler braucht nicht mehr geloescht zu werden (gibt keinen an der App mehr) SfxItemPool::Free(pMessagePool); DELETEZ( pFormEditData ); delete pErrorHdl; -// delete pSvxErrorHdl; +// delete pSvxErrorHdl; - ScGlobal::Clear(); // ruft auch ScDocumentPool::DeleteVersionMaps(); + ScGlobal::Clear(); // ruft auch ScDocumentPool::DeleteVersionMaps(); - DeleteCfg(); // wurde mal aus Exit() gerufen + DeleteCfg(); // wurde mal aus Exit() gerufen } //------------------------------------------------------------------ @@ -213,8 +213,8 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 { if ( p == pColorConfig || p == pAccessOptions ) { - // Test if detective objects have to be updated with new colors - // (if the detective colors haven't been used yet, there's nothing to update) + // Test if detective objects have to be updated with new colors + // (if the detective colors haven't been used yet, there's nothing to update) if ( ScDetectiveFunc::IsColorsInitialized() ) { const svtools::ColorConfig& rColors = GetColorConfig(); @@ -225,10 +225,10 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor ); if ( bArrows || bComments ) { - ScDetectiveFunc::InitializeColors(); // get the new colors + ScDetectiveFunc::InitializeColors(); // get the new colors - // update detective objects in all open documents - SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); + // update detective objects in all open documents + SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); while ( pObjSh ) { if ( pObjSh->Type() == TYPE(ScDocShell) ) @@ -244,7 +244,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 } } - // force all views to repaint, using the new options + // force all views to repaint, using the new options SfxViewShell* pViewShell = SfxViewShell::GetFirst(); while(pViewShell) @@ -259,7 +259,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 ScInputHandler* pHdl = pViewSh->GetInputHandler(); if ( pHdl ) - pHdl->ForgetLastPattern(); // EditEngine BackgroundColor may change + pHdl->ForgetLastPattern(); // EditEngine BackgroundColor may change } else if ( pViewShell->ISA(ScPreviewShell) ) { @@ -272,8 +272,8 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 } else if ( p == pCTLOptions ) { - // for all documents: set digit language for printer, recalc output factor, update row heights - SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); + // for all documents: set digit language for printer, recalc output factor, update row heights + SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); while ( pObjSh ) { if ( pObjSh->Type() == TYPE(ScDocShell) ) @@ -292,7 +292,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 pObjSh = SfxObjectShell::GetNext( *pObjSh ); } - // for all views (table and preview): update digit language + // for all views (table and preview): update digit language SfxViewShell* pSh = SfxViewShell::GetFirst(); while ( pSh ) { @@ -300,7 +300,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 { ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; - // set ref-device for EditEngine (re-evaluates digit settings) + // set ref-device for EditEngine (re-evaluates digit settings) ScInputHandler* pHdl = GetInputHdl(pViewSh); if (pHdl) pHdl->UpdateRefDevice(); @@ -329,7 +329,7 @@ void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) ULONG nHintId = ((SfxSimpleHint&)rHint).GetId(); if ( nHintId == SFX_HINT_DEINITIALIZING ) { - // ConfigItems must be removed before ConfigManager + // ConfigItems must be removed before ConfigManager DeleteCfg(); } } @@ -370,7 +370,7 @@ void ScModule::DeleteCfg() //------------------------------------------------------------------ -#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) +#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) void ScModule::FillStatusBar(StatusBar& rStatusBar) { @@ -432,7 +432,7 @@ void ScModule::FillStatusBar(StatusBar& rStatusBar) //------------------------------------------------------------------ // -// von der Applikation verschoben: +// von der Applikation verschoben: // //------------------------------------------------------------------ @@ -441,8 +441,8 @@ void ScModule::Execute( SfxRequest& rReq ) SfxViewFrame* pViewFrm = SfxViewFrame::Current(); SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL; - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); switch ( nSlot ) { @@ -473,7 +473,7 @@ void ScModule::Execute( SfxRequest& rReq ) if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, TRUE, &pItem ) ) bSet = ((const SfxBoolItem*)pItem)->GetValue(); else - { // Toggle + { // Toggle ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); if ( pDocSh ) bSet = !pDocSh->GetDocument()->GetDocOptions().IsAutoSpell(); @@ -496,7 +496,7 @@ void ScModule::Execute( SfxRequest& rReq ) FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue(); switch( eUnit ) { - case FUNIT_MM: // nur die Einheiten, die auch im Dialog stehen + case FUNIT_MM: // nur die Einheiten, die auch im Dialog stehen case FUNIT_CM: case FUNIT_INCH: case FUNIT_PICA: @@ -561,7 +561,7 @@ void ScModule::Execute( SfxRequest& rReq ) if (pBindings) { pBindings->Invalidate( SID_TABLE_CELL ); - pBindings->Update( SID_TABLE_CELL ); // sofort + pBindings->Update( SID_TABLE_CELL ); // sofort pBindings->Invalidate( SID_PSZ_FUNCTION ); pBindings->Update( SID_PSZ_FUNCTION ); @@ -599,10 +599,10 @@ void ScModule::Execute( SfxRequest& rReq ) ScInputHandler* pInputHandler = GetInputHdl(); if ( pInputHandler ) - pInputHandler->UpdateSpellSettings(); // EditEngine-Flags + pInputHandler->UpdateSpellSettings(); // EditEngine-Flags ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); if ( pViewSh ) - pViewSh->UpdateDrawTextOutliner(); // EditEngine-Flags + pViewSh->UpdateDrawTextOutliner(); // EditEngine-Flags pDocSh->SetDocumentModified(); } @@ -681,8 +681,8 @@ void ScModule::GetState( SfxItemSet& rSet ) } break; case SID_ATTR_LANGUAGE: - case ATTR_CJK_FONT_LANGUAGE: // WID for SID_ATTR_CHAR_CJK_LANGUAGE - case ATTR_CTL_FONT_LANGUAGE: // WID for SID_ATTR_CHAR_CTL_LANGUAGE + case ATTR_CJK_FONT_LANGUAGE: // WID for SID_ATTR_CHAR_CJK_LANGUAGE + case ATTR_CTL_FONT_LANGUAGE: // WID for SID_ATTR_CHAR_CTL_LANGUAGE { ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); ScDocument* pDoc = pDocSh ? pDocSh->GetDocument() : NULL; @@ -745,9 +745,9 @@ void ScModule::SetDragLink( const String& rDoc, const String& rTab, const String { ResetDragObject(); - aDragData.aLinkDoc = rDoc; + aDragData.aLinkDoc = rDoc; aDragData.aLinkTable = rTab; - aDragData.aLinkArea = rArea; + aDragData.aLinkArea = rArea; } void ScModule::SetDragJump( ScDocument* pLocalDoc, const String& rTarget, const String& rText ) @@ -771,7 +771,7 @@ void ScModule::SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawO ScDocument* ScModule::GetClipDoc() { - // called from document + // called from document ScTransferObj* pObj = ScTransferObj::GetOwnClipboard( NULL ); if (pObj) @@ -833,7 +833,7 @@ const ScDocOptions& ScModule::GetDocOptions() return *pDocCfg; } -#ifndef LRU_MAX +#ifndef LRU_MAX #define LRU_MAX 10 #endif @@ -843,27 +843,27 @@ void ScModule::InsertEntryToLRUList(USHORT nFIndex) { const ScAppOptions& rAppOpt = GetAppOptions(); USHORT nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (USHORT)LRU_MAX ); - USHORT* pLRUListIds = rAppOpt.GetLRUFuncList(); + USHORT* pLRUListIds = rAppOpt.GetLRUFuncList(); - USHORT aIdxList[LRU_MAX]; - USHORT n = 0; - BOOL bFound = FALSE; + USHORT aIdxList[LRU_MAX]; + USHORT n = 0; + BOOL bFound = FALSE; - while ((n < LRU_MAX) && n<nLRUFuncCount) // alte Liste abklappern + while ((n < LRU_MAX) && n<nLRUFuncCount) // alte Liste abklappern { if (!bFound && (pLRUListIds[n]== nFIndex)) - bFound = TRUE; // erster! Treffer + bFound = TRUE; // erster! Treffer else if (bFound) - aIdxList[n ] = pLRUListIds[n]; // hinter Treffer kopieren + aIdxList[n ] = pLRUListIds[n]; // hinter Treffer kopieren else if ((n+1) < LRU_MAX) - aIdxList[n+1] = pLRUListIds[n]; // vor Treffer verschieben + aIdxList[n+1] = pLRUListIds[n]; // vor Treffer verschieben n++; } - if (!bFound && (n < LRU_MAX)) // Eintrag nicht gefunden? - n++; // einen mehr - aIdxList[0] = nFIndex; // Current on Top + if (!bFound && (n < LRU_MAX)) // Eintrag nicht gefunden? + n++; // einen mehr + aIdxList[0] = nFIndex; // Current on Top - ScAppOptions aNewOpts(rAppOpt); // an App melden + ScAppOptions aNewOpts(rAppOpt); // an App melden aNewOpts.SetLRUFuncList(aIdxList, n); SetAppOptions(aNewOpts); @@ -873,10 +873,10 @@ void ScModule::InsertEntryToLRUList(USHORT nFIndex) void ScModule::RecentFunctionsChanged() { - // update function list window + // update function list window USHORT nFuncListID = ScFunctionChildWindow::GetChildWindowId(); - //! notify all views + //! notify all views SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm && pViewFrm->HasChildWindow(nFuncListID) ) { @@ -1009,12 +1009,12 @@ USHORT ScModule::GetOptDigitLanguage() //------------------------------------------------------------------ // -// Optionen +// Optionen // //------------------------------------------------------------------ // -// ModifyOptions - Items aus Calc-Options-Dialog +// ModifyOptions - Items aus Calc-Options-Dialog // und SID_AUTOSPELL_CHECK // @@ -1039,23 +1039,23 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) SfxViewFrame* pViewFrm = SfxViewFrame::Current(); SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL; - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); - ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); - ScDocument* pDoc = pDocSh ? pDocSh->GetDocument() : NULL; - const SfxPoolItem* pItem = NULL; - BOOL bRepaint = FALSE; - BOOL bUpdateMarks = FALSE; - BOOL bUpdateRefDev = FALSE; - BOOL bCalcAll = FALSE; - BOOL bSaveSpellCheck = FALSE; - BOOL bSaveAppOptions = FALSE; - BOOL bSaveInputOptions = FALSE; + ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); + ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); + ScDocument* pDoc = pDocSh ? pDocSh->GetDocument() : NULL; + const SfxPoolItem* pItem = NULL; + BOOL bRepaint = FALSE; + BOOL bUpdateMarks = FALSE; + BOOL bUpdateRefDev = FALSE; + BOOL bCalcAll = FALSE; + BOOL bSaveSpellCheck = FALSE; + BOOL bSaveAppOptions = FALSE; + BOOL bSaveInputOptions = FALSE; //-------------------------------------------------------------------------- // SFX_APP()->SetOptions( rOptSet ); - // Linguistik nicht mehr + // Linguistik nicht mehr if ( IS_AVAILABLE(SID_ATTR_METRIC,pItem) ) { @@ -1086,15 +1086,15 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if ( pViewSh ) { - ScViewData* pViewData = pViewSh->GetViewData(); - const ScViewOptions& rOldOpt = pViewData->GetOptions(); + ScViewData* pViewData = pViewSh->GetViewData(); + const ScViewOptions& rOldOpt = pViewData->GetOptions(); BOOL bAnchorList = ( rOldOpt.GetOption( VOPT_ANCHOR ) != rNewOpt.GetOption( VOPT_ANCHOR ) ); if ( rOldOpt != rNewOpt ) { - pViewData->SetOptions( rNewOpt ); // veraendert rOldOpt + pViewData->SetOptions( rNewOpt ); // veraendert rOldOpt pViewData->GetDocument()->SetViewOptions( rNewOpt ); pDocSh->SetDocumentModified(); bRepaint = TRUE; @@ -1118,8 +1118,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if ( pViewSh ) { - ScViewData* pViewData = pViewSh->GetViewData(); - ScViewOptions aNewViewOpt( pViewData->GetOptions() ); + ScViewData* pViewData = pViewSh->GetViewData(); + ScViewOptions aNewViewOpt( pViewData->GetOptions() ); const ScGridOptions& rOldGridOpt = aNewViewOpt.GetGridOptions(); if ( rOldGridOpt != aNewGridOpt ) @@ -1148,7 +1148,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if ( IS_AVAILABLE(SID_SCDOCOPTIONS,pItem) ) { - const ScDocOptions& rNewOpt = ((const ScTpCalcItem*)pItem)->GetDocOptions(); + const ScDocOptions& rNewOpt = ((const ScTpCalcItem*)pItem)->GetDocOptions(); if ( pDoc ) { @@ -1168,7 +1168,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) || (rNewOpt.IsCalcAsShown() && rOldOpt.GetStdPrecision() != rNewOpt.GetStdPrecision()) || rOldOpt.IsMatchWholeCell() != rNewOpt.IsMatchWholeCell() - || rOldOpt.GetYear2000() != rNewOpt.GetYear2000() + || rOldOpt.GetYear2000() != rNewOpt.GetYear2000() || rOldOpt.IsFormulaRegexEnabled() != rNewOpt.IsFormulaRegexEnabled() ); pDoc->SetDocOptions( rNewOpt ); @@ -1196,9 +1196,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - // AutoSpell nach den Doc-Options (weil Member) + // AutoSpell nach den Doc-Options (weil Member) - if ( IS_AVAILABLE(SID_AUTOSPELL_CHECK,pItem) ) // an Doc-Options + if ( IS_AVAILABLE(SID_AUTOSPELL_CHECK,pItem) ) // an Doc-Options { BOOL bDoAutoSpell = ((const SfxBoolItem*)pItem)->GetValue(); @@ -1211,18 +1211,18 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pDoc->SetDocOptions( aNewOpt ); if (bDoAutoSpell) - pDoc->SetOnlineSpellPos( ScAddress(0,0,0) ); // vorne anfangen + pDoc->SetOnlineSpellPos( ScAddress(0,0,0) ); // vorne anfangen else { WaitObject aWait( pDocSh->GetActiveDialogParent() ); - pDoc->RemoveAutoSpellObj(); // Edit-Text-Objekte wieder zurueckwandeln + pDoc->RemoveAutoSpellObj(); // Edit-Text-Objekte wieder zurueckwandeln } //#92038#; don't set document modified, because this flag is no longer saved -// pDocSh->SetDocumentModified(); +// pDocSh->SetDocumentModified(); - bRepaint = TRUE; // weil HideAutoSpell evtl. ungueltig - //! alle Views painten ??? + bRepaint = TRUE; // weil HideAutoSpell evtl. ungueltig + //! alle Views painten ??? } } @@ -1232,12 +1232,12 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) bSaveSpellCheck = TRUE; } if ( pDocSh ) - pDocSh->PostPaintGridAll(); // wegen Markierungen + pDocSh->PostPaintGridAll(); // wegen Markierungen ScInputHandler* pInputHandler = GetInputHdl(); if ( pInputHandler ) - pInputHandler->UpdateSpellSettings(); // EditEngine-Flags + pInputHandler->UpdateSpellSettings(); // EditEngine-Flags if ( pViewSh ) - pViewSh->UpdateDrawTextOutliner(); // EditEngine-Flags + pViewSh->UpdateDrawTextOutliner(); // EditEngine-Flags if (pBindings) pBindings->Invalidate( SID_AUTOSPELL_CHECK ); @@ -1308,17 +1308,17 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) const ScPrintOptions& rNewOpt = ((const ScTpPrintItem*)pItem)->GetPrintOptions(); SetPrintOptions( rNewOpt ); - // broadcast causes all previews to recalc page numbers + // broadcast causes all previews to recalc page numbers SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) ); } //---------------------------------------------------------- -// if ( bSaveSpellCheck ) -// { - // currently LinguProperties are saved only at program exit. - // if a save method becomes available, it should be called here. -// } +// if ( bSaveSpellCheck ) +// { + // currently LinguProperties are saved only at program exit. + // if a save method becomes available, it should be called here. +// } if ( bSaveAppOptions ) pAppCfg->OptionsChanged(); @@ -1364,8 +1364,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if ( bUpdateRefDev ) { - // for all documents: recalc output factor, update row heights - SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); + // for all documents: recalc output factor, update row heights + SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); while ( pObjSh ) { if ( pObjSh->Type() == TYPE(ScDocShell) ) @@ -1379,23 +1379,23 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pObjSh = SfxObjectShell::GetNext( *pObjSh ); } - // for all (tab-) views: + // for all (tab-) views: TypeId aScType = TYPE(ScTabViewShell); SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType ); while ( pSh ) { ScTabViewShell* pOneViewSh = (ScTabViewShell*)pSh; - // set ref-device for EditEngine + // set ref-device for EditEngine ScInputHandler* pHdl = GetInputHdl(pOneViewSh); if (pHdl) pHdl->UpdateRefDevice(); - // update view scale + // update view scale ScViewData* pViewData = pOneViewSh->GetViewData(); pOneViewSh->SetZoom( pViewData->GetZoomX(), pViewData->GetZoomY(), FALSE ); - // repaint + // repaint pOneViewSh->PaintGrid(); pOneViewSh->PaintTop(); pOneViewSh->PaintLeft(); @@ -1409,7 +1409,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) //------------------------------------------------------------------ // -// Input-Handler +// Input-Handler // //------------------------------------------------------------------ @@ -1430,9 +1430,9 @@ ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, BOOL bUseRef ) } if ( pViewSh ) - pHdl = pViewSh->GetInputHandler(); // Viewshell hat jetzt immer einen + pHdl = pViewSh->GetInputHandler(); // Viewshell hat jetzt immer einen - // #57989# wenn keine ViewShell uebergeben oder aktiv, kann NULL herauskommen + // #57989# wenn keine ViewShell uebergeben oder aktiv, kann NULL herauskommen DBG_ASSERT( pHdl || !pViewSh, "GetInputHdl: kein InputHandler gefunden" ); return pHdl; } @@ -1472,7 +1472,7 @@ BOOL ScModule::InputKeyEvent( const KeyEvent& rKEvt, BOOL bStartEdit ) void ScModule::InputEnterHandler( BYTE nBlockMode ) { - if ( !SFX_APP()->IsDowning() ) // nicht beim Programmende + if ( !SFX_APP()->IsDowning() ) // nicht beim Programmende { ScInputHandler* pHdl = GetInputHdl(); if (pHdl) @@ -1519,7 +1519,7 @@ ScInputHandler* ScModule::GetRefInputHdl() } //------------------------------------------------------------------------ -// Olk's Krempel: +// Olk's Krempel: void ScModule::InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd ) { @@ -1568,7 +1568,7 @@ void ScModule::ActivateInputWindow( const String* pStrFormula, BOOL bMatrix ) BYTE nMode = bMatrix ? SC_ENTER_MATRIX : SC_ENTER_NORMAL; pHdl->EnterHandler( nMode ); - // ohne Invalidate bleibt die Selektion stehen, wenn die Formel unveraendert ist + // ohne Invalidate bleibt die Selektion stehen, wenn die Formel unveraendert ist if (pWin) pWin->TextInvalidate(); } @@ -1587,14 +1587,14 @@ void ScModule::ActivateInputWindow( const String* pStrFormula, BOOL bMatrix ) //------------------------------------------------------------------ // -// Referenz - Dialoge +// Referenz - Dialoge // //------------------------------------------------------------------ void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm ) { - //! move reference dialog handling to view - //! (only keep function autopilot here for references to other documents) + //! move reference dialog handling to view + //! (only keep function autopilot here for references to other documents) if(nCurRefDlgId==0 || (nId==nCurRefDlgId && !bVis)) { @@ -1604,13 +1604,13 @@ void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm ) // #79379# bindings update causes problems with update of stylist if // current style family has changed //if ( pViewFrm ) - // pViewFrm->GetBindings().Update(); // to avoid trouble in LockDispatcher + // pViewFrm->GetBindings().Update(); // to avoid trouble in LockDispatcher - nCurRefDlgId = bVis ? nId : 0 ; // before SetChildWindow + nCurRefDlgId = bVis ? nId : 0 ; // before SetChildWindow if ( pViewFrm ) { - // store the dialog id also in the view shell + // store the dialog id also in the view shell SfxViewShell* pViewSh = pViewFrm->GetViewShell(); if ( pViewSh && pViewSh->ISA( ScTabViewShell ) ) ((ScTabViewShell*)pViewSh)->SetCurRefDlgId( nCurRefDlgId ); @@ -1631,34 +1631,34 @@ void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm ) SfxChildWindow* lcl_GetChildWinFromAnyView( USHORT nId ) { - // first try the current view + // first try the current view SfxViewFrame* pViewFrm = SfxViewFrame::Current(); // #i46999# current view frame can be null (for example, when closing help) SfxChildWindow* pChildWnd = pViewFrm ? pViewFrm->GetChildWindow( nId ) : NULL; if ( pChildWnd ) - return pChildWnd; // found in the current view + return pChildWnd; // found in the current view - // if not found there, get the child window from any open view - // it can be open only in one view because nCurRefDlgId is global + // if not found there, get the child window from any open view + // it can be open only in one view because nCurRefDlgId is global pViewFrm = SfxViewFrame::GetFirst(); while ( pViewFrm ) { pChildWnd = pViewFrm->GetChildWindow( nId ); if ( pChildWnd ) - return pChildWnd; // found in any view + return pChildWnd; // found in any view pViewFrm = SfxViewFrame::GetNext( *pViewFrm ); } - return NULL; // none found + return NULL; // none found } BOOL ScModule::IsModalMode(SfxObjectShell* pDocSh) { - //! move reference dialog handling to view - //! (only keep function autopilot here for references to other documents) + //! move reference dialog handling to view + //! (only keep function autopilot here for references to other documents) BOOL bIsModal = FALSE; @@ -1674,13 +1674,13 @@ BOOL ScModule::IsModalMode(SfxObjectShell* pDocSh) else { // in 592 and above, the dialog isn't visible in other views - // if the dialog is open but can't be accessed, disable input + // if the dialog is open but can't be accessed, disable input bIsModal = TRUE; } - // pChildWnd kann 0 sein, wenn der Dialog nach dem Umschalten - // von einer anderen Shell noch nicht erzeugt wurde (z.B. in GetFocus) + // pChildWnd kann 0 sein, wenn der Dialog nach dem Umschalten + // von einer anderen Shell noch nicht erzeugt wurde (z.B. in GetFocus) } else if (pDocSh) { @@ -1694,12 +1694,12 @@ BOOL ScModule::IsModalMode(SfxObjectShell* pDocSh) BOOL ScModule::IsTableLocked() { - //! move reference dialog handling to view - //! (only keep function autopilot here for references to other documents) + //! move reference dialog handling to view + //! (only keep function autopilot here for references to other documents) BOOL bLocked = FALSE; - // bisher nur bei ScAnyRefDlg + // bisher nur bei ScAnyRefDlg if ( nCurRefDlgId ) { @@ -1707,7 +1707,7 @@ BOOL ScModule::IsTableLocked() if ( pChildWnd ) bLocked = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow())->IsTableLocked(); else - bLocked = TRUE; // for other views, see IsModalMode + bLocked = TRUE; // for other views, see IsModalMode } return bLocked; @@ -1715,8 +1715,8 @@ BOOL ScModule::IsTableLocked() BOOL ScModule::IsRefDialogOpen() { - //! move reference dialog handling to view - //! (only keep function autopilot here for references to other documents) + //! move reference dialog handling to view + //! (only keep function autopilot here for references to other documents) BOOL bIsOpen = FALSE; @@ -1726,7 +1726,7 @@ BOOL ScModule::IsRefDialogOpen() if ( pChildWnd ) bIsOpen = pChildWnd->IsVisible(); else - bIsOpen = TRUE; // for other views, see IsModalMode + bIsOpen = TRUE; // for other views, see IsModalMode } return bIsOpen; @@ -1734,8 +1734,8 @@ BOOL ScModule::IsRefDialogOpen() BOOL ScModule::IsFormulaMode() { - //! move reference dialog handling to view - //! (only keep function autopilot here for references to other documents) + //! move reference dialog handling to view + //! (only keep function autopilot here for references to other documents) BOOL bIsFormula = FALSE; @@ -1780,14 +1780,14 @@ void lcl_MarkedTabs( const ScMarkData& rMark, SCTAB& rStartTab, SCTAB& rEndTab ) void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc, const ScMarkData* pMarkData ) { - //! move reference dialog handling to view - //! (only keep function autopilot here for references to other documents) + //! move reference dialog handling to view + //! (only keep function autopilot here for references to other documents) - // in Ref-Dialogen wird hiermit auch das Zoom-In ausgeloest, - // wenn Start und Ende der Ref unterschiedlich sind + // in Ref-Dialogen wird hiermit auch das Zoom-In ausgeloest, + // wenn Start und Ende der Ref unterschiedlich sind ScRange aNew = rRef; - aNew.Justify(); // immer "richtig herum" + aNew.Justify(); // immer "richtig herum" if( nCurRefDlgId ) { @@ -1806,8 +1806,8 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc, IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow()); - // hide the (color) selection now instead of later from LoseFocus, - // don't abort the ref input that causes this call (bDoneRefMode = FALSE) + // hide the (color) selection now instead of later from LoseFocus, + // don't abort the ref input that causes this call (bDoneRefMode = FALSE) pRefDlg->HideReference( FALSE ); pRefDlg->SetReference( aNew, pDoc ); } @@ -1824,10 +1824,10 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc, } } -void ScModule::AddRefEntry() // "Mehrfachselektion" +void ScModule::AddRefEntry() // "Mehrfachselektion" { - //! move reference dialog handling to view - //! (only keep function autopilot here for references to other documents) + //! move reference dialog handling to view + //! (only keep function autopilot here for references to other documents) if ( nCurRefDlgId ) { @@ -1849,12 +1849,12 @@ void ScModule::AddRefEntry() // "Mehrfachselektion" void ScModule::EndReference() { - //! move reference dialog handling to view - //! (only keep function autopilot here for references to other documents) + //! move reference dialog handling to view + //! (only keep function autopilot here for references to other documents) - // in Ref-Dialogen wird hiermit auch das Zoom-In wieder aufgehoben + // in Ref-Dialogen wird hiermit auch das Zoom-In wieder aufgehoben - //! ShowRefFrame am InputHdl, wenn der Funktions-AP offen ist ??? + //! ShowRefFrame am InputHdl, wenn der Funktions-AP offen ist ??? if ( nCurRefDlgId ) { @@ -1870,7 +1870,7 @@ void ScModule::EndReference() //------------------------------------------------------------------ // -// Idle / Online-Spelling +// Idle / Online-Spelling // //------------------------------------------------------------------ @@ -1900,7 +1900,7 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG ) { if ( Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) ) { - aIdleTimer.Start(); // Timeout unveraendert + aIdleTimer.Start(); // Timeout unveraendert return 0; } @@ -1914,12 +1914,12 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG ) BOOL bWidth = pDoc->IdleCalcTextWidth(); BOOL bSpell = pDoc->ContinueOnlineSpelling(); if ( bSpell ) - aSpellTimer.Start(); // da ist noch was + aSpellTimer.Start(); // da ist noch was - bMore = bLinks || bWidth || bSpell; // ueberhaupt noch was? + bMore = bLinks || bWidth || bSpell; // ueberhaupt noch was? - // While calculating a Basic formula, a paint event may have occured, - // so check the bNeedsRepaint flags for this document's views + // While calculating a Basic formula, a paint event may have occured, + // so check the bNeedsRepaint flags for this document's views if (bWidth) lcl_CheckNeedsRepaint( pDocSh ); } @@ -1933,7 +1933,7 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG ) } else { - // SC_IDLE_COUNT mal mit initialem Timeout, dann hochzaehlen + // SC_IDLE_COUNT mal mit initialem Timeout, dann hochzaehlen if ( nIdleCount < SC_IDLE_COUNT ) ++nIdleCount; @@ -1956,7 +1956,7 @@ IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG ) if ( Application::AnyInput( INPUT_KEYBOARD ) ) { aSpellTimer.Start(); - return 0; // dann spaeter wieder... + return 0; // dann spaeter wieder... } ScDocShell* pDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); @@ -1970,46 +1970,46 @@ IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG ) } //virtuelle Methoden fuer den Optionendialog -SfxItemSet* ScModule::CreateItemSet( USHORT nId ) +SfxItemSet* ScModule::CreateItemSet( USHORT nId ) { - SfxItemSet* pRet = 0; + SfxItemSet* pRet = 0; if(SID_SC_EDITOPTIONS == nId) { pRet = new SfxItemSet( GetPool(), // TP_CALC: - SID_SCDOCOPTIONS, SID_SCDOCOPTIONS, + SID_SCDOCOPTIONS, SID_SCDOCOPTIONS, // TP_VIEW: - SID_SCVIEWOPTIONS, SID_SCVIEWOPTIONS, + SID_SCVIEWOPTIONS, SID_SCVIEWOPTIONS, SID_SC_OPT_SYNCZOOM, SID_SC_OPT_SYNCZOOM, // TP_INPUT: SID_SC_INPUT_SELECTION,SID_SC_INPUT_MARK_HEADER, SID_SC_INPUT_TEXTWYSIWYG,SID_SC_INPUT_TEXTWYSIWYG, SID_SC_INPUT_REPLCELLSWARN,SID_SC_INPUT_REPLCELLSWARN, // TP_USERLISTS: - SCITEM_USERLIST, SCITEM_USERLIST, + SCITEM_USERLIST, SCITEM_USERLIST, // TP_PRINT: - SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS, + SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS, // TP_GRID: SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS, // - SID_ATTR_METRIC, SID_ATTR_METRIC, - SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, + SID_ATTR_METRIC, SID_ATTR_METRIC, + SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, 0 ); - ScDocShell* pDocSh = PTR_CAST(ScDocShell, + ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); - ScDocOptions aCalcOpt = pDocSh + ScDocOptions aCalcOpt = pDocSh ? pDocSh->GetDocument()->GetDocOptions() : GetDocOptions(); ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); - ScViewOptions aViewOpt = pViewSh + ScViewOptions aViewOpt = pViewSh ? pViewSh->GetViewData()->GetOptions() : GetViewOptions(); - ScUserListItem aULItem( SCITEM_USERLIST ); - ScUserList* pUL = ScGlobal::GetUserList(); + ScUserListItem aULItem( SCITEM_USERLIST ); + ScUserList* pUL = ScGlobal::GetUserList(); // SFX_APP()->GetOptions( aSet ); @@ -2071,7 +2071,7 @@ void ScModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) } } -SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = NULL; ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -2092,7 +2092,7 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem pRet = (*ScTpContentOptionsCreate)(pParent, rSet); } break; - case SID_SC_TP_GRID: pRet = SvxGridTabPage::Create(pParent, rSet); break; + case SID_SC_TP_GRID: pRet = SvxGridTabPage::Create(pParent, rSet); break; case SID_SC_TP_USERLISTS: { ::CreateTabPage ScTpUserListsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_USERLISTS ); @@ -2123,14 +2123,14 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem break; case SID_SC_TP_CHANGES: { - ::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE ); + ::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE ); if ( ScRedlineOptionsTabPageCreate ) pRet =(*ScRedlineOptionsTabPageCreate)(pParent, rSet); } break; case RID_SC_TP_PRINT: { - ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); + ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); if ( ScTpPrintOptionsCreate ) pRet = (*ScTpPrintOptionsCreate)( pParent, rSet); } @@ -2156,7 +2156,7 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo ) { - //! mit ScFieldEditEngine zusammenfassen !!! + //! mit ScFieldEditEngine zusammenfassen !!! if (pInfo) { diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 246d204038ae..390d9c29ad55 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.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 @@ -46,7 +46,7 @@ using namespace com::sun::star; //------------------------------------------------------------------ -#define LINGUPROP_AUTOSPELL "IsSpellAuto" +#define LINGUPROP_AUTOSPELL "IsSpellAuto" //------------------------------------------------------------------ @@ -54,8 +54,8 @@ using namespace com::sun::star; void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang, BOOL& rAutoSpell ) { - // use SvtLinguConfig instead of service LinguProperties to avoid - // loading the linguistic component + // use SvtLinguConfig instead of service LinguProperties to avoid + // loading the linguistic component SvtLinguConfig aConfig; SvtLinguOptions aOptions; @@ -70,8 +70,8 @@ void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCt // static void ScModule::SetAutoSpellProperty( BOOL bSet ) { - // use SvtLinguConfig instead of service LinguProperties to avoid - // loading the linguistic component + // use SvtLinguConfig instead of service LinguProperties to avoid + // loading the linguistic component SvtLinguConfig aConfig; uno::Any aAny; diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 1866008f6782..74356ed46188 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.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,7 +47,7 @@ #include "transobj.hxx" #include "drwtrans.hxx" #include "scmod.hxx" -#include "dbfunc.hxx" // for CopyToClip +#include "dbfunc.hxx" // for CopyToClip #include "docsh.hxx" #include "drawview.hxx" #include "drwlayer.hxx" @@ -97,7 +97,7 @@ ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView SdrView* pSdrView = pView->GetSdrView(); if ( pSdrView ) { - // handle selection on drawing layer + // handle selection on drawing layer const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); ULONG nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount ) @@ -121,23 +121,23 @@ ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView } if ( eMode == SC_SELTRANS_INVALID ) - eMode = SC_SELTRANS_DRAW_OTHER; // something selected but no special selection + eMode = SC_SELTRANS_DRAW_OTHER; // something selected but no special selection } } - if ( eMode == SC_SELTRANS_INVALID ) // no drawing object selected + if ( eMode == SC_SELTRANS_INVALID ) // no drawing object selected { ScRange aRange; ScViewData* pViewData = pView->GetViewData(); const ScMarkData& rMark = pViewData->GetMarkData(); - // allow MultiMarked because GetSimpleArea may be able to merge into a simple range - // (GetSimpleArea modifies a local copy of MarkData) + // allow MultiMarked because GetSimpleArea may be able to merge into a simple range + // (GetSimpleArea modifies a local copy of MarkData) // Also allow simple filtered area. ScMarkType eMarkType; if ( ( rMark.IsMarked() || rMark.IsMultiMarked() ) && (((eMarkType = pViewData->GetSimpleArea( aRange )) == SC_MARK_SIMPLE) || (eMarkType == SC_MARK_SIMPLE_FILTERED)) ) { - // only for "real" selection, cursor alone isn't used + // only for "real" selection, cursor alone isn't used if ( aRange.aStart == aRange.aEnd ) eMode = SC_SELTRANS_CELL; else @@ -159,7 +159,7 @@ ScSelectionTransferObj::ScSelectionTransferObj( ScTabView* pSource, ScSelectionT pCellData( NULL ), pDrawData( NULL ) { - //! store range for StillValid + //! store range for StillValid } ScSelectionTransferObj::~ScSelectionTransferObj() @@ -167,8 +167,8 @@ ScSelectionTransferObj::~ScSelectionTransferObj() ScModule* pScMod = SC_MOD(); if ( pScMod->GetSelectionTransfer() == this ) { - // this is reached when the object wasn't really copied to the selection - // (CopyToSelection has no effect under Windows) + // this is reached when the object wasn't really copied to the selection + // (CopyToSelection has no effect under Windows) ForgetView(); pScMod->SetSelectionTransfer( NULL ); @@ -179,8 +179,8 @@ ScSelectionTransferObj::~ScSelectionTransferObj() BOOL ScSelectionTransferObj::StillValid() { - //! check if view still has same cell selection - //! (but return FALSE if data has changed inbetween) + //! check if view still has same cell selection + //! (but return FALSE if data has changed inbetween) return FALSE; } @@ -203,14 +203,14 @@ void ScSelectionTransferObj::ForgetView() void ScSelectionTransferObj::AddSupportedFormats() { - // AddSupportedFormats must work without actually creating the - // "real" transfer object + // AddSupportedFormats must work without actually creating the + // "real" transfer object switch (eMode) { case SC_SELTRANS_CELL: case SC_SELTRANS_CELLS: - // same formats as in ScTransferObj::AddSupportedFormats + // same formats as in ScTransferObj::AddSupportedFormats AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); AddFormat( SOT_FORMAT_GDIMETAFILE ); @@ -257,7 +257,7 @@ void ScSelectionTransferObj::AddSupportedFormats() break; case SC_SELTRANS_DRAW_OTHER: - // other drawing objects + // other drawing objects AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); AddFormat( SOT_FORMATSTR_ID_DRAWING ); @@ -278,10 +278,10 @@ void ScSelectionTransferObj::CreateCellData() if ( pView ) { ScViewData* pViewData = pView->GetViewData(); - ScMarkData aNewMark( pViewData->GetMarkData() ); // use local copy for MarkToSimple + ScMarkData aNewMark( pViewData->GetMarkData() ); // use local copy for MarkToSimple aNewMark.MarkToSimple(); - // similar to ScViewFunctionSet::BeginDrag + // similar to ScViewFunctionSet::BeginDrag if ( aNewMark.IsMarked() && !aNewMark.IsMultiMarked() ) { ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -291,7 +291,7 @@ void ScSelectionTransferObj::CreateCellData() ScDocShellRef aDragShellRef; if ( pDocSh->GetDocument()->HasOLEObjectsInArea( aSelRange, &aNewMark ) ) { - aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately + aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately aDragShellRef->DoInitNew(NULL); } ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); @@ -318,12 +318,12 @@ void ScSelectionTransferObj::CreateCellData() //? pTransferObj->SetVisibleTab( nTab ); SfxObjectShellRef aPersistRef( aDragShellRef ); - pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive + pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive pTransferObj->SetDragSource( pDocSh, aNewMark ); pCellData = pTransferObj; - pCellData->acquire(); // keep ref count up - released in ForgetView + pCellData->acquire(); // keep ref count up - released in ForgetView } else delete pClipDoc; @@ -332,7 +332,7 @@ void ScSelectionTransferObj::CreateCellData() DBG_ASSERT( pCellData, "can't create CellData" ); } -//! make static member of ScDrawView +//! make static member of ScDrawView extern void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle ); void ScSelectionTransferObj::CreateDrawData() @@ -340,7 +340,7 @@ void ScSelectionTransferObj::CreateDrawData() DBG_ASSERT( !pDrawData, "CreateDrawData twice" ); if ( pView ) { - // similar to ScDrawView::BeginDrag + // similar to ScDrawView::BeginDrag ScDrawView* pDrawView = pView->GetScDrawView(); if ( pDrawView ) @@ -353,7 +353,7 @@ void ScSelectionTransferObj::CreateDrawData() ScDocShellRef aDragShellRef; if (bAnyOle) { - aDragShellRef = new ScDocShell; // ohne Ref lebt die DocShell nicht !!! + aDragShellRef = new ScDocShell; // ohne Ref lebt die DocShell nicht !!! aDragShellRef->DoInitNew(NULL); } //--------------------------------------------------------- @@ -374,11 +374,11 @@ void ScSelectionTransferObj::CreateDrawData() uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); SfxObjectShellRef aPersistRef( aDragShellRef ); - pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive - pTransferObj->SetDragSource( pDrawView ); // copies selection + pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive + pTransferObj->SetDragSource( pDrawView ); // copies selection pDrawData = pTransferObj; - pDrawData->acquire(); // keep ref count up - released in ForgetView + pDrawData->acquire(); // keep ref count up - released in ForgetView } } DBG_ASSERT( pDrawData, "can't create DrawData" ); @@ -436,7 +436,7 @@ sal_Bool ScSelectionTransferObj::GetData( const ::com::sun::star::datatransfer:: void ScSelectionTransferObj::ObjectReleased() { - // called when another selection is set from outside + // called when another selection is set from outside ForgetView(); diff --git a/sc/source/ui/app/template.cxx b/sc/source/ui/app/template.cxx index edb30ff6468d..afec56dd0a9c 100644 --- a/sc/source/ui/app/template.cxx +++ b/sc/source/ui/app/template.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/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 906a0f3e150a..d2978210361b 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.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 @@ -78,10 +78,10 @@ using namespace com::sun::star; // ----------------------------------------------------------------------- -#define SCTRANS_TYPE_IMPEX 1 -#define SCTRANS_TYPE_EDIT_RTF 2 -#define SCTRANS_TYPE_EDIT_BIN 3 -#define SCTRANS_TYPE_EMBOBJ 4 +#define SCTRANS_TYPE_IMPEX 1 +#define SCTRANS_TYPE_EDIT_RTF 2 +#define SCTRANS_TYPE_EDIT_BIN 3 +#define SCTRANS_TYPE_EMBOBJ 4 // ----------------------------------------------------------------------- @@ -115,7 +115,7 @@ void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPr return; Point aPoint; - Rectangle aBound( aPoint, pDev->GetOutputSize() ); //! use size from clip area? + Rectangle aBound( aPoint, pDev->GetOutputSize() ); //! use size from clip area? ScViewData aViewData(NULL,NULL); aViewData.InitData( pDoc ); @@ -149,14 +149,14 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc SCCOL nCol2; SCROW nRow2; pDoc->GetClipStart( nCol1, nRow1 ); - pDoc->GetClipArea( nCol2, nRow2, TRUE ); // real source area - include filtered rows + pDoc->GetClipArea( nCol2, nRow2, TRUE ); // real source area - include filtered rows nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nCol1 ); nRow2 = sal::static_int_cast<SCROW>( nRow2 + nRow1 ); SCCOL nDummy; pDoc->GetClipArea( nDummy, nNonFiltered, FALSE ); bHasFiltered = (nNonFiltered < (nRow2 - nRow1)); - ++nNonFiltered; // to get count instead of diff + ++nNonFiltered; // to get count instead of diff SCTAB nTab1=0; SCTAB nTab2=0; @@ -171,8 +171,8 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc } DBG_ASSERT(!bFirst, "no sheet selected"); - // only limit to used cells if whole sheet was marked - // (so empty cell areas can be copied) + // only limit to used cells if whole sheet was marked + // (so empty cell areas can be copied) if ( nCol2>=MAXCOL && nRow2>=MAXROW ) { SCROW nMaxRow; @@ -185,7 +185,7 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc } aBlock = ScRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 ); - nVisibleTab = nTab1; // valid table as default + nVisibleTab = nTab1; // valid table as default Rectangle aMMRect = pDoc->GetMMRect( nCol1,nRow1, nCol2,nRow2, nTab1 ); aObjDesc.maSize = aMMRect.GetSize(); @@ -208,9 +208,9 @@ ScTransferObj::~ScTransferObj() pScMod->ResetDragObject(); } - delete pDoc; // ScTransferObj is owner of clipboard document + delete pDoc; // ScTransferObj is owner of clipboard document - aDocShellRef.Clear(); // before releasing the mutex + aDocShellRef.Clear(); // before releasing the mutex aDrawPersistRef.Clear(); // after the model @@ -222,16 +222,16 @@ ScTransferObj* ScTransferObj::GetOwnClipboard( Window* pUIWin ) ScTransferObj* pObj = SC_MOD()->GetClipData().pCellClipboard; if ( pObj && pUIWin ) { - // check formats to see if pObj is really in the system clipboard + // check formats to see if pObj is really in the system clipboard - // pUIWin is NULL when called from core (IsClipboardSource), - // in that case don't access the system clipboard, because the call - // may be from other clipboard operations (like flushing, #86059#) + // pUIWin is NULL when called from core (IsClipboardSource), + // in that case don't access the system clipboard, because the call + // may be from other clipboard operations (like flushing, #86059#) TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pUIWin ) ); if ( !aDataHelper.HasFormat( SOT_FORMATSTR_ID_DIF ) ) { -// DBG_ERROR("ScTransferObj wasn't released"); +// DBG_ERROR("ScTransferObj wasn't released"); pObj = NULL; } } @@ -259,8 +259,8 @@ void ScTransferObj::AddSupportedFormats() sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) { - sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); - sal_Bool bOK = sal_False; + sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); + sal_Bool bOK = sal_False; if( HasFormat( nFormat ) ) { @@ -271,7 +271,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) else if ( ( nFormat == SOT_FORMAT_RTF || nFormat == SOT_FORMATSTR_ID_EDITENGINE ) && aBlock.aStart == aBlock.aEnd ) { - // RTF from a single cell is handled by EditEngine + // RTF from a single cell is handled by EditEngine SCCOL nCol = aBlock.aStart.Col(); SCROW nRow = aBlock.aStart.Row(); @@ -303,8 +303,8 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) } else if ( ScImportExport::IsFormatSupported( nFormat ) || nFormat == SOT_FORMAT_RTF ) { - // if this transfer object was used to create a DDE link, filtered rows - // have to be included for subsequent calls (to be consistent with link data) + // if this transfer object was used to create a DDE link, filtered rows + // have to be included for subsequent calls (to be consistent with link data) if ( nFormat == SOT_FORMATSTR_ID_LINK ) bUsedForLink = TRUE; @@ -316,7 +316,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) aObj.SetFormulas( pDoc->GetViewOptions().GetOption( VOPT_FORMULAS ) ); aObj.SetIncludeFiltered( bIncludeFiltered ); - // DataType depends on format type: + // DataType depends on format type: if ( rFlavor.DataType.equals( ::getCppuType( (const ::rtl::OUString*) 0 ) ) ) { @@ -326,7 +326,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) } else if ( rFlavor.DataType.equals( ::getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ) ) { - // SetObject converts a stream into a Int8-Sequence + // SetObject converts a stream into a Int8-Sequence bOK = SetObject( &aObj, SCTRANS_TYPE_IMPEX, rFlavor ); } else @@ -355,10 +355,10 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) // like SvEmbeddedTransfer::GetData: - GDIMetaFile aMtf; - VirtualDevice aVDev; - MapMode aMapMode( pEmbObj->GetMapUnit() ); - Rectangle aVisArea( pEmbObj->GetVisArea( ASPECT_CONTENT ) ); + GDIMetaFile aMtf; + VirtualDevice aVDev; + MapMode aMapMode( pEmbObj->GetMapUnit() ); + Rectangle aVisArea( pEmbObj->GetVisArea( ASPECT_CONTENT ) ); aVDev.EnableOutput( FALSE ); aVDev.SetMapMode( aMapMode ); @@ -376,7 +376,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) else if ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE ) { //TODO/LATER: differentiate between formats?! - InitDocShell(); // set aDocShellRef + InitDocShell(); // set aDocShellRef SfxObjectShell* pEmbObj = aDocShellRef; bOK = SetObject( pEmbObj, SCTRANS_TYPE_EMBOBJ, rFlavor ); @@ -415,9 +415,9 @@ sal_Bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj } else { - // #107722# can't use Write for EditEngine format because that would - // write old format without support for unicode characters. - // Get the data from the EditEngine's transferable instead. + // #107722# can't use Write for EditEngine format because that would + // write old format without support for unicode characters. + // Get the data from the EditEngine's transferable instead. USHORT nParCnt = pEngine->GetParagraphCount(); if ( nParCnt == 0 ) @@ -488,13 +488,13 @@ void ScTransferObj::DragFinished( sal_Int8 nDropAction ) { if ( nDropAction == DND_ACTION_MOVE && !bDragWasInternal && !(nDragSourceFlags & SC_DROP_NAVIGATOR) ) { - // move: delete source data + // move: delete source data ScDocShell* pSourceSh = GetSourceDocShell(); if (pSourceSh) { ScMarkData aMarkData = GetSourceMarkData(); - // external drag&drop doesn't copy objects, so they also aren't deleted: - // #105703# bApi=TRUE, don't show error messages from drag&drop + // external drag&drop doesn't copy objects, so they also aren't deleted: + // #105703# bApi=TRUE, don't show error messages from drag&drop pSourceSh->GetDocFunc().DeleteContents( aMarkData, IDF_ALL & ~IDF_OBJECTS, TRUE, TRUE ); } } @@ -503,7 +503,7 @@ void ScTransferObj::DragFinished( sal_Int8 nDropAction ) if ( pScMod->GetDragData().pCellTransfer == this ) pScMod->ResetDragObject(); - xDragSourceRanges = NULL; // don't keep source after dropping + xDragSourceRanges = NULL; // don't keep source after dropping TransferableHelper::DragFinished( nDropAction ); } @@ -555,7 +555,7 @@ ScDocShell* ScTransferObj::GetSourceDocShell() if (pRangesObj) return pRangesObj->GetDocShell(); - return NULL; // none set + return NULL; // none set } ScMarkData ScTransferObj::GetSourceMarkData() @@ -571,7 +571,7 @@ ScMarkData ScTransferObj::GetSourceMarkData() } // -// initialize aDocShellRef with a live document from the ClipDoc +// initialize aDocShellRef with a live document from the ClipDoc // void ScTransferObj::InitDocShell() @@ -579,7 +579,7 @@ void ScTransferObj::InitDocShell() if ( !aDocShellRef.Is() ) { ScDocShell* pDocSh = new ScDocShell; - aDocShellRef = pDocSh; // ref must be there before InitNew + aDocShellRef = pDocSh; // ref must be there before InitNew pDocSh->DoInitNew(NULL); @@ -591,7 +591,7 @@ void ScTransferObj::InitDocShell() String aTabName; pDoc->GetName( aBlock.aStart.Tab(), aTabName ); - pDestDoc->RenameTab( 0, aTabName, FALSE ); // no UpdateRef (empty) + pDestDoc->RenameTab( 0, aTabName, FALSE ); // no UpdateRef (empty) pDestDoc->CopyStdStylesFrom( pDoc ); @@ -600,8 +600,8 @@ void ScTransferObj::InitDocShell() SCCOL nEndX = aBlock.aEnd.Col(); SCROW nEndY = aBlock.aEnd.Row(); - // widths / heights - // (must be copied before CopyFromClip, for drawing objects) + // widths / heights + // (must be copied before CopyFromClip, for drawing objects) SCCOL nCol, nLastCol; SCTAB nSrcTab = aBlock.aStart.Tab(); @@ -625,7 +625,7 @@ void ScTransferObj::InitDocShell() { pDestDoc->SetRowHeight( nRow, 0, pDoc->GetOriginalHeight( nRow, nSrcTab ) ); - // if height was set manually, that flag has to be copied, too + // if height was set manually, that flag has to be copied, too if ( nSourceFlags & CR_MANUALSIZE ) rDestRowFlags.OrValue( nRow, CR_MANUALSIZE); } @@ -634,14 +634,14 @@ void ScTransferObj::InitDocShell() if ( pDoc->GetDrawLayer() ) pDocSh->MakeDrawLayer(); - // cell range is copied to the original position, but on the first sheet - // -> bCutMode must be set - // pDoc is always a Clipboard-document + // cell range is copied to the original position, but on the first sheet + // -> bCutMode must be set + // pDoc is always a Clipboard-document ScRange aDestRange( nStartX,nStartY,0, nEndX,nEndY,0 ); BOOL bWasCut = pDoc->IsCutMode(); if (!bWasCut) - pDoc->SetClipArea( aDestRange, TRUE ); // Cut + pDoc->SetClipArea( aDestRange, TRUE ); // Cut pDestDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL, NULL, pDoc, FALSE ); pDoc->SetClipArea( aDestRange, bWasCut ); @@ -650,11 +650,11 @@ void ScTransferObj::InitDocShell() ScRange aMergeRange = aDestRange; pDestDoc->ExtendMerge( aMergeRange, TRUE ); - pDoc->CopyDdeLinks( pDestDoc ); // copy values of DDE Links + pDoc->CopyDdeLinks( pDestDoc ); // copy values of DDE Links - // page format (grid etc) and page size (maximum size for ole object) + // page format (grid etc) and page size (maximum size for ole object) - Size aPaperSize = SvxPaperInfo::GetPaperSize( PAPER_A4 ); // Twips + Size aPaperSize = SvxPaperInfo::GetPaperSize( PAPER_A4 ); // Twips ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); String aStyleName = pDoc->GetPageStyle( aBlock.aStart.Tab() ); SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aStyleName, SFX_STYLE_FAMILY_PAGE ); @@ -663,7 +663,7 @@ void ScTransferObj::InitDocShell() const SfxItemSet& rSourceSet = pStyleSheet->GetItemSet(); aPaperSize = ((const SvxSizeItem&) rSourceSet.Get(ATTR_PAGE_SIZE)).GetSize(); - // CopyStyleFrom kopiert SetItems mit richtigem Pool + // CopyStyleFrom kopiert SetItems mit richtigem Pool ScStyleSheetPool* pDestPool = pDestDoc->GetStyleSheetPool(); pDestPool->CopyStyleFrom( pStylePool, aStyleName, SFX_STYLE_FAMILY_PAGE ); } @@ -675,7 +675,7 @@ void ScTransferObj::InitDocShell() pDestDoc->SetViewOptions( pDoc->GetViewOptions() ); - // Size + // Size //! get while copying sizes long nPosX = 0; @@ -688,7 +688,7 @@ void ScTransferObj::InitDocShell() nPosY = (long) ( nPosY * HMM_PER_TWIPS ); - aPaperSize.Width() *= 2; // limit OLE object to double of page size + aPaperSize.Width() *= 2; // limit OLE object to double of page size aPaperSize.Height() *= 2; long nSizeX = 0; @@ -696,21 +696,21 @@ void ScTransferObj::InitDocShell() for (nCol=nStartX; nCol<=nEndX; nCol++) { long nAdd = pDestDoc->GetColWidth( nCol, 0 ); - if ( nSizeX+nAdd > aPaperSize.Width() && nSizeX ) // above limit? + if ( nSizeX+nAdd > aPaperSize.Width() && nSizeX ) // above limit? break; nSizeX += nAdd; } for (SCROW nRow=nStartY; nRow<=nEndY; nRow++) { long nAdd = pDestDoc->GetRowHeight( nRow, 0 ); - if ( nSizeY+nAdd > aPaperSize.Height() && nSizeY ) // above limit? + if ( nSizeY+nAdd > aPaperSize.Height() && nSizeY ) // above limit? break; nSizeY += nAdd; } nSizeX = (long) ( nSizeX * HMM_PER_TWIPS ); nSizeY = (long) ( nSizeY * HMM_PER_TWIPS ); -// pDocSh->SetVisAreaSize( Size(nSizeX,nSizeY) ); +// pDocSh->SetVisAreaSize( Size(nSizeX,nSizeY) ); Rectangle aNewArea( Point(nPosX,nPosY), Size(nSizeX,nSizeY) ); //TODO/LATER: why twice?! @@ -719,13 +719,13 @@ void ScTransferObj::InitDocShell() pDocSh->UpdateOle(&aViewData, TRUE); - //! SetDocumentModified? + //! SetDocumentModified? if ( pDestDoc->IsChartListenerCollectionNeedsUpdate() ) pDestDoc->UpdateChartListenerCollection(); } } -// static +// static SfxObjectShell* ScTransferObj::SetDrawClipDoc( BOOL bAnyOle ) { // update ScGlobal::pDrawClipDocShellRef @@ -745,7 +745,7 @@ SfxObjectShell* ScTransferObj::SetDrawClipDoc( BOOL bAnyOle ) } } -// static +// static void ScTransferObj::StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, ScDocument* pDestDoc, SCCOL nSubX, SCROW nSubY ) @@ -756,7 +756,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc, DBG_ASSERT(nSubX==0&&nSubY==0, "can't move within the document"); } - // In a clipboard doc the data don't have to be on the first sheet + // In a clipboard doc the data don't have to be on the first sheet SCTAB nSrcTab = 0; while (nSrcTab<MAXTAB && !pDoc->HasTable(nSrcTab)) @@ -822,7 +822,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc, } pDestDoc->PutCell( nCol,nRow,nDestTab, pNew ); - // number formats + // number formats ULONG nOldFormat = ((const SfxUInt32Item*) pDestDoc->GetAttr(nCol,nRow,nDestTab, ATTR_VALUE_FORMAT))->GetValue(); diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index 10c35fde833f..97a004e0b3ed 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.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 @@ -36,7 +36,7 @@ #include <editeng/memberids.hrc> -#define ITEMID_DBTYPE 0 +#define ITEMID_DBTYPE 0 @@ -130,7 +130,7 @@ #define SvxDrawToolItem SfxAllEnumItem #define SvxDrawAlignItem SfxAllEnumItem -#define SvxChooseControlItem SfxEnumItem +#define SvxChooseControlItem SfxEnumItem #define avmedia_MediaItem ::avmedia::MediaItem #define SFX_TYPEMAP diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 4148b96675c6..2d3472263ee6 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.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,14 +45,14 @@ TYPEINIT1(ScQueryItem, SfxPoolItem); TYPEINIT1(ScSubTotalItem, SfxPoolItem); TYPEINIT1(ScUserListItem, SfxPoolItem); TYPEINIT1(ScConsolidateItem, SfxPoolItem); -TYPEINIT1(ScPivotItem, SfxPoolItem); -TYPEINIT1(ScSolveItem, SfxPoolItem); -TYPEINIT1(ScTabOpItem, SfxPoolItem); -TYPEINIT1(ScCondFrmtItem, SfxPoolItem); +TYPEINIT1(ScPivotItem, SfxPoolItem); +TYPEINIT1(ScSolveItem, SfxPoolItem); +TYPEINIT1(ScTabOpItem, SfxPoolItem); +TYPEINIT1(ScCondFrmtItem, SfxPoolItem); -TYPEINIT1(ScTablesHint, SfxHint); -TYPEINIT1(ScEditViewHint, SfxHint); -TYPEINIT1(ScIndexHint, SfxHint); +TYPEINIT1(ScTablesHint, SfxHint); +TYPEINIT1(ScEditViewHint, SfxHint); +TYPEINIT1(ScIndexHint, SfxHint); // ----------------------------------------------------------------------- // ScInputStatusItem - Status-Update fuer Eingabezeile @@ -65,21 +65,21 @@ ScInputStatusItem::ScInputStatusItem( USHORT nWhichP, const String& rString, const EditTextObject* pData ) : SfxPoolItem ( nWhichP ), - aCursorPos ( rCurPos ), - aStartPos ( rStartPos ), - aEndPos ( rEndPos ), - aString ( rString ), - pEditData ( pData ? pData->Clone() : NULL ) + aCursorPos ( rCurPos ), + aStartPos ( rStartPos ), + aEndPos ( rEndPos ), + aString ( rString ), + pEditData ( pData ? pData->Clone() : NULL ) { } ScInputStatusItem::ScInputStatusItem( const ScInputStatusItem& rItem ) - : SfxPoolItem ( rItem ), - aCursorPos ( rItem.aCursorPos ), - aStartPos ( rItem.aStartPos ), - aEndPos ( rItem.aEndPos ), - aString ( rItem.aString ), - pEditData ( rItem.pEditData ? rItem.pEditData->Clone() : NULL ) + : SfxPoolItem ( rItem ), + aCursorPos ( rItem.aCursorPos ), + aStartPos ( rItem.aStartPos ), + aEndPos ( rItem.aEndPos ), + aString ( rItem.aString ), + pEditData ( rItem.pEditData ? rItem.pEditData->Clone() : NULL ) { } @@ -97,11 +97,11 @@ int __EXPORT ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - return ( (aStartPos == ((ScInputStatusItem&)rItem).aStartPos) - && (aEndPos == ((ScInputStatusItem&)rItem).aEndPos) - && (aCursorPos == ((ScInputStatusItem&)rItem).aCursorPos) - && (aString == ((ScInputStatusItem&)rItem).aString) ); - //! Edit-Daten vergleichen! + return ( (aStartPos == ((ScInputStatusItem&)rItem).aStartPos) + && (aEndPos == ((ScInputStatusItem&)rItem).aEndPos) + && (aCursorPos == ((ScInputStatusItem&)rItem).aCursorPos) + && (aString == ((ScInputStatusItem&)rItem).aString) ); + //! Edit-Daten vergleichen! } SfxPoolItem* __EXPORT ScInputStatusItem::Clone( SfxItemPool * ) const @@ -110,11 +110,11 @@ SfxPoolItem* __EXPORT ScInputStatusItem::Clone( SfxItemPool * ) const } // -// ScPaintHint ist nach schints.cxx verschoben +// ScPaintHint ist nach schints.cxx verschoben // // ----------------------------------------------------------------------- -// ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht +// ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht // ----------------------------------------------------------------------- ScTablesHint::ScTablesHint(USHORT nNewId, SCTAB nTable1, SCTAB nTable2) : @@ -130,7 +130,7 @@ ScTablesHint::~ScTablesHint() // ----------------------------------------------------------------------- -// ScIndexHint +// ScIndexHint // ----------------------------------------------------------------------- ScIndexHint::ScIndexHint(USHORT nNewId, USHORT nIdx) : @@ -238,7 +238,7 @@ ScQueryItem::ScQueryItem( USHORT nWhichP, const ScQueryParam* pQueryData ) : SfxPoolItem ( nWhichP ), pViewData ( ptrViewData ), - bIsAdvanced ( FALSE ) + bIsAdvanced ( FALSE ) { if ( pQueryData ) theQueryData = *pQueryData; } @@ -249,7 +249,7 @@ ScQueryItem::ScQueryItem( USHORT nWhichP, const ScQueryParam* pQueryData ) : SfxPoolItem ( nWhichP ), pViewData ( NULL ), - bIsAdvanced ( FALSE ) + bIsAdvanced ( FALSE ) { if ( pQueryData ) theQueryData = *pQueryData; } @@ -260,8 +260,8 @@ ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) : SfxPoolItem ( rItem ), pViewData ( rItem.pViewData ), theQueryData( rItem.theQueryData ), - bIsAdvanced ( rItem.bIsAdvanced ), - aAdvSource ( rItem.aAdvSource ) + bIsAdvanced ( rItem.bIsAdvanced ), + aAdvSource ( rItem.aAdvSource ) { } @@ -321,8 +321,8 @@ SfxPoolItem* __EXPORT ScQueryItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- ScSubTotalItem::ScSubTotalItem( USHORT nWhichP, - ScViewData* ptrViewData, - const ScSubTotalParam* pSubTotalData ) : + ScViewData* ptrViewData, + const ScSubTotalParam* pSubTotalData ) : SfxPoolItem ( nWhichP ), pViewData ( ptrViewData ) { @@ -332,7 +332,7 @@ ScSubTotalItem::ScSubTotalItem( USHORT nWhichP, //------------------------------------------------------------------------ ScSubTotalItem::ScSubTotalItem( USHORT nWhichP, - const ScSubTotalParam* pSubTotalData ) : + const ScSubTotalParam* pSubTotalData ) : SfxPoolItem ( nWhichP ), pViewData ( NULL ) { @@ -342,9 +342,9 @@ ScSubTotalItem::ScSubTotalItem( USHORT nWhichP, //------------------------------------------------------------------------ ScSubTotalItem::ScSubTotalItem( const ScSubTotalItem& rItem ) : - SfxPoolItem ( rItem ), - pViewData ( rItem.pViewData ), - theSubTotalData ( rItem.theSubTotalData ) + SfxPoolItem ( rItem ), + pViewData ( rItem.pViewData ), + theSubTotalData ( rItem.theSubTotalData ) { } @@ -367,7 +367,7 @@ int __EXPORT ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const const ScSubTotalItem& rSTItem = (const ScSubTotalItem&)rItem; - return ( (pViewData == rSTItem.pViewData) + return ( (pViewData == rSTItem.pViewData) && (theSubTotalData == rSTItem.theSubTotalData) ); } @@ -393,14 +393,14 @@ bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMember ScUserListItem::ScUserListItem( USHORT nWhichP ) : SfxPoolItem ( nWhichP ), - pUserList ( NULL ) + pUserList ( NULL ) { } //------------------------------------------------------------------------ ScUserListItem::ScUserListItem( const ScUserListItem& rItem ) - : SfxPoolItem ( rItem ) + : SfxPoolItem ( rItem ) { if ( rItem.pUserList ) pUserList = new ScUserList( *(rItem.pUserList) ); @@ -459,7 +459,7 @@ void ScUserListItem::SetUserList( const ScUserList& rUserList ) ScConsolidateItem::ScConsolidateItem( USHORT nWhichP, - const ScConsolidateParam* pConsolidateData ) : + const ScConsolidateParam* pConsolidateData ) : SfxPoolItem ( nWhichP ) { if ( pConsolidateData ) theConsData = *pConsolidateData; @@ -468,8 +468,8 @@ ScConsolidateItem::ScConsolidateItem( //------------------------------------------------------------------------ ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) : - SfxPoolItem ( rItem ), - theConsData ( rItem.theConsData ) + SfxPoolItem ( rItem ), + theConsData ( rItem.theConsData ) { } @@ -513,7 +513,7 @@ ScPivotItem::ScPivotItem( USHORT nWhichP, const ScDPSaveData* pData, const ScRange* pRange, BOOL bNew ) : SfxPoolItem ( nWhichP ) { - // pSaveData must always exist + // pSaveData must always exist if ( pData ) pSaveData = new ScDPSaveData(*pData); else @@ -525,9 +525,9 @@ ScPivotItem::ScPivotItem( USHORT nWhichP, const ScDPSaveData* pData, //------------------------------------------------------------------------ ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) : - SfxPoolItem ( rItem ), - aDestRange ( rItem.aDestRange ), - bNewSheet ( rItem.bNewSheet ) + SfxPoolItem ( rItem ), + aDestRange ( rItem.aDestRange ), + bNewSheet ( rItem.bNewSheet ) { DBG_ASSERT(rItem.pSaveData, "pSaveData"); pSaveData = new ScDPSaveData(*rItem.pSaveData); @@ -573,7 +573,7 @@ SfxPoolItem* __EXPORT ScPivotItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- ScSolveItem::ScSolveItem( USHORT nWhichP, - const ScSolveParam* pSolveData ) + const ScSolveParam* pSolveData ) : SfxPoolItem ( nWhichP ) { if ( pSolveData ) theSolveData = *pSolveData; @@ -582,8 +582,8 @@ ScSolveItem::ScSolveItem( USHORT nWhichP, //------------------------------------------------------------------------ ScSolveItem::ScSolveItem( const ScSolveItem& rItem ) - : SfxPoolItem ( rItem ), - theSolveData ( rItem.theSolveData ) + : SfxPoolItem ( rItem ), + theSolveData ( rItem.theSolveData ) { } @@ -623,7 +623,7 @@ SfxPoolItem* __EXPORT ScSolveItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- ScTabOpItem::ScTabOpItem( USHORT nWhichP, - const ScTabOpParam* pTabOpData ) + const ScTabOpParam* pTabOpData ) : SfxPoolItem ( nWhichP ) { if ( pTabOpData ) theTabOpData = *pTabOpData; @@ -632,8 +632,8 @@ ScTabOpItem::ScTabOpItem( USHORT nWhichP, //------------------------------------------------------------------------ ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem ) - : SfxPoolItem ( rItem ), - theTabOpData ( rItem.theTabOpData ) + : SfxPoolItem ( rItem ), + theTabOpData ( rItem.theTabOpData ) { } @@ -674,18 +674,18 @@ SfxPoolItem* __EXPORT ScTabOpItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- ScCondFrmtItem::ScCondFrmtItem( USHORT nWhichP, -//! const ScConditionalFormat* pCondFrmt ) +//! const ScConditionalFormat* pCondFrmt ) const ScConditionalFormat& rCondFrmt ) : SfxPoolItem ( nWhichP ), - theCondFrmtData ( rCondFrmt ) //! + theCondFrmtData ( rCondFrmt ) //! { -//! if ( pCondFrmt ) theCondFrmtData = *pCondFrmt; +//! if ( pCondFrmt ) theCondFrmtData = *pCondFrmt; } //------------------------------------------------------------------------ ScCondFrmtItem::ScCondFrmtItem( const ScCondFrmtItem& rItem ) - : SfxPoolItem ( rItem ), + : SfxPoolItem ( rItem ), theCondFrmtData ( rItem.theCondFrmtData ) { } diff --git a/sc/source/ui/app/wtcdummy.cxx b/sc/source/ui/app/wtcdummy.cxx index 055a37a644f4..c1f5eed9b82d 100644 --- a/sc/source/ui/app/wtcdummy.cxx +++ b/sc/source/ui/app/wtcdummy.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/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 6c33476e9d89..b7716e75fd4d 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.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 @@ -56,7 +56,7 @@ //================================================================== ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP, - Window* pParent, + Window* pParent, const SfxItemSet* pCellAttrs ) : SfxTabDialog( pFrameP, @@ -80,20 +80,20 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP, DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!"); - AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); + AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); if ( aCJKOptions.IsAsianTypographyEnabled() ) { DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); - AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), 0 ); + AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), 0 ); } else RemoveTabPage( TP_ASIAN ); DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); - AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 ); + AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 ); DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); - AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); - AddTabPage( TP_PROTECTION, ScTabPageProtection::Create, 0 ); + AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); + AddTabPage( TP_PROTECTION, ScTabPageProtection::Create, 0 ); FreeResource(); } diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index dbdad9aace69..c9da6a740266 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.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,7 +50,7 @@ //============================================================================ -// class ScConditionalFormat +// class ScConditionalFormat //---------------------------------------------------------------------------- // Konstruktor @@ -59,53 +59,53 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pCurDoc, const ScConditionalFormat* pCurrentFormat ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONDFORMAT ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONDFORMAT ), - aCbxCond1 ( this, ScResId( CBX_COND1 ) ), - aLbCond11 ( this, ScResId( LB_COND1_1 ) ), - aLbCond12 ( this, ScResId( LB_COND1_2 ) ), + aCbxCond1 ( this, ScResId( CBX_COND1 ) ), + aLbCond11 ( this, ScResId( LB_COND1_1 ) ), + aLbCond12 ( this, ScResId( LB_COND1_2 ) ), aEdtCond11 ( this, this, ScResId( EDT_COND1_1 ) ), - aRbCond11 ( this, ScResId( RB_COND1_1 ), &aEdtCond11,this ), - aFtCond1And ( this, ScResId( FT_COND1_AND ) ), + aRbCond11 ( this, ScResId( RB_COND1_1 ), &aEdtCond11,this ), + aFtCond1And ( this, ScResId( FT_COND1_AND ) ), aEdtCond12 ( this, this, ScResId( EDT_COND1_2 ) ), - aRbCond12 ( this, ScResId( RB_COND1_2 ), &aEdtCond12,this ), - aFtCond1Template ( this, ScResId( FT_COND1_TEMPLATE ) ), - aLbCond1Template ( this, ScResId( LB_COND1_TEMPLATE ) ), + aRbCond12 ( this, ScResId( RB_COND1_2 ), &aEdtCond12,this ), + aFtCond1Template ( this, ScResId( FT_COND1_TEMPLATE ) ), + aLbCond1Template ( this, ScResId( LB_COND1_TEMPLATE ) ), aBtnNew1 ( this, ScResId( BTN_COND1_NEW ) ), aFlSep1 ( this, ScResId( FL_SEP1 ) ), - aCbxCond2 ( this, ScResId( CBX_COND2 ) ), - aLbCond21 ( this, ScResId( LB_COND2_1 ) ), - aLbCond22 ( this, ScResId( LB_COND2_2 ) ), + aCbxCond2 ( this, ScResId( CBX_COND2 ) ), + aLbCond21 ( this, ScResId( LB_COND2_1 ) ), + aLbCond22 ( this, ScResId( LB_COND2_2 ) ), aEdtCond21 ( this, this, ScResId( EDT_COND2_1 ) ), - aRbCond21 ( this, ScResId( RB_COND2_1 ), &aEdtCond21,this ), - aFtCond2And ( this, ScResId( FT_COND2_AND ) ), + aRbCond21 ( this, ScResId( RB_COND2_1 ), &aEdtCond21,this ), + aFtCond2And ( this, ScResId( FT_COND2_AND ) ), aEdtCond22 ( this, this, ScResId( EDT_COND2_2 ) ), - aRbCond22 ( this, ScResId( RB_COND2_2 ), &aEdtCond22,this ), - aFtCond2Template ( this, ScResId( FT_COND2_TEMPLATE ) ), - aLbCond2Template ( this, ScResId( LB_COND2_TEMPLATE ) ), + aRbCond22 ( this, ScResId( RB_COND2_2 ), &aEdtCond22,this ), + aFtCond2Template ( this, ScResId( FT_COND2_TEMPLATE ) ), + aLbCond2Template ( this, ScResId( LB_COND2_TEMPLATE ) ), aBtnNew2 ( this, ScResId( BTN_COND2_NEW ) ), aFlSep2 ( this, ScResId( FL_SEP2 ) ), - aCbxCond3 ( this, ScResId( CBX_COND3 ) ), - aLbCond31 ( this, ScResId( LB_COND3_1 ) ), - aLbCond32 ( this, ScResId( LB_COND3_2 ) ), + aCbxCond3 ( this, ScResId( CBX_COND3 ) ), + aLbCond31 ( this, ScResId( LB_COND3_1 ) ), + aLbCond32 ( this, ScResId( LB_COND3_2 ) ), aEdtCond31 ( this, this, ScResId( EDT_COND3_1 ) ), - aRbCond31 ( this, ScResId( RB_COND3_1 ), &aEdtCond31,this ), - aFtCond3And ( this, ScResId( FT_COND3_AND ) ), + aRbCond31 ( this, ScResId( RB_COND3_1 ), &aEdtCond31,this ), + aFtCond3And ( this, ScResId( FT_COND3_AND ) ), aEdtCond32 ( this, this, ScResId( EDT_COND3_2 ) ), - aRbCond32 ( this, ScResId( RB_COND3_2 ), &aEdtCond32,this ), - aFtCond3Template ( this, ScResId( FT_COND3_TEMPLATE ) ), - aLbCond3Template ( this, ScResId( LB_COND3_TEMPLATE ) ), + aRbCond32 ( this, ScResId( RB_COND3_2 ), &aEdtCond32,this ), + aFtCond3Template ( this, ScResId( FT_COND3_TEMPLATE ) ), + aLbCond3Template ( this, ScResId( LB_COND3_TEMPLATE ) ), aBtnNew3 ( this, ScResId( BTN_COND3_NEW ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - pEdActive ( NULL ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + pEdActive ( NULL ), bDlgLostFocus ( FALSE ), - pDoc ( pCurDoc ) + pDoc ( pCurDoc ) { Point aPos; String aName; @@ -127,7 +127,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aLbCond32.SetSelectHdl( LINK( this, ScConditionalFormatDlg, ChangeCond32Hdl ) ); aBtnOk.SetClickHdl ( LINK( this, ScConditionalFormatDlg, BtnHdl ) ); -//? aBtnCancel.SetClickHdl( LINK( this, ScConditionalFormatDlg, BtnHdl ) ); +//? aBtnCancel.SetClickHdl( LINK( this, ScConditionalFormatDlg, BtnHdl ) ); Link aLink = LINK( this, ScConditionalFormatDlg, NewBtnHdl ); aBtnNew1.SetClickHdl( aLink ); @@ -163,12 +163,12 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aRbCond32.SetLoseFocusHdl( aLink ); // Condition 1 - aCond1Pos1 = aLbCond12.GetPosPixel(); // Position Edit ohne Listbox - aCond1Pos2 = aEdtCond11.GetPosPixel(); // Position Edit mit Listbox + aCond1Pos1 = aLbCond12.GetPosPixel(); // Position Edit ohne Listbox + aCond1Pos2 = aEdtCond11.GetPosPixel(); // Position Edit mit Listbox aRBtn1Pos1 = aRbCond11.GetPosPixel(); aRBtn1Pos2 = aRbCond12.GetPosPixel(); aPos = aEdtCond12.GetPosPixel(); - aPos.X() += aEdtCond12.GetSizePixel().Width(); // rechter Rand + aPos.X() += aEdtCond12.GetSizePixel().Width(); // rechter Rand aCond1Size3 = aEdtCond11.GetSizePixel(); aCond1Size2 = Size( aPos.X() - aCond1Pos2.X(), aCond1Size3.Height() ); aCond1Size1 = Size( aPos.X() - aCond1Pos1.X(), aCond1Size3.Height() ); @@ -178,12 +178,12 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aLbCond12.SelectEntryPos( 0 ); // Condition 2 - aCond2Pos1 = aLbCond22.GetPosPixel(); // Position Edit ohne Listbox - aCond2Pos2 = aEdtCond21.GetPosPixel(); // Position Edit mit Listbox + aCond2Pos1 = aLbCond22.GetPosPixel(); // Position Edit ohne Listbox + aCond2Pos2 = aEdtCond21.GetPosPixel(); // Position Edit mit Listbox aRBtn2Pos1 = aRbCond21.GetPosPixel(); aRBtn2Pos2 = aRbCond22.GetPosPixel(); aPos = aEdtCond22.GetPosPixel(); - aPos.X() += aEdtCond22.GetSizePixel().Width(); // rechter Rand + aPos.X() += aEdtCond22.GetSizePixel().Width(); // rechter Rand aCond2Size3 = aEdtCond21.GetSizePixel(); aCond2Size2 = Size( aPos.X() - aCond2Pos2.X(), aCond2Size3.Height() ); aCond2Size1 = Size( aPos.X() - aCond2Pos1.X(), aCond2Size3.Height() ); @@ -193,12 +193,12 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aLbCond22.SelectEntryPos( 0 ); // Condition 3 - aCond3Pos1 = aLbCond32.GetPosPixel(); // Position Edit ohne Listbox - aCond3Pos2 = aEdtCond31.GetPosPixel(); // Position Edit mit Listbox + aCond3Pos1 = aLbCond32.GetPosPixel(); // Position Edit ohne Listbox + aCond3Pos2 = aEdtCond31.GetPosPixel(); // Position Edit mit Listbox aRBtn3Pos1 = aRbCond31.GetPosPixel(); aRBtn3Pos2 = aRbCond32.GetPosPixel(); aPos = aEdtCond32.GetPosPixel(); - aPos.X() += aEdtCond32.GetSizePixel().Width(); // rechter Rand + aPos.X() += aEdtCond32.GetSizePixel().Width(); // rechter Rand aCond3Size3 = aEdtCond31.GetSizePixel(); aCond3Size2 = Size( aPos.X() - aCond3Pos2.X(), aCond3Size3.Height() ); aCond3Size1 = Size( aPos.X() - aCond3Pos1.X(), aCond3Size3.Height() ); @@ -218,8 +218,8 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( } // Vorlagen eintragen -//! pStyle = pDoc->GetSelectionStyle( /* ??? const ScMarkData& rMark ??? */ ); - pStyle = NULL; //! +//! pStyle = pDoc->GetSelectionStyle( /* ??? const ScMarkData& rMark ??? */ ); + pStyle = NULL; //! if (pStyle) aName = pStyle->GetName(); else @@ -246,15 +246,15 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aEdtCond11.SetText( pEntry->GetExpression( aCurPos, 0 ) ); aLbCond1Template.SelectEntry( pEntry->GetStyle() ); - ScConditionMode eMode = pEntry->GetOperation(); - if ( eMode == SC_COND_DIRECT ) // via Formel + ScConditionMode eMode = pEntry->GetOperation(); + if ( eMode == SC_COND_DIRECT ) // via Formel { aLbCond11.SelectEntryPos( 1 ); ChangeCond11Hdl( NULL ); } - else if ( eMode == SC_COND_NONE ) // ??? + else if ( eMode == SC_COND_NONE ) // ??? ; - else // via Werte + else // via Werte { aLbCond12.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) ); if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) ) @@ -270,15 +270,15 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aEdtCond21.SetText( pEntry->GetExpression( aCurPos, 0 ) ); aLbCond2Template.SelectEntry( pEntry->GetStyle() ); - ScConditionMode eMode = pEntry->GetOperation(); - if ( eMode == SC_COND_DIRECT ) // via Formel + ScConditionMode eMode = pEntry->GetOperation(); + if ( eMode == SC_COND_DIRECT ) // via Formel { aLbCond21.SelectEntryPos( 1 ); ChangeCond21Hdl( NULL ); } - else if ( eMode == SC_COND_NONE ) // ??? + else if ( eMode == SC_COND_NONE ) // ??? ; - else // via Werte + else // via Werte { aLbCond22.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) ); if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) ) @@ -293,15 +293,15 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aEdtCond31.SetText( pEntry->GetExpression( aCurPos, 0 ) ); aLbCond3Template.SelectEntry( pEntry->GetStyle() ); - ScConditionMode eMode = pEntry->GetOperation(); - if ( eMode == SC_COND_DIRECT ) // via Formel + ScConditionMode eMode = pEntry->GetOperation(); + if ( eMode == SC_COND_DIRECT ) // via Formel { aLbCond31.SelectEntryPos( 1 ); ChangeCond31Hdl( NULL ); } - else if ( eMode == SC_COND_NONE ) // ??? + else if ( eMode == SC_COND_NONE ) // ??? ; - else // via Werte + else // via Werte { aLbCond32.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) ); if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) ) @@ -321,8 +321,8 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aEdtCond11.GrabFocus(); pEdActive = &aEdtCond11; //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus -// SFX_APPWINDOW->Disable(); + //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus +// SFX_APPWINDOW->Disable(); } @@ -353,7 +353,7 @@ void ScConditionalFormatDlg::SetReference( const ScRange& rRef, ScDocument* pDoc Selection aNewSel( aSel.Min(), aSel.Min()+aStr.Len() ); pEdActive->SetRefString( aVal ); pEdActive->SetSelection( aNewSel ); -// pEdActive->SetModifyFlag(); +// pEdActive->SetModifyFlag(); } } @@ -369,7 +369,7 @@ void ScConditionalFormatDlg::AddRefEntry() xub_StrLen nLen = aVal.Len(); pEdActive->SetSelection( Selection( nLen, nLen ) ); -// pEdActive->SetModifyFlag(); +// pEdActive->SetModifyFlag(); } } @@ -418,7 +418,7 @@ void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt if ( aCbxCond1.IsChecked() ) { - if ( aLbCond11.GetSelectEntryPos() == 1 ) // via Formel + if ( aLbCond11.GetSelectEntryPos() == 1 ) // via Formel eOper = SC_COND_DIRECT; else eOper = (ScConditionMode)aLbCond12.GetSelectEntryPos(); @@ -431,7 +431,7 @@ void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt if ( aCbxCond2.IsChecked() ) { - if ( aLbCond21.GetSelectEntryPos() == 1 ) // via Formel??? + if ( aLbCond21.GetSelectEntryPos() == 1 ) // via Formel??? eOper = SC_COND_DIRECT; else eOper = (ScConditionMode)aLbCond22.GetSelectEntryPos(); @@ -444,7 +444,7 @@ void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt if ( aCbxCond3.IsChecked() ) { - if ( aLbCond31.GetSelectEntryPos() == 1 ) // via Formel??? + if ( aLbCond31.GetSelectEntryPos() == 1 ) // via Formel??? eOper = SC_COND_DIRECT; else eOper = (ScConditionMode)aLbCond32.GetSelectEntryPos(); @@ -748,7 +748,7 @@ IMPL_LINK( ScConditionalFormatDlg, LoseFocusHdl, Control*, EMPTYARG ) //---------------------------------------------------------------------------- -// [OK], [Cancel] +// [OK], [Cancel] IMPL_LINK( ScConditionalFormatDlg, BtnHdl, PushButton*, pBtn ) { diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 7ab625e03f61..79481ffdc183 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.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 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() { ScFuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - + OUStringBuffer aStrBuf; aStrBuf.appendAscii( SVLIBRARY("scui") ); diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index b4035b187197..fa14720608ea 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.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 @@ -300,7 +300,7 @@ void AbstractScDeleteContentsDlg_Impl::DisableObjects() { pDlg->DisableObjects(); } -USHORT AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const +USHORT AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const { return pDlg->GetDelContentsCmdBits(); } @@ -312,7 +312,7 @@ FillDir AbstractScFillSeriesDlg_Impl::GetFillDir() const return pDlg->GetFillDir(); } -FillCmd AbstractScFillSeriesDlg_Impl::GetFillCmd() const +FillCmd AbstractScFillSeriesDlg_Impl::GetFillCmd() const { return pDlg->GetFillCmd(); } @@ -322,23 +322,23 @@ FillDateCmd AbstractScFillSeriesDlg_Impl::GetFillDateCmd() const return pDlg->GetFillDateCmd(); } -double AbstractScFillSeriesDlg_Impl::GetStart() const +double AbstractScFillSeriesDlg_Impl::GetStart() const { return pDlg->GetStart(); } -double AbstractScFillSeriesDlg_Impl::GetStep() const +double AbstractScFillSeriesDlg_Impl::GetStep() const { return pDlg->GetStep(); } -double AbstractScFillSeriesDlg_Impl::GetMax() const +double AbstractScFillSeriesDlg_Impl::GetMax() const { return pDlg->GetMax(); } -String AbstractScFillSeriesDlg_Impl::GetStartStr() const +String AbstractScFillSeriesDlg_Impl::GetStartStr() const { return pDlg->GetStartStr(); } -void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(BOOL bFlag) +void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(BOOL bFlag) { pDlg->SetEdStartValEnabled(bFlag); } @@ -368,42 +368,42 @@ USHORT AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() const } -USHORT AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const +USHORT AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const { return pDlg->GetFormulaCmdBits(); } -BOOL AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const +BOOL AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const { return pDlg->IsSkipEmptyCells(); } -BOOL AbstractScInsertContentsDlg_Impl::IsLink() const +BOOL AbstractScInsertContentsDlg_Impl::IsLink() const { return pDlg->IsLink(); } -void AbstractScInsertContentsDlg_Impl::SetFillMode( BOOL bSet ) +void AbstractScInsertContentsDlg_Impl::SetFillMode( BOOL bSet ) { pDlg->SetFillMode( bSet ); } -void AbstractScInsertContentsDlg_Impl::SetOtherDoc( BOOL bSet ) +void AbstractScInsertContentsDlg_Impl::SetOtherDoc( BOOL bSet ) { pDlg->SetOtherDoc( bSet ); } -BOOL AbstractScInsertContentsDlg_Impl::IsTranspose() const +BOOL AbstractScInsertContentsDlg_Impl::IsTranspose() const { return pDlg->IsTranspose(); } -void AbstractScInsertContentsDlg_Impl::SetChangeTrack( BOOL bSet ) +void AbstractScInsertContentsDlg_Impl::SetChangeTrack( BOOL bSet ) { pDlg->SetChangeTrack( bSet ); } -void AbstractScInsertContentsDlg_Impl::SetCellShiftDisabled( int nDisable ) +void AbstractScInsertContentsDlg_Impl::SetCellShiftDisabled( int nDisable ) { pDlg->SetCellShiftDisabled( nDisable ); } -InsCellCmd AbstractScInsertContentsDlg_Impl::GetMoveMode() +InsCellCmd AbstractScInsertContentsDlg_Impl::GetMoveMode() { return pDlg->GetMoveMode(); } @@ -416,27 +416,27 @@ BOOL AbstractScInsertTableDlg_Impl::GetTablesFromFile() return pDlg->GetTablesFromFile(); } -BOOL AbstractScInsertTableDlg_Impl::GetTablesAsLink() +BOOL AbstractScInsertTableDlg_Impl::GetTablesAsLink() { return pDlg->GetTablesAsLink(); } -const String* AbstractScInsertTableDlg_Impl::GetFirstTable( USHORT* pN ) +const String* AbstractScInsertTableDlg_Impl::GetFirstTable( USHORT* pN ) { return pDlg->GetFirstTable( pN ); } -ScDocShell* AbstractScInsertTableDlg_Impl::GetDocShellTables() +ScDocShell* AbstractScInsertTableDlg_Impl::GetDocShellTables() { return pDlg->GetDocShellTables(); } -BOOL AbstractScInsertTableDlg_Impl::IsTableBefore() +BOOL AbstractScInsertTableDlg_Impl::IsTableBefore() { return pDlg->IsTableBefore(); } -USHORT AbstractScInsertTableDlg_Impl::GetTableCount() +USHORT AbstractScInsertTableDlg_Impl::GetTableCount() { return pDlg->GetTableCount(); } -const String* AbstractScInsertTableDlg_Impl::GetNextTable( USHORT* pN ) +const String* AbstractScInsertTableDlg_Impl::GetNextTable( USHORT* pN ) { return pDlg->GetNextTable( pN ); } @@ -457,23 +457,23 @@ void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const String& rFile, const S pDlg->InitFromOldLink( rFile, rFilter, rOptions, rSource, nRefresh); } -String AbstractScLinkedAreaDlg_Impl::GetURL() +String AbstractScLinkedAreaDlg_Impl::GetURL() { return pDlg->GetURL(); } -String AbstractScLinkedAreaDlg_Impl::GetFilter() +String AbstractScLinkedAreaDlg_Impl::GetFilter() { return pDlg->GetFilter(); } -String AbstractScLinkedAreaDlg_Impl::GetOptions() +String AbstractScLinkedAreaDlg_Impl::GetOptions() { return pDlg->GetOptions(); } -String AbstractScLinkedAreaDlg_Impl::GetSource() +String AbstractScLinkedAreaDlg_Impl::GetSource() { return pDlg->GetSource(); } -ULONG AbstractScLinkedAreaDlg_Impl::GetRefresh() +ULONG AbstractScLinkedAreaDlg_Impl::GetRefresh() { return pDlg->GetRefresh(); } @@ -494,19 +494,19 @@ USHORT AbstractScMoveTableDlg_Impl::GetSelectedDocument() const //add for ScMove return pDlg->GetSelectedDocument(); } -USHORT AbstractScMoveTableDlg_Impl::GetSelectedTable() const +USHORT AbstractScMoveTableDlg_Impl::GetSelectedTable() const { return pDlg->GetSelectedTable(); } -BOOL AbstractScMoveTableDlg_Impl::GetCopyTable() const +BOOL AbstractScMoveTableDlg_Impl::GetCopyTable() const { return pDlg->GetCopyTable(); } -void AbstractScMoveTableDlg_Impl::SetCopyTable(BOOL bFla) +void AbstractScMoveTableDlg_Impl::SetCopyTable(BOOL bFla) { return pDlg->SetCopyTable( bFla ); } -void AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag) +void AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag) { return pDlg->EnableCopyTable( bFlag); } @@ -528,7 +528,7 @@ String AbstractScNamePasteDlg_Impl::GetSelectedName() const //add for ScNamePas //add for AbstractScNamePasteDlg_Impl end //add for AbstractScPivotFilterDlg_Impl begin -const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem() //add for ScPivotFilterDlg +const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem() //add for ScPivotFilterDlg { return pDlg->GetOutputItem(); } @@ -599,11 +599,11 @@ void AbstractScShowTabDlg_Impl::Insert( const String& rString, BOOL bSelected ) pDlg->Insert( rString, bSelected); } -USHORT AbstractScShowTabDlg_Impl::GetSelectEntryCount() const +USHORT AbstractScShowTabDlg_Impl::GetSelectEntryCount() const { return pDlg->GetSelectEntryCount(); } -void AbstractScShowTabDlg_Impl::SetDescription( +void AbstractScShowTabDlg_Impl::SetDescription( const String& rTitle, const String& rFixedText, ULONG nDlgHelpId, ULONG nLbHelpId ) { @@ -613,7 +613,7 @@ USHORT AbstractScShowTabDlg_Impl::GetSelectEntryPos(USHORT nPos) const { return pDlg->GetSelectEntryPos( nPos); } -String AbstractScShowTabDlg_Impl::GetSelectEntry(USHORT nPos) const +String AbstractScShowTabDlg_Impl::GetSelectEntry(USHORT nPos) const { return pDlg->GetSelectEntry(nPos); } @@ -693,8 +693,8 @@ AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImpor //add for ScAutoFormatDlg begin -AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg - ScAutoFormat* pAutoFormat, +AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg + ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc, int nId) @@ -741,11 +741,11 @@ AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg //add for ScColOrRowDlg begin -VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* pParent, - const String& rStrTitle, - const String& rStrLabel, +VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* pParent, + const String& rStrTitle, + const String& rStrLabel, int nId, - BOOL bColDefault) + BOOL bColDefault) { Dialog * pDlg=NULL; switch ( nId ) @@ -764,7 +764,7 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* //add for ScColOrRowDlg end //add for ScSortWarningDlg begin -VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const String& rExtendText, +VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) { Dialog * pDlg=NULL; @@ -870,7 +870,7 @@ AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Wi //add for ScDeleteCellDlg end //add for ScDataFormDlg begin -AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell* pTabViewShell ) +AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell* pTabViewShell ) { ScDataFormDlg * pDlg=NULL; switch ( nId ) @@ -911,15 +911,15 @@ AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContent //add for ScDeleteContentsDlg end //add for ScFillSeriesDlg begin -AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg - ScDocument& rDocument, - FillDir eFillDir, - FillCmd eFillCmd, - FillDateCmd eFillDateCmd, - String aStartStr, - double fStep, - double fMax, - USHORT nPossDir, +AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg + ScDocument& rDocument, + FillDir eFillDir, + FillCmd eFillCmd, + FillDateCmd eFillDateCmd, + String aStartStr, + double fStep, + double fMax, + USHORT nPossDir, int nId) { ScFillSeriesDlg * pDlg=NULL; @@ -941,10 +941,10 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi //add for ScGroupDlg begin AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Window* pParent, - USHORT nResId, + USHORT nResId, int nId, - BOOL bUnGroup , - BOOL bRows ) + BOOL bUnGroup , + BOOL bRows ) { ScGroupDlg * pDlg=NULL; switch ( nId ) @@ -988,10 +988,10 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W //add for ScInsertCellDlg end //add for ScInsertContentsDlg begin -AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window* pParent, +AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window* pParent, int nId, - USHORT nCheckDefaults, - const String* pStrTitle ) + USHORT nCheckDefaults, + const String* pStrTitle ) { ScInsertContentsDlg * pDlg=NULL; switch ( nId ) @@ -1031,10 +1031,10 @@ AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg // add for ScSelEntryDlg begin AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent, - USHORT nResId, + USHORT nResId, const String& aTitle, const String& aLbTitle, - List& aEntryList, + List& aEntryList, int nId ) { ScSelEntryDlg * pDlg=NULL; @@ -1074,16 +1074,16 @@ AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg ( //add for ScLinkedAreaDlg end //add for ScMetricInputDlg begin -AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ( Window* pParent, - USHORT nResId, // Ableitung fuer jeden Dialog! - long nCurrent, - long nDefault, +AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ( Window* pParent, + USHORT nResId, // Ableitung fuer jeden Dialog! + long nCurrent, + long nDefault, int nId , - FieldUnit eFUnit, - USHORT nDecimals, - long nMaximum , - long nMinimum, - long nFirst, + FieldUnit eFUnit, + USHORT nDecimals, + long nMaximum , + long nMinimum, + long nFirst, long nLast ) { ScMetricInputDlg * pDlg=NULL; @@ -1169,7 +1169,7 @@ AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg ( //add for ScPivotFilterDlg begin AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg ( Window* pParent, - const SfxItemSet& rArgSet, USHORT nSourceTab , int nId ) + const SfxItemSet& rArgSet, USHORT nSourceTab , int nId ) { ScPivotFilterDlg * pDlg=NULL; switch ( nId ) @@ -1355,11 +1355,11 @@ return 0; //add for ScTabBgColorDlg end //add for ScImportOptionsDlg begin -AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* pParent, +AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* pParent, int nId, BOOL bAscii, - const ScImportOptions* pOptions, - const String* pStrTitle, + const ScImportOptions* pOptions, + const String* pStrTitle, BOOL bMultiByte, BOOL bOnlyDbtoolsEncodings, BOOL bImport ) @@ -1385,8 +1385,8 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions #define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl #endif /* ENABLE_LAYOUT */ //add for ScAttrDlg begin -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFrame* pFrame, - Window* pParent, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFrame* pFrame, + Window* pParent, const SfxItemSet* pCellAttrs, int nId) { @@ -1410,12 +1410,12 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFra #undef AbstractTabDialog_Impl //add for ScHFEditDlg begin -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame, - Window* pParent, - const SfxItemSet& rCoreSet, - const String& rPageStyle, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame, + Window* pParent, + const SfxItemSet& rCoreSet, + const String& rPageStyle, int nId, - USHORT nResId ) + USHORT nResId ) { SfxTabDialog* pDlg=NULL; switch ( nId ) @@ -1434,9 +1434,9 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF //add for ScHFEditDlg end //add for ScStyleDlg begin -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* pParent, - SfxStyleSheetBase& rStyleBase, - USHORT nRscId, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* pParent, + SfxStyleSheetBase& rStyleBase, + USHORT nRscId, int nId) { SfxTabDialog* pDlg=NULL; @@ -1457,8 +1457,8 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* //add for ScStyleDlg end //add for ScSubTotalDlg begin -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window* pParent, - const SfxItemSet* pArgSet, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window* pParent, + const SfxItemSet* pArgSet, int nId) { SfxTabDialog* pDlg=NULL; @@ -1520,7 +1520,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo //add for ScValidationDlg begin SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Window* pParent, //<!--Modified by PengYunQuan for Validity Cell Range Picker -// const SfxItemSet* pArgSet,int nId ) +// const SfxItemSet* pArgSet,int nId ) const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) //-->Modified by PengYunQuan for Validity Cell Range Picke { @@ -1548,7 +1548,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Wind #define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl #endif /* ENABLE_LAYOUT */ //add for ScSortDlg begin -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* pParent, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* pParent, const SfxItemSet* pArgSet,int nId ) { SfxTabDialog* pDlg=NULL; @@ -1577,17 +1577,17 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId ) case RID_SCPAGE_OPREDLINE : return ScRedlineOptionsTabPage::Create; //break; - case RID_SCPAGE_CALC : + case RID_SCPAGE_CALC : return ScTpCalcOptions::Create; //break; case RID_SCPAGE_FORMULA: return ScTpFormulaOptions::Create; case RID_SCPAGE_COMPATIBILITY: return ScTpCompatOptions::Create; - case RID_SCPAGE_PRINT : + case RID_SCPAGE_PRINT : return ScTpPrintOptions::Create; //break; - case RID_SCPAGE_STAT : + case RID_SCPAGE_STAT : return ScDocStatPage::Create; //break; case RID_SCPAGE_USERLISTS : diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 9815fd22d51e..f1ec2a54c7ad 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.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 @@ -66,14 +66,14 @@ class SfxTabDialog; class ScSortWarningDlg; class ScTextImportOptionsDlg; -#define DECL_ABSTDLG_BASE(Class,DialogClass) \ - DialogClass* pDlg; \ -public: \ - Class( DialogClass* p) \ - : pDlg(p) \ +#define DECL_ABSTDLG_BASE(Class,DialogClass) \ + DialogClass* pDlg; \ +public: \ + Class( DialogClass* p) \ + : pDlg(p) \ {} \ - virtual ~Class(); \ - virtual short Execute() ; + virtual ~Class(); \ + virtual short Execute() ; #define DECL_ABSTDLG2_BASE(Class,DialogClass) \ DialogClass* pDlg; \ @@ -86,13 +86,13 @@ public: \ long GetResult(); #define IMPL_ABSTDLG_BASE(Class) \ -Class::~Class() \ +Class::~Class() \ { \ - delete pDlg; \ -} \ + delete pDlg; \ +} \ short Class::Execute() \ { \ - return pDlg->Execute(); \ + return pDlg->Execute(); \ } #define IMPL_ABSTDLG2_BASE(Class) \ @@ -139,24 +139,24 @@ class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg //add for class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDlg //add for ScDataPilotDatabaseDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl, ScDataPilotDatabaseDlg) - virtual void GetValues( ScImportSourceDesc& rDesc ); + virtual void GetValues( ScImportSourceDesc& rDesc ); }; class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg //add for ScDataPilotSourceTypeDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl, ScDataPilotSourceTypeDlg) - virtual BOOL IsDatabase() const; - virtual BOOL IsExternal() const; + virtual BOOL IsDatabase() const; + virtual BOOL IsExternal() const; }; class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg //add for ScDataPilotServiceDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl, ScDataPilotServiceDlg) - virtual String GetServiceName() const; - virtual String GetParSource() const; - virtual String GetParName() const; - virtual String GetParUser() const; - virtual String GetParPass() const; + virtual String GetServiceName() const; + virtual String GetParSource() const; + virtual String GetParName() const; + virtual String GetParUser() const; + virtual String GetParPass() const; }; class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg //add for ScDeleteCellDlg @@ -174,21 +174,21 @@ class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg //add for ScDat class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg //add for ScDeleteContentsDlg { DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg) - virtual void DisableObjects(); - virtual USHORT GetDelContentsCmdBits() const; + virtual void DisableObjects(); + virtual USHORT GetDelContentsCmdBits() const; }; class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg //add for ScFillSeriesDlg { DECL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl, ScFillSeriesDlg) - virtual FillDir GetFillDir() const; - virtual FillCmd GetFillCmd() const; - virtual FillDateCmd GetFillDateCmd() const; - virtual double GetStart() const; - virtual double GetStep() const; - virtual double GetMax() const; - virtual String GetStartStr() const; - virtual void SetEdStartValEnabled(BOOL bFlag=FALSE); + virtual FillDir GetFillDir() const; + virtual FillCmd GetFillCmd() const; + virtual FillDateCmd GetFillDateCmd() const; + virtual double GetStart() const; + virtual double GetStep() const; + virtual double GetMax() const; + virtual String GetStartStr() const; + virtual void SetEdStartValEnabled(BOOL bFlag=FALSE); }; class AbstractScGroupDlg_Impl : public AbstractScGroupDlg //add for ScGroupDlg @@ -206,28 +206,28 @@ class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg //add for S class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg //add for ScInsertContentsDlg { DECL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl, ScInsertContentsDlg) - virtual USHORT GetInsContentsCmdBits() const; - virtual USHORT GetFormulaCmdBits() const; - virtual BOOL IsSkipEmptyCells() const; - virtual BOOL IsLink() const; - virtual void SetFillMode( BOOL bSet ); - virtual void SetOtherDoc( BOOL bSet ); - virtual BOOL IsTranspose() const; - virtual void SetChangeTrack( BOOL bSet ); - virtual void SetCellShiftDisabled( int nDisable ); - virtual InsCellCmd GetMoveMode(); + virtual USHORT GetInsContentsCmdBits() const; + virtual USHORT GetFormulaCmdBits() const; + virtual BOOL IsSkipEmptyCells() const; + virtual BOOL IsLink() const; + virtual void SetFillMode( BOOL bSet ); + virtual void SetOtherDoc( BOOL bSet ); + virtual BOOL IsTranspose() const; + virtual void SetChangeTrack( BOOL bSet ); + virtual void SetCellShiftDisabled( int nDisable ); + virtual InsCellCmd GetMoveMode(); }; class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg //add for ScInsertTableDlg { DECL_ABSTDLG_BASE( AbstractScInsertTableDlg_Impl, ScInsertTableDlg) - virtual BOOL GetTablesFromFile(); - virtual BOOL GetTablesAsLink(); - virtual const String* GetFirstTable( USHORT* pN = NULL ); - virtual ScDocShell* GetDocShellTables(); - virtual BOOL IsTableBefore(); - virtual USHORT GetTableCount(); - virtual const String* GetNextTable( USHORT* pN = NULL ); + virtual BOOL GetTablesFromFile(); + virtual BOOL GetTablesAsLink(); + virtual const String* GetFirstTable( USHORT* pN = NULL ); + virtual ScDocShell* GetDocShellTables(); + virtual BOOL IsTableBefore(); + virtual USHORT GetTableCount(); + virtual const String* GetNextTable( USHORT* pN = NULL ); }; @@ -241,14 +241,14 @@ class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg //add for S { DECL_ABSTDLG2_BASE( AbstractScLinkedAreaDlg_Impl, ScLinkedAreaDlg) - virtual void InitFromOldLink( const String& rFile, const String& rFilter, + virtual void InitFromOldLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, ULONG nRefresh ); - virtual String GetURL(); - virtual String GetFilter(); // may be empty - virtual String GetOptions(); // filter options - virtual String GetSource(); // separated by ";" - virtual ULONG GetRefresh(); // 0 if disabled + virtual String GetURL(); + virtual String GetFilter(); // may be empty + virtual String GetOptions(); // filter options + virtual String GetSource(); // separated by ";" + virtual ULONG GetRefresh(); // 0 if disabled }; class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg //add for ScMetricInputDlg @@ -260,29 +260,29 @@ class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg //add for class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScMoveTableDlg { DECL_ABSTDLG_BASE( AbstractScMoveTableDlg_Impl, ScMoveTableDlg) - virtual USHORT GetSelectedDocument () const; - virtual USHORT GetSelectedTable () const; - virtual BOOL GetCopyTable () const; - virtual void SetCopyTable (BOOL bFlag=TRUE); - virtual void EnableCopyTable (BOOL bFlag=TRUE); + virtual USHORT GetSelectedDocument () const; + virtual USHORT GetSelectedTable () const; + virtual BOOL GetCopyTable () const; + virtual void SetCopyTable (BOOL bFlag=TRUE); + virtual void EnableCopyTable (BOOL bFlag=TRUE); }; class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg //add for ScNameCreateDlg { DECL_ABSTDLG_BASE( AbstractScNameCreateDlg_Impl, ScNameCreateDlg) - virtual USHORT GetFlags() const; + virtual USHORT GetFlags() const; }; class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg //add for ScNamePasteDlg { DECL_ABSTDLG_BASE( AbstractScNamePasteDlg_Impl, ScNamePasteDlg ) - virtual String GetSelectedName() const; + virtual String GetSelectedName() const; }; class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg //add for ScPivotFilterDlg { DECL_ABSTDLG_BASE( AbstractScPivotFilterDlg_Impl, ScPivotFilterDlg) - virtual const ScQueryItem& GetOutputItem(); + virtual const ScQueryItem& GetOutputItem(); }; class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg //add for ScDPFunctionDlg @@ -332,9 +332,9 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowT { DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg) virtual void Insert( const String& rString, BOOL bSelected ); - virtual USHORT GetSelectEntryCount() const; + virtual USHORT GetSelectEntryCount() const; virtual void SetDescription(const String& rTitle, const String& rFixedText,ULONG nDlgHelpId, ULONG nLbHelpId ); - virtual String GetSelectEntry(USHORT nPos) const; + virtual String GetSelectEntry(USHORT nPos) const; virtual USHORT GetSelectEntryPos(USHORT nPos) const; }; @@ -367,13 +367,13 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl class AbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; #if ENABLE_LAYOUT namespace layout @@ -382,13 +382,13 @@ namespace layout class AbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; } // end namespace layout #endif /* ENABLE_LAYOUT */ @@ -398,14 +398,14 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory { public: - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg + virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg SvStream* pInStream, int nId, sal_Unicode cSep = '\t'); virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId ); - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg - ScAutoFormat* pAutoFormat, + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg + ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc, int nId); @@ -414,11 +414,11 @@ public: BOOL bCol = FALSE, BOOL bRow = FALSE); - virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg - const String& rStrTitle, - const String& rStrLabel, + virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg + const String& rStrTitle, + const String& rStrLabel, int nId, - BOOL bColDefault = TRUE ); + BOOL bColDefault = TRUE ); virtual VclAbstractDialog * CreateScSortWarningDlg( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ); @@ -438,54 +438,54 @@ public: virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg USHORT nCheckDefaults = 0 ); - virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg - ScDocument& rDocument, - FillDir eFillDir, - FillCmd eFillCmd, - FillDateCmd eFillDateCmd, - String aStartStr, - double fStep, - double fMax, - USHORT nPossDir, + virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg + ScDocument& rDocument, + FillDir eFillDir, + FillCmd eFillCmd, + FillDateCmd eFillDateCmd, + String aStartStr, + double fStep, + double fMax, + USHORT nPossDir, int nId); virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg - USHORT nResId, + USHORT nResId, int nId, - BOOL bUnGroup = FALSE, - BOOL bRows = TRUE ); + BOOL bUnGroup = FALSE, + BOOL bRows = TRUE ); virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg int nId, BOOL bDisallowCellMove = FALSE ); - virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg + virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg int nId, - USHORT nCheckDefaults = 0, - const String* pStrTitle = NULL ); + USHORT nCheckDefaults = 0, + const String* pStrTitle = NULL ); virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData, //add for ScInsertTableDlg SCTAB nTabCount, bool bFromFile, int nId); virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg - USHORT nResId, + USHORT nResId, const String& aTitle, const String& aLbTitle, - List& aEntryList, + List& aEntryList, int nId ); virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg ( Window* pParent, //add for ScLinkedAreaDlg int nId); - virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg - USHORT nResId, // Ableitung fuer jeden Dialog! - long nCurrent, - long nDefault, + virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg + USHORT nResId, // Ableitung fuer jeden Dialog! + long nCurrent, + long nDefault, int nId , - FieldUnit eFUnit = FUNIT_MM, - USHORT nDecimals = 2, - long nMaximum = 1000, - long nMinimum = 0, - long nFirst = 1, + FieldUnit eFUnit = FUNIT_MM, + USHORT nDecimals = 2, + long nMaximum = 1000, + long nMinimum = 0, + long nFirst = 1, long nLast = 100 ); virtual AbstractScMoveTableDlg * CreateScMoveTableDlg( Window* pParent, int nId ); //add for ScMoveTableDlg @@ -495,7 +495,7 @@ public: int nId , BOOL bInsList=TRUE ); virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg - const SfxItemSet& rArgSet, USHORT nSourceTab , int nId ); + const SfxItemSet& rArgSet, USHORT nSourceTab , int nId ); virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId, const ScDPLabelDataVec& rLabelVec, @@ -542,33 +542,33 @@ public: ULONG nHelpId , int nId ); - virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg + virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg int nId, BOOL bAscii = TRUE, - const ScImportOptions* pOptions = NULL, - const String* pStrTitle = NULL, + const ScImportOptions* pOptions = NULL, + const String* pStrTitle = NULL, BOOL bMultiByte = FALSE, BOOL bOnlyDbtoolsEncodings = FALSE, BOOL bImport = TRUE ); - virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg - Window* pParent, + virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg + Window* pParent, const SfxItemSet* pCellAttrs, int nId); - virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg - Window* pParent, - const SfxItemSet& rCoreSet, - const String& rPageStyle, + virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg + Window* pParent, + const SfxItemSet& rCoreSet, + const String& rPageStyle, int nId, - USHORT nResId = RID_SCDLG_HFEDIT ); + USHORT nResId = RID_SCDLG_HFEDIT ); - virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg - SfxStyleSheetBase& rStyleBase, - USHORT nRscId, + virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg + SfxStyleSheetBase& rStyleBase, + USHORT nRscId, int nId); - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg - const SfxItemSet* pArgSet, + virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg + const SfxItemSet* pArgSet, int nId); virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,//add for ScCharDlg const SfxObjectShell* pDocShell, int nId ); @@ -579,12 +579,12 @@ public: virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ); - virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg + virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg const SfxItemSet* pArgSet,int nId ); // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ); + virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ); - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ); + virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ); }; diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx index 41ed3cdf9502..9f5dbc1dc3e8 100644 --- a/sc/source/ui/attrdlg/scuiexp.cxx +++ b/sc/source/ui/attrdlg/scuiexp.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 @@ -42,7 +42,7 @@ namespace scui if ( !pFactory ) pFactory = new ScAbstractDialogFactory_Impl; //if ( !pSwResMgr) - // ScDialogsResMgr::GetResMgr(); + // ScDialogsResMgr::GetResMgr(); return pFactory; } } diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 84298f174211..ecc536c0ba6c 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.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 @@ -55,31 +55,31 @@ static USHORT pProtectionRanges[] = // Zellschutz-Tabpage: //======================================================================== -ScTabPageProtection::ScTabPageProtection( Window* pParent, +ScTabPageProtection::ScTabPageProtection( Window* pParent, const SfxItemSet& rCoreAttrs ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_PROTECTION ), rCoreAttrs ), // aFlProtect ( this, ScResId( FL_PROTECTION ) ), - aBtnHideCell ( this, ScResId( BTN_HIDE_ALL ) ), - aBtnProtect ( this, ScResId( BTN_PROTECTED ) ), - aBtnHideFormula ( this, ScResId( BTN_HIDE_FORMULAR ) ), - aTxtHint ( this, ScResId( FT_HINT ) ), + aBtnHideCell ( this, ScResId( BTN_HIDE_ALL ) ), + aBtnProtect ( this, ScResId( BTN_PROTECTED ) ), + aBtnHideFormula ( this, ScResId( BTN_HIDE_FORMULAR ) ), + aTxtHint ( this, ScResId( FT_HINT ) ), aFlPrint ( this, ScResId( FL_PRINT ) ), - aBtnHidePrint ( this, ScResId( BTN_HIDE_PRINT ) ), + aBtnHidePrint ( this, ScResId( BTN_HIDE_PRINT ) ), aTxtHint2 ( this, ScResId( FT_HINT2 ) ) { // diese Page braucht ExchangeSupport SetExchangeSupport(); - // States werden in Reset gesetzt + // States werden in Reset gesetzt bTriEnabled = bDontCare = bProtect = bHideForm = bHideCell = bHidePrint = FALSE; - aBtnProtect.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); - aBtnHideCell.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); + aBtnProtect.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); + aBtnHideCell.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); aBtnHideFormula.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); - aBtnHidePrint.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); + aBtnHidePrint.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); FreeResource(); } @@ -99,8 +99,8 @@ USHORT* __EXPORT ScTabPageProtection::GetRanges() // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTabPageProtection::Create( Window* pParent, - const SfxItemSet& rAttrSet ) +SfxTabPage* __EXPORT ScTabPageProtection::Create( Window* pParent, + const SfxItemSet& rAttrSet ) { return ( new ScTabPageProtection( pParent, rAttrSet ) ); } @@ -109,7 +109,7 @@ SfxTabPage* __EXPORT ScTabPageProtection::Create( Window* pParent, void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) { - // Variablen initialisieren + // Variablen initialisieren USHORT nWhich = GetWhich( SID_SCATTR_PROTECTION ); const ScProtectionAttr* pProtAttr = NULL; @@ -121,13 +121,13 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) pProtAttr = (const ScProtectionAttr*)&(rCoreAttrs.Get(nWhich)); // bei SFX_ITEM_DONTCARE auf 0 lassen - bTriEnabled = ( pProtAttr == NULL ); // TriState, wenn DontCare + bTriEnabled = ( pProtAttr == NULL ); // TriState, wenn DontCare bDontCare = bTriEnabled; if (bTriEnabled) { - // Defaults, die erscheinen wenn ein TriState weggeklickt wird: - // (weil alles zusammen ein Attribut ist, kann auch nur alles zusammen - // auf DontCare stehen - #38543#) + // Defaults, die erscheinen wenn ein TriState weggeklickt wird: + // (weil alles zusammen ein Attribut ist, kann auch nur alles zusammen + // auf DontCare stehen - #38543#) bProtect = TRUE; bHideForm = bHideCell = bHidePrint = FALSE; } @@ -139,12 +139,12 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) bHidePrint = pProtAttr->GetHidePrint(); } - // Controls initialisieren + // Controls initialisieren - aBtnProtect .EnableTriState( bTriEnabled ); - aBtnHideCell .EnableTriState( bTriEnabled ); - aBtnHideFormula .EnableTriState( bTriEnabled ); - aBtnHidePrint .EnableTriState( bTriEnabled ); + aBtnProtect .EnableTriState( bTriEnabled ); + aBtnHideCell .EnableTriState( bTriEnabled ); + aBtnHideFormula .EnableTriState( bTriEnabled ); + aBtnHidePrint .EnableTriState( bTriEnabled ); UpdateButtons(); } @@ -153,12 +153,12 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) { - BOOL bAttrsChanged = FALSE; - USHORT nWhich = GetWhich( SID_SCATTR_PROTECTION ); - const SfxPoolItem* pOldItem = GetOldItem( rCoreAttrs, SID_SCATTR_PROTECTION ); - const SfxItemSet& rOldSet = GetItemSet(); - SfxItemState eItemState = rOldSet.GetItemState( nWhich, FALSE ); - ScProtectionAttr aProtAttr; + BOOL bAttrsChanged = FALSE; + USHORT nWhich = GetWhich( SID_SCATTR_PROTECTION ); + const SfxPoolItem* pOldItem = GetOldItem( rCoreAttrs, SID_SCATTR_PROTECTION ); + const SfxItemSet& rOldSet = GetItemSet(); + SfxItemState eItemState = rOldSet.GetItemState( nWhich, FALSE ); + ScProtectionAttr aProtAttr; if ( !bDontCare ) { @@ -168,7 +168,7 @@ BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) aProtAttr.SetHidePrint( bHidePrint ); if ( bTriEnabled ) - bAttrsChanged = TRUE; // DontCare -> richtiger Wert + bAttrsChanged = TRUE; // DontCare -> richtiger Wert else bAttrsChanged = !pOldItem || !( aProtAttr == *(const ScProtectionAttr*)pOldItem ); } @@ -199,11 +199,11 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) { TriState eState = pBox->GetState(); if ( eState == STATE_DONTKNOW ) - bDontCare = TRUE; // alles zusammen auf DontCare + bDontCare = TRUE; // alles zusammen auf DontCare else { - bDontCare = FALSE; // DontCare ueberall aus - BOOL bOn = ( eState == STATE_CHECK ); // ausgewaehlter Wert + bDontCare = FALSE; // DontCare ueberall aus + BOOL bOn = ( eState == STATE_CHECK ); // ausgewaehlter Wert if ( pBox == &aBtnProtect ) bProtect = bOn; @@ -219,7 +219,7 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) } } - UpdateButtons(); // TriState und Enable-Logik + UpdateButtons(); // TriState und Enable-Logik return 0; } diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index 4634b179664a..d6e072901a6e 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.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 @@ -36,11 +36,11 @@ #include "cbutton.hxx" //======================================================================== -// class ScDDComboBoxButton +// class ScDDComboBoxButton //======================================================================== ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice ) - : pOut( pOutputDevice ) + : pOut( pOutputDevice ) { SetOptSizePixel(); } @@ -69,31 +69,31 @@ void ScDDComboBoxButton::SetOptSizePixel() // ------------------------------------------------------------------------- -void ScDDComboBoxButton::Draw( const Point& rAt, - const Size& rSize, +void ScDDComboBoxButton::Draw( const Point& rAt, + const Size& rSize, BOOL bState, - BOOL bBtnIn /* = FALSE */ ) + BOOL bBtnIn /* = FALSE */ ) { if ( rSize.Width() == 0 || rSize.Height() == 0 ) return; // #i43092# rectangle with size 0 would have RECT_EMPTY as end position // save old state - BOOL bHadFill = pOut->IsFillColor(); - Color aOldFill = pOut->GetFillColor(); - BOOL bHadLine = pOut->IsLineColor(); - Color aOldLine = pOut->GetLineColor(); - BOOL bOldEnable = pOut->IsMapModeEnabled(); + BOOL bHadFill = pOut->IsFillColor(); + Color aOldFill = pOut->GetFillColor(); + BOOL bHadLine = pOut->IsLineColor(); + Color aOldLine = pOut->GetLineColor(); + BOOL bOldEnable = pOut->IsMapModeEnabled(); - Size aLogPix( 1, 1 ); - Rectangle aBtnRect( rAt, rSize ); - Rectangle aInnerRect = aBtnRect; + Size aLogPix( 1, 1 ); + Rectangle aBtnRect( rAt, rSize ); + Rectangle aInnerRect = aBtnRect; pOut->EnableMapMode( FALSE ); DecorationView aDecoView( pOut); USHORT nButtonStyle = BUTTON_DRAW_DEFAULT; - if( bBtnIn ) // gedrueckt? + if( bBtnIn ) // gedrueckt? { nButtonStyle = BUTTON_DRAW_PRESSED; } @@ -134,9 +134,9 @@ void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect, { // no need to save old line and fill color here (is restored after the call) - Rectangle aPixRect = rRect; - Point aCenter = aPixRect.Center(); - Size aSize = aPixRect.GetSize(); + Rectangle aPixRect = rRect; + Point aCenter = aPixRect.Center(); + Size aSize = aPixRect.GetSize(); Size aSize3; aSize3.Width() = aSize.Width() >> 1; diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index 78c1871c1e1e..8fc8dcb1ed44 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.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 @@ -131,7 +131,7 @@ void ScDPFieldButton::draw() const long nMargin = 2; bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled(); mpOutDev->EnableMapMode(false); - + if (mbBaseButton) { // Background @@ -139,18 +139,18 @@ void ScDPFieldButton::draw() mpOutDev->SetLineColor(mpStyle->GetFaceColor()); mpOutDev->SetFillColor(mpStyle->GetFaceColor()); mpOutDev->DrawRect(aRect); - + // Border lines mpOutDev->SetLineColor(mpStyle->GetLightColor()); mpOutDev->DrawLine(Point(maPos), Point(maPos.X(), maPos.Y()+maSize.Height()-1)); mpOutDev->DrawLine(Point(maPos), Point(maPos.X()+maSize.Width()-1, maPos.Y())); - + mpOutDev->SetLineColor(mpStyle->GetShadowColor()); mpOutDev->DrawLine(Point(maPos.X(), maPos.Y()+maSize.Height()-1), Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1)); mpOutDev->DrawLine(Point(maPos.X()+maSize.Width()-1, maPos.Y()), Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1)); - + // Field name. // Get the font and size the same way as in scenario selection (lcl_DrawOneFrame in gridwin4.cxx) Font aTextFont( mpStyle->GetAppFont() ); @@ -164,7 +164,7 @@ void ScDPFieldButton::draw() } mpOutDev->SetFont(aTextFont); mpOutDev->SetTextColor(mpStyle->GetButtonTextColor()); - + Point aTextPos = maPos; long nTHeight = mpOutDev->GetTextHeight(); aTextPos.setX(maPos.getX() + nMargin); @@ -186,7 +186,7 @@ void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const { long nW = maSize.getWidth() / 2; long nH = maSize.getHeight(); - if (nW > 18) + if (nW > 18) nW = 18; if (nH > 18) nH = 18; @@ -214,12 +214,12 @@ void ScDPFieldButton::drawPopupButton() mpOutDev->DrawRect(Rectangle(aPos, aSize)); if (!mbPopupPressed) - { + { // border lines mpOutDev->SetLineColor(mpStyle->GetLightColor()); mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+1, aPos.Y()+aSize.Height()-2)); mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+aSize.Width()-2, aPos.Y()+1)); - + mpOutDev->SetLineColor(mpStyle->GetShadowColor()); mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+aSize.Height()-2), Point(aPos.X()+aSize.Width()-2, aPos.Y()+aSize.Height()-2)); @@ -446,14 +446,14 @@ void ScMenuFloatingWindow::Paint(const Rectangle& /*rRect*/) Reference<XAccessible> ScMenuFloatingWindow::CreateAccessible() { if (!mxAccessible.is()) - { - Reference<XAccessible> xAccParent = mpParentMenu ? + { + Reference<XAccessible> xAccParent = mpParentMenu ? mpParentMenu->GetAccessible() : GetAccessibleParentWindow()->GetAccessible(); mxAccessible.set(new ScAccessibleFilterMenu(xAccParent, this, maName, 999, getDoc())); ScAccessibleFilterMenu* p = static_cast<ScAccessibleFilterMenu*>( mxAccessible.get()); - + vector<MenuItemData>::const_iterator itr, itrBeg = maMenuItems.begin(), itrEnd = maMenuItems.end(); for (itr = itrBeg; itr != itrEnd; ++itr) { @@ -516,7 +516,7 @@ void ScMenuFloatingWindow::drawAllMenuItems() { size_t n = maMenuItems.size(); for (size_t i = 0; i < n; ++i) - highlightMenuItem(i, i == mnSelectedMenu); + highlightMenuItem(i, i == mnSelectedMenu); } const Font& ScMenuFloatingWindow::getLabelFont() const @@ -546,10 +546,10 @@ void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, if (bEnsureSubMenu) { // Dismiss any child popup menu windows. - if (mnSelectedMenu < maMenuItems.size() && - maMenuItems[mnSelectedMenu].mpSubMenuWin && + if (mnSelectedMenu < maMenuItems.size() && + maMenuItems[mnSelectedMenu].mpSubMenuWin && maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible()) - { + { maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible(); } @@ -671,7 +671,7 @@ void ScMenuFloatingWindow::endSubMenu(ScMenuFloatingWindow* pSubMenu) size_t nMenuPos = getSubMenuPos(pSubMenu); if (nMenuPos != MENU_NOT_SELECTED) - { + { highlightMenuItem(nMenuPos, true); mnSelectedMenu = nMenuPos; fireMenuHighlightedEvent(); @@ -721,7 +721,7 @@ void ScMenuFloatingWindow::selectMenuItem(size_t nPos, bool bSelected, bool bSub } if (!maMenuItems[nPos].mbEnabled) - { + { queueCloseSubMenu(); return; } @@ -794,7 +794,7 @@ void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) { Push(PUSH_CLIPREGION); IntersectClipRegion(Rectangle(aPos, aSize)); - Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel()); + Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel()); DrawNativeControl( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, ImplControlValue(), OUString()); @@ -938,10 +938,10 @@ void ScMenuFloatingWindow::ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu) void ScMenuFloatingWindow::ensureSubMenuNotVisible() { - if (mnSelectedMenu <= maMenuItems.size() && - maMenuItems[mnSelectedMenu].mpSubMenuWin && + if (mnSelectedMenu <= maMenuItems.size() && + maMenuItems[mnSelectedMenu].mpSubMenuWin && maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible()) - { + { maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible(); } @@ -985,8 +985,8 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) : ScMenuFloatingWindow(pParent, pDoc), maChecks(this, 0), maChkToggleAll(this, 0), - maBtnSelectSingle (this, 0), - maBtnUnselectSingle(this, 0), + maBtnSelectSingle (this, 0), + maBtnUnselectSingle(this, 0), maBtnOk(this), maBtnCancel(this), mnCurTabStop(0), @@ -1073,7 +1073,7 @@ void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionTy // parameters calculated from constants. const sal_uInt16 nListBoxWidth = static_cast< sal_uInt16 >( maWndSize.Width() - nListBoxMargin*2 ); - const sal_uInt16 nListBoxHeight = static_cast< sal_uInt16 >( maWndSize.Height() - nTopMargin - nMenuHeight - + const sal_uInt16 nListBoxHeight = static_cast< sal_uInt16 >( maWndSize.Height() - nTopMargin - nMenuHeight - nMenuListMargin - nSingleItemBtnAreaHeight - nBottomBtnAreaHeight ); const sal_uInt16 nSingleBtnAreaY = nTopMargin + nMenuHeight + nListBoxHeight + nMenuListMargin - 1; @@ -1200,12 +1200,12 @@ IMPL_LINK( ScDPFieldPopupWindow, ButtonHdl, Button*, pBtn ) if (pBtn == &maBtnOk) close(true); else if (pBtn == &maBtnSelectSingle) - { + { selectCurrentMemberOnly(true); CheckHdl(&maChecks); } else if (pBtn == &maBtnUnselectSingle) - { + { selectCurrentMemberOnly(false); CheckHdl(&maChecks); } @@ -1314,7 +1314,7 @@ Window* ScDPFieldPopupWindow::GetPreferredKeyInputWindow() Reference<XAccessible> ScDPFieldPopupWindow::CreateAccessible() { if (!mxAccessible.is()) - { + { mxAccessible.set(new ScAccessibleFilterTopWindow( GetAccessibleParentWindow()->GetAccessible(), this, getName(), getDoc())); ScAccessibleFilterTopWindow* pAccTop = static_cast<ScAccessibleFilterTopWindow*>(mxAccessible.get()); @@ -1362,19 +1362,19 @@ void ScDPFieldPopupWindow::initMembers() ++nVisMemCount; } if (nVisMemCount == n) - { + { // all members visible maChkToggleAll.SetState(STATE_CHECK); mePrevToggleAllState = STATE_CHECK; } else if (nVisMemCount == 0) - { + { // no members visible maChkToggleAll.SetState(STATE_NOCHECK); mePrevToggleAllState = STATE_NOCHECK; } else - { + { maChkToggleAll.SetState(STATE_DONTKNOW); mePrevToggleAllState = STATE_DONTKNOW; } diff --git a/sc/source/ui/cctrl/dpcontrol.src b/sc/source/ui/cctrl/dpcontrol.src index b38548369be5..a992c5d17c98 100644 --- a/sc/source/ui/cctrl/dpcontrol.src +++ b/sc/source/ui/cctrl/dpcontrol.src @@ -1,7 +1,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/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index d52ccefea685..a393b4c38db5 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.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/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx index 742104ea517f..e473fa3ae80e 100644 --- a/sc/source/ui/cctrl/popmenu.cxx +++ b/sc/source/ui/cctrl/popmenu.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/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 6c439fd94693..5f7b341ee06f 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.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 @@ -59,7 +59,7 @@ SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item); //------------------------------------------------------------------ // -// ToolBox - Controller +// ToolBox - Controller // //------------------------------------------------------------------ @@ -89,7 +89,7 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt USHORT nImageId = nLastSlotId ? nLastSlotId : GetSlotId(); rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId )); - Image aImage = GetImage( m_xFrame, + Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages(), GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() ); @@ -107,21 +107,21 @@ SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow() rtl::OUString aInsertBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" )); createAndPositionSubToolBar( aInsertBarResStr ); // nWinResId = RID_TBXCTL_INSERT; -// nTbxResId = RID_TOOLBOX_INSERT; +// nTbxResId = RID_TOOLBOX_INSERT; } else if (nSlotId == SID_TBXCTL_INSCELLS) { rtl::OUString aInsertCellsBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcellsbar" )); createAndPositionSubToolBar( aInsertCellsBarResStr ); -// nWinResId = RID_TBXCTL_INSCELLS; -// nTbxResId = RID_TOOLBOX_INSCELLS; +// nWinResId = RID_TBXCTL_INSCELLS; +// nTbxResId = RID_TOOLBOX_INSCELLS; } else /* SID_TBXCTL_INSOBJ */ { rtl::OUString aInsertObjectBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertobjectbar" )); createAndPositionSubToolBar( aInsertObjectBarResStr ); -// nWinResId = RID_TBXCTL_INSOBJ; -// nTbxResId = RID_TOOLBOX_INSOBJ; +// nWinResId = RID_TBXCTL_INSOBJ; +// nTbxResId = RID_TOOLBOX_INSOBJ; } /* WindowAlign eNewAlign = ( GetToolBox().IsHorizontal() ) ? WINDOWALIGN_LEFT : WINDOWALIGN_TOP; @@ -151,22 +151,22 @@ void __EXPORT ScTbxInsertCtrl::Select( BOOL /* bMod1 */ ) if ( pViewFrame ) pDispatch = pViewFrame->GetDispatcher(); } - + if ( pDispatch ) pDispatch->Execute(nLastSlotId); } /* //------------------------------------------------------------------ // -// Popup - Window +// Popup - Window // //------------------------------------------------------------------ ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign, const ResId& rRIdWin, const ResId& rRIdTbx, SfxBindings& rBindings ) : - SfxPopupWindow ( nId, rRIdWin, rBindings), - aTbx ( this, GetBindings(), rRIdTbx ), + SfxPopupWindow ( nId, rRIdWin, rBindings), + aTbx ( this, GetBindings(), rRIdTbx ), aRIdWinTemp(rRIdWin), aRIdTbxTemp(rRIdTbx) { @@ -180,9 +180,9 @@ ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign, Size aSize = aTbx.CalcWindowSizePixel(); aTbx.SetPosSizePixel( Point(), aSize ); SetOutputSizePixel( aSize ); - aTbx.GetToolBox().SetSelectHdl( LINK(this, ScTbxInsertPopup, TbxSelectHdl)); + aTbx.GetToolBox().SetSelectHdl( LINK(this, ScTbxInsertPopup, TbxSelectHdl)); aTbxClickHdl = aTbx.GetToolBox().GetClickHdl(); - aTbx.GetToolBox().SetClickHdl( LINK(this, ScTbxInsertPopup, TbxClickHdl)); + aTbx.GetToolBox().SetClickHdl( LINK(this, ScTbxInsertPopup, TbxClickHdl)); } ScTbxInsertPopup::~ScTbxInsertPopup() diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 9fe3acc0af73..cc8e9592d671 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.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 @@ -55,8 +55,8 @@ SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem ); ScZoomSliderControl::ScZoomSliderControl( USHORT nSlotId, - USHORT nId, - ToolBox& rTbx ) + USHORT nId, + ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.Invalidate(); @@ -74,7 +74,7 @@ __EXPORT ScZoomSliderControl::~ScZoomSliderControl() void ScZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { - USHORT nId = GetId(); + USHORT nId = GetId(); ToolBox& rTbx = GetToolBox(); ScZoomSliderWnd* pBox = (ScZoomSliderWnd*)(rTbx.GetItemWindow( nId )); DBG_ASSERT( pBox ,"Control not found!" ); @@ -136,7 +136,7 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl maIncreaseButton(), maDecreaseButton(), mbValuesSet( true ), - mbOmitPaint( false ) + mbOmitPaint( false ) { } @@ -148,7 +148,7 @@ const long nButtonWidth = 10; const long nButtonHeight = 10; const long nIncDecWidth = 11; const long nIncDecHeight = 11; -const long nSliderHeight = 2; // +const long nSliderHeight = 2; // const long nSliderWidth = 4; // const long nSnappingHeight = 4; const long nSliderXOffset = 20; @@ -163,7 +163,7 @@ USHORT ScZoomSliderWnd::Offset2Zoom( long nOffset ) const Size aSliderWindowSize = GetOutputSizePixel(); const long nControlWidth = aSliderWindowSize.Width(); USHORT nRet = 0; - + if( nOffset < nSliderXOffset ) return mpImpl->mnMinZoom; if( nOffset > nControlWidth - nSliderXOffset ) @@ -210,7 +210,7 @@ USHORT ScZoomSliderWnd::Offset2Zoom( long nOffset ) const if( nRet < mpImpl->mnMinZoom ) return mpImpl->mnMinZoom; - + else if( nRet > mpImpl->mnMaxZoom ) return mpImpl->mnMaxZoom; @@ -274,7 +274,7 @@ ScZoomSliderWnd::~ScZoomSliderWnd() // ----------------------------------------------------------------------- void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) -{ +{ if ( !mpImpl->mbValuesSet ) return ; Size aSliderWindowSize = GetOutputSizePixel(); @@ -311,19 +311,19 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) return ; Rectangle aRect( Point( 0, 0 ), aSliderWindowSize ); - + Paint( aRect ); mpImpl->mbOmitPaint = true; - + SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom ); ::com::sun::star::uno::Any a; aZoomSliderItem.QueryValue( a ); - + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" )); aArgs[0].Value = a; - + SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; @@ -418,7 +418,7 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) Size aSliderWindowSize = GetOutputSizePixel(); Rectangle aRect( Point( 0, 0 ), aSliderWindowSize ); - + if ( !mpImpl->mbOmitPaint ) Paint(aRect); } @@ -439,7 +439,7 @@ void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ ) Size aSliderWindowSize = GetOutputSizePixel(); Rectangle aRect( Point( 0, 0 ), aSliderWindowSize ); - + VirtualDevice* pVDev = new VirtualDevice( *this ); pVDev->SetOutputSizePixel( aSliderWindowSize ); @@ -521,7 +521,7 @@ void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ ) // draw increase button aImagePoint.X() = aRect.TopLeft().X() + aSliderWindowSize.Width() - nIncDecWidth - (nSliderXOffset - nIncDecWidth)/2; pVDev->DrawImage( aImagePoint, mpImpl->maIncreaseButton ); - + DrawOutDev( Point(0, 0), aSliderWindowSize, Point(0, 0), aSliderWindowSize, *pVDev ); delete pVDev; diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index f101809552c9..19aa38fbac58 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.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,35 +51,35 @@ static const sal_Char __FAR_DATA pStrMrg[] = "MRG"; // ============================================================================ ScAsciiOptions::ScAsciiOptions() : - bFixedLen ( FALSE ), - aFieldSeps ( ';' ), - bMergeFieldSeps ( FALSE ), + bFixedLen ( FALSE ), + aFieldSeps ( ';' ), + bMergeFieldSeps ( FALSE ), bQuotedFieldAsText(false), bDetectSpecialNumber(false), - cTextSep ( cDefaultTextSep ), - eCharSet ( gsl_getSystemTextEncoding() ), + cTextSep ( cDefaultTextSep ), + eCharSet ( gsl_getSystemTextEncoding() ), eLang ( LANGUAGE_SYSTEM ), - bCharSetSystem ( FALSE ), - nStartRow ( 1 ), - nInfoCount ( 0 ), + bCharSetSystem ( FALSE ), + nStartRow ( 1 ), + nInfoCount ( 0 ), pColStart ( NULL ), - pColFormat ( NULL ) + pColFormat ( NULL ) { } ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) : - bFixedLen ( rOpt.bFixedLen ), - aFieldSeps ( rOpt.aFieldSeps ), - bMergeFieldSeps ( rOpt.bMergeFieldSeps ), + bFixedLen ( rOpt.bFixedLen ), + aFieldSeps ( rOpt.aFieldSeps ), + bMergeFieldSeps ( rOpt.bMergeFieldSeps ), bQuotedFieldAsText(rOpt.bQuotedFieldAsText), bDetectSpecialNumber(rOpt.bDetectSpecialNumber), - cTextSep ( rOpt.cTextSep ), - eCharSet ( rOpt.eCharSet ), + cTextSep ( rOpt.cTextSep ), + eCharSet ( rOpt.eCharSet ), eLang ( rOpt.eLang ), - bCharSetSystem ( rOpt.bCharSetSystem ), - nStartRow ( rOpt.nStartRow ), - nInfoCount ( rOpt.nInfoCount ) + bCharSetSystem ( rOpt.bCharSetSystem ), + nStartRow ( rOpt.nStartRow ), + nInfoCount ( rOpt.nInfoCount ) { if (nInfoCount) { @@ -152,18 +152,18 @@ void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) } -ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) +ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) { SetColInfo( rCpy.nInfoCount, rCpy.pColStart, rCpy.pColFormat ); - bFixedLen = rCpy.bFixedLen; - aFieldSeps = rCpy.aFieldSeps; - bMergeFieldSeps = rCpy.bMergeFieldSeps; + bFixedLen = rCpy.bFixedLen; + aFieldSeps = rCpy.aFieldSeps; + bMergeFieldSeps = rCpy.bMergeFieldSeps; bQuotedFieldAsText = rCpy.bQuotedFieldAsText; - cTextSep = rCpy.cTextSep; - eCharSet = rCpy.eCharSet; - bCharSetSystem = rCpy.bCharSetSystem; - nStartRow = rCpy.nStartRow; + cTextSep = rCpy.cTextSep; + eCharSet = rCpy.eCharSet; + bCharSetSystem = rCpy.bCharSetSystem; + nStartRow = rCpy.nStartRow; return *this; } @@ -171,15 +171,15 @@ ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const { - if ( bFixedLen == rCmp.bFixedLen && - aFieldSeps == rCmp.aFieldSeps && + if ( bFixedLen == rCmp.bFixedLen && + aFieldSeps == rCmp.aFieldSeps && bMergeFieldSeps == rCmp.bMergeFieldSeps && bQuotedFieldAsText == rCmp.bQuotedFieldAsText && - cTextSep == rCmp.cTextSep && - eCharSet == rCmp.eCharSet && + cTextSep == rCmp.cTextSep && + eCharSet == rCmp.eCharSet && bCharSetSystem == rCmp.bCharSetSystem && - nStartRow == rCmp.nStartRow && - nInfoCount == rCmp.nInfoCount ) + nStartRow == rCmp.nStartRow && + nInfoCount == rCmp.nInfoCount ) { DBG_ASSERT( !nInfoCount || (pColStart && pColFormat && rCmp.pColStart && rCmp.pColFormat), "0-Zeiger in ScAsciiOptions" ); @@ -194,8 +194,8 @@ BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const } // -// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) -// darum ab Version 336 Komma stattdessen +// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) +// darum ab Version 336 Komma stattdessen // @@ -207,7 +207,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) xub_StrLen i; // - // Feld-Trenner + // Feld-Trenner // if ( nCount >= 1 ) @@ -234,7 +234,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) } // - // Text-Trenner + // Text-Trenner // if ( nCount >= 2 ) @@ -245,7 +245,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) } // - // Zeichensatz + // Zeichensatz // if ( nCount >= 3 ) @@ -255,7 +255,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) } // - // Startzeile + // Startzeile // if ( nCount >= 4 ) @@ -265,7 +265,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) } // - // Spalten-Infos + // Spalten-Infos // if ( nCount >= 5 ) @@ -295,7 +295,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) // Language if (nCount >= 6) - { + { aToken = rString.GetToken(5, ','); eLang = static_cast<LanguageType>(aToken.ToInt32()); } @@ -321,7 +321,7 @@ String ScAsciiOptions::WriteToString() const String aOutStr; // - // Feld-Trenner + // Feld-Trenner // if ( bFixedLen ) @@ -344,34 +344,34 @@ String ScAsciiOptions::WriteToString() const } } - aOutStr += ','; // Token-Ende + aOutStr += ','; // Token-Ende // - // Text-Trenner + // Text-Trenner // aOutStr += String::CreateFromInt32(cTextSep); - aOutStr += ','; // Token-Ende + aOutStr += ','; // Token-Ende // - // Zeichensatz + // Zeichensatz // - if ( bCharSetSystem ) // force "SYSTEM" + if ( bCharSetSystem ) // force "SYSTEM" aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW ); else aOutStr += ScGlobal::GetCharsetString( eCharSet ); - aOutStr += ','; // Token-Ende + aOutStr += ','; // Token-Ende // - // Startzeile + // Startzeile // aOutStr += String::CreateFromInt32(nStartRow); - aOutStr += ','; // Token-Ende + aOutStr += ','; // Token-Ende // - // Spalten-Infos + // Spalten-Infos // DBG_ASSERT( !nInfoCount || (pColStart && pColFormat), "0-Zeiger in ScAsciiOptions" ); diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc index 7bf6d42d6e2f..a251127ce586 100644 --- a/sc/source/ui/dbgui/asciiopt.hrc +++ b/sc/source/ui/dbgui/asciiopt.hrc @@ -1,7 +1,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 @@ -26,16 +26,16 @@ ************************************************************************/ #include "sc.hrc" //#define RID_SCDLG_ASCII 256 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 -#define FL_FIELDOPT 4 -#define FT_CHARSET 5 -#define LB_CHARSET 6 -#define FT_CUSTOMLANG 7 -#define LB_CUSTOMLANG 8 -#define FT_AT_ROW 9 +#define FL_FIELDOPT 4 +#define FT_CHARSET 5 +#define LB_CHARSET 6 +#define FT_CUSTOMLANG 7 +#define LB_CUSTOMLANG 8 +#define FT_AT_ROW 9 #define NF_AT_ROW 10 #define FL_SEPOPT 11 @@ -60,12 +60,12 @@ #define LB_TYPE1 28 #define CTR_TABLEBOX 29 #define STR_TEXTTOCOLUMNS 30 - - - - - - - - - + + + + + + + + + diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src index 9efbfe0f557f..1744ae4635bd 100644 --- a/sc/source/ui/dbgui/asciiopt.src +++ b/sc/source/ui/dbgui/asciiopt.src @@ -1,7 +1,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/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 7e2bafd2c42b..602241485a41 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.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,7 +57,7 @@ #define INFOBOX(id) InfoBox(this, ScGlobal::GetRscString(id)).Execute() //============================================================================ -// class ScAreaData +// class ScAreaData class ScAreaData { @@ -72,68 +72,68 @@ public: bIsDbArea = bDb; } - String aStrName; - String aStrArea; - BOOL bIsDbArea; + String aStrName; + String aStrArea; + BOOL bIsDbArea; }; //============================================================================ -// class ScConsolidateDialog +// class ScConsolidateDialog ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet& rArgSet ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONSOLIDATE ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONSOLIDATE ), // - aFtFunc ( this, ScResId( FT_FUNC ) ), - aLbFunc ( this, ScResId( LB_FUNC ) ), + aFtFunc ( this, ScResId( FT_FUNC ) ), + aLbFunc ( this, ScResId( LB_FUNC ) ), - aFtConsAreas ( this, ScResId( FT_CONSAREAS ) ), - aLbConsAreas ( this, ScResId( LB_CONSAREAS ) ), + aFtConsAreas ( this, ScResId( FT_CONSAREAS ) ), + aLbConsAreas ( this, ScResId( LB_CONSAREAS ) ), - aLbDataArea ( this, ScResId( LB_DATA_AREA ) ), - aFtDataArea ( this, ScResId( FT_DATA_AREA ) ), + aLbDataArea ( this, ScResId( LB_DATA_AREA ) ), + aFtDataArea ( this, ScResId( FT_DATA_AREA ) ), aEdDataArea ( this, this, ScResId( ED_DATA_AREA ) ), - aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, this ), + aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, this ), - aLbDestArea ( this, ScResId( LB_DEST_AREA ) ), - aFtDestArea ( this, ScResId( FT_DEST_AREA ) ), + aLbDestArea ( this, ScResId( LB_DEST_AREA ) ), + aFtDestArea ( this, ScResId( FT_DEST_AREA ) ), aEdDestArea ( this, this, ScResId( ED_DEST_AREA ) ), - aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, this), + aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, this), aFlConsBy ( this, ScResId( FL_CONSBY ) ), - aBtnByRow ( this, ScResId( BTN_BYROW ) ), - aBtnByCol ( this, ScResId( BTN_BYCOL) ), + aBtnByRow ( this, ScResId( BTN_BYROW ) ), + aBtnByCol ( this, ScResId( BTN_BYCOL) ), aFlSep ( this, ScResId( FL_SEP ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), - aBtnRefs ( this, ScResId( BTN_REFS ) ), + aBtnRefs ( this, ScResId( BTN_REFS ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), // - theConsData ( ((const ScConsolidateItem&) + theConsData ( ((const ScConsolidateItem&) rArgSet.Get( rArgSet.GetPool()-> GetWhich( SID_CONSOLIDATE ) ) ).GetData() ), - pViewData ( ((ScTabViewShell*)SfxViewShell::Current())-> + pViewData ( ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData() ), - pDoc ( ((ScTabViewShell*)SfxViewShell::Current())-> + pDoc ( ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData()->GetDocument() ), - pRangeUtil ( new ScRangeUtil ), - pAreaData ( NULL ), - nAreaDataCount ( 0 ), - nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ), + pRangeUtil ( new ScRangeUtil ), + pAreaData ( NULL ), + nAreaDataCount ( 0 ), + nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ), - pRefInputEdit ( &aEdDataArea ) + pRefInputEdit ( &aEdDataArea ) { Init(); FreeResource(); @@ -158,19 +158,19 @@ void ScConsolidateDlg::Init() String aStr; USHORT i=0; - aEdDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); - aEdDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); + aEdDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); + aEdDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); aLbDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); aLbDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); - aEdDataArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) ); - aEdDestArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) ); - aLbConsAreas.SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); - aLbDataArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); - aLbDestArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); - aBtnOk .SetClickHdl ( LINK( this, ScConsolidateDlg, OkHdl ) ); - aBtnCancel .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); - aBtnAdd .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); - aBtnRemove .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); + aEdDataArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) ); + aEdDestArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) ); + aLbConsAreas.SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); + aLbDataArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); + aLbDestArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); + aBtnOk .SetClickHdl ( LINK( this, ScConsolidateDlg, OkHdl ) ); + aBtnCancel .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); + aBtnAdd .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); + aBtnRemove .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); aBtnMore.AddWindow( &aFlConsBy ); aBtnMore.AddWindow( &aBtnByRow ); @@ -223,10 +223,10 @@ void ScConsolidateDlg::Init() ScRangeName* pRangeNames = pDoc->GetRangeName(); ScDBCollection* pDbNames = pDoc->GetDBCollection(); const USHORT nRangeCount = pRangeNames ? pRangeNames->GetCount() : 0; - const USHORT nDbCount = pDbNames ? pDbNames ->GetCount() : 0; + const USHORT nDbCount = pDbNames ? pDbNames ->GetCount() : 0; nAreaDataCount = nRangeCount+nDbCount; - pAreaData = NULL; + pAreaData = NULL; if ( nAreaDataCount > 0 ) { @@ -275,7 +275,7 @@ void ScConsolidateDlg::FillAreaLists() { aLbDataArea.InsertEntry( pAreaData[i].aStrName, i+1 ); -// if ( !pAreaData[i].bIsDbArea ) +// if ( !pAreaData[i].bIsDbArea ) aLbDestArea.InsertEntry( pAreaData[i].aStrName, i+1 ); } } @@ -294,8 +294,8 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( rRef.aStart != rRef.aEnd ) RefInputStart( pRefInputEdit ); - String aStr; - USHORT nFmt = SCR_ABS_3D; //!!! nCurTab fehlt noch + String aStr; + USHORT nFmt = SCR_ABS_3D; //!!! nCurTab fehlt noch const formula::FormulaGrammar::AddressConvention eConv = pDocP->GetAddressConvention(); if ( rRef.aStart.Tab() != rRef.aEnd.Tab() ) @@ -358,9 +358,9 @@ BOOL ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) ((pEd != &aEdDataArea) && (pEd != &aEdDestArea)) ) return FALSE; - SCTAB nTab = pViewData->GetTabNo(); - BOOL bEditOk = FALSE; - String theCompleteStr; + SCTAB nTab = pViewData->GetTabNo(); + BOOL bEditOk = FALSE; + String theCompleteStr; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( pEd == &aEdDataArea ) @@ -416,16 +416,16 @@ IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG ) if ( nDataAreaCount > 0 ) { ScRefAddress aDestAddress; - SCTAB nTab = pViewData->GetTabNo(); - String aDestPosStr( aEdDestArea.GetText() ); + SCTAB nTab = pViewData->GetTabNo(); + String aDestPosStr( aEdDestArea.GetText() ); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( pRangeUtil->IsAbsPos( aDestPosStr, pDoc, nTab, NULL, &aDestAddress, eConv ) ) { - ScConsolidateParam theOutParam( theConsData ); - ScArea** ppDataAreas = new ScArea*[nDataAreaCount]; - ScArea* pArea; - USHORT i=0; + ScConsolidateParam theOutParam( theConsData ); + ScArea** ppDataAreas = new ScArea*[nDataAreaCount]; + ScArea* pArea; + USHORT i=0; for ( i=0; i<nDataAreaCount; i++ ) { @@ -435,13 +435,13 @@ IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG ) ppDataAreas[i] = pArea; } - theOutParam.nCol = aDestAddress.Col(); - theOutParam.nRow = aDestAddress.Row(); - theOutParam.nTab = aDestAddress.Tab(); - theOutParam.eFunction = LbPosToFunc( aLbFunc.GetSelectEntryPos() ); - theOutParam.bByCol = aBtnByCol.IsChecked(); - theOutParam.bByRow = aBtnByRow.IsChecked(); - theOutParam.bReferenceData = aBtnRefs.IsChecked(); + theOutParam.nCol = aDestAddress.Col(); + theOutParam.nRow = aDestAddress.Row(); + theOutParam.nTab = aDestAddress.Tab(); + theOutParam.eFunction = LbPosToFunc( aLbFunc.GetSelectEntryPos() ); + theOutParam.bByCol = aBtnByCol.IsChecked(); + theOutParam.bByRow = aBtnByRow.IsChecked(); + theOutParam.bReferenceData = aBtnRefs.IsChecked(); theOutParam.SetAreas( ppDataAreas, nDataAreaCount ); for ( i=0; i<nDataAreaCount; i++ ) @@ -479,9 +479,9 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) { if ( aEdDataArea.GetText().Len() > 0 ) { - String aNewEntry( aEdDataArea.GetText() ); - ScArea** ppAreas = NULL; - USHORT nAreaCount = 0; + String aNewEntry( aEdDataArea.GetText() ); + ScArea** ppAreas = NULL; + USHORT nAreaCount = 0; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( pRangeUtil->IsAbsTabArea( aNewEntry, pDoc, &ppAreas, &nAreaCount, TRUE, eConv ) ) @@ -550,8 +550,8 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) } else if ( (pLb == &aLbDataArea) || (pLb == &aLbDestArea) ) { - Edit* pEd = (pLb == &aLbDataArea) ? &aEdDataArea : &aEdDestArea; - USHORT nSelPos = pLb->GetSelectEntryPos(); + Edit* pEd = (pLb == &aLbDataArea) ? &aEdDataArea : &aEdDestArea; + USHORT nSelPos = pLb->GetSelectEntryPos(); if ( pRangeUtil && (nSelPos > 0) @@ -614,16 +614,16 @@ ScSubTotalFunc ScConsolidateDlg::LbPosToFunc( USHORT nPos ) { switch ( nPos ) { - case 2: return SUBTOTAL_FUNC_AVE; - case 6: return SUBTOTAL_FUNC_CNT; - case 1: return SUBTOTAL_FUNC_CNT2; - case 3: return SUBTOTAL_FUNC_MAX; - case 4: return SUBTOTAL_FUNC_MIN; - case 5: return SUBTOTAL_FUNC_PROD; - case 7: return SUBTOTAL_FUNC_STD; - case 8: return SUBTOTAL_FUNC_STDP; - case 9: return SUBTOTAL_FUNC_VAR; - case 10: return SUBTOTAL_FUNC_VARP; + case 2: return SUBTOTAL_FUNC_AVE; + case 6: return SUBTOTAL_FUNC_CNT; + case 1: return SUBTOTAL_FUNC_CNT2; + case 3: return SUBTOTAL_FUNC_MAX; + case 4: return SUBTOTAL_FUNC_MIN; + case 5: return SUBTOTAL_FUNC_PROD; + case 7: return SUBTOTAL_FUNC_STD; + case 8: return SUBTOTAL_FUNC_STDP; + case 9: return SUBTOTAL_FUNC_VAR; + case 10: return SUBTOTAL_FUNC_VARP; case 0: default: return SUBTOTAL_FUNC_SUM; @@ -637,16 +637,16 @@ USHORT ScConsolidateDlg::FuncToLbPos( ScSubTotalFunc eFunc ) { switch ( eFunc ) { - case SUBTOTAL_FUNC_AVE: return 2; - case SUBTOTAL_FUNC_CNT: return 6; - case SUBTOTAL_FUNC_CNT2: return 1; - case SUBTOTAL_FUNC_MAX: return 3; - case SUBTOTAL_FUNC_MIN: return 4; - case SUBTOTAL_FUNC_PROD: return 5; - case SUBTOTAL_FUNC_STD: return 7; - case SUBTOTAL_FUNC_STDP: return 8; - case SUBTOTAL_FUNC_VAR: return 9; - case SUBTOTAL_FUNC_VARP: return 10; + case SUBTOTAL_FUNC_AVE: return 2; + case SUBTOTAL_FUNC_CNT: return 6; + case SUBTOTAL_FUNC_CNT2: return 1; + case SUBTOTAL_FUNC_MAX: return 3; + case SUBTOTAL_FUNC_MIN: return 4; + case SUBTOTAL_FUNC_PROD: return 5; + case SUBTOTAL_FUNC_STD: return 7; + case SUBTOTAL_FUNC_STDP: return 8; + case SUBTOTAL_FUNC_VAR: return 9; + case SUBTOTAL_FUNC_VARP: return 10; case SUBTOTAL_FUNC_NONE: case SUBTOTAL_FUNC_SUM: default: diff --git a/sc/source/ui/dbgui/consdlg.hrc b/sc/source/ui/dbgui/consdlg.hrc index 6f9f6708c388..f1f6c26fad8b 100644 --- a/sc/source/ui/dbgui/consdlg.hrc +++ b/sc/source/ui/dbgui/consdlg.hrc @@ -1,7 +1,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 @@ -27,7 +27,7 @@ #include "sc.hrc" -#define BTN_OK 1 +#define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 #define BTN_MORE 4 diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src index 5226c22629c6..56748a0c58c1 100644 --- a/sc/source/ui/dbgui/consdlg.src +++ b/sc/source/ui/dbgui/consdlg.src @@ -1,7 +1,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/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 3455fa72c1fd..f69410eac2a8 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.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/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index a18bbb7e2607..da1e5c2e2432 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.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/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 84d5ad6bee1b..5f53e24d0dc6 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.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/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index 5215f3f9a799..39ab20af9df8 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.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/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index e7d3071da1f3..7a4e5ec25f35 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.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/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index ab2159af2f93..34996739b1fd 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.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,18 +52,18 @@ using namespace com::sun::star; #include "sc.hrc" #include "dapitype.hrc" #include "miscuno.hxx" -#include "dpsdbtab.hxx" // ScImportSourceDesc +#include "dpsdbtab.hxx" // ScImportSourceDesc //------------------------------------------------------------------------- -#define DP_SERVICE_DBCONTEXT "com.sun.star.sdb.DatabaseContext" -#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" +#define DP_SERVICE_DBCONTEXT "com.sun.star.sdb.DatabaseContext" +#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" -// entries in the "type" ListBox -#define DP_TYPELIST_TABLE 0 -#define DP_TYPELIST_QUERY 1 -#define DP_TYPELIST_SQL 2 -#define DP_TYPELIST_SQLNAT 3 +// entries in the "type" ListBox +#define DP_TYPELIST_TABLE 0 +#define DP_TYPELIST_QUERY 1 +#define DP_TYPELIST_SQL 2 +#define DP_TYPELIST_SQLNAT 3 //------------------------------------------------------------------------- @@ -83,11 +83,11 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : { FreeResource(); - WaitObject aWait( this ); // initializing the database service the first time takes a while + WaitObject aWait( this ); // initializing the database service the first time takes a while try { - // get database names + // get database names uno::Reference<container::XNameAccess> xContext( comphelper::getProcessServiceFactory()->createInstance( @@ -158,11 +158,11 @@ void ScDataPilotDatabaseDlg::FillObjects() USHORT nSelect = aLbType.GetSelectEntryPos(); if ( nSelect > DP_TYPELIST_QUERY ) - return; // only tables and queries + return; // only tables and queries try { - // open connection (for tables or queries) + // open connection (for tables or queries) uno::Reference<container::XNameAccess> xContext( comphelper::getProcessServiceFactory()->createInstance( @@ -185,30 +185,30 @@ void ScDataPilotDatabaseDlg::FillObjects() uno::Sequence<rtl::OUString> aNames; if ( nSelect == DP_TYPELIST_TABLE ) { - // get all tables + // get all tables uno::Reference<sdbcx::XTablesSupplier> xTablesSupp( xConnection, uno::UNO_QUERY ); if ( !xTablesSupp.is() ) return; - uno::Reference<container::XNameAccess> xTables = xTablesSupp->getTables(); + uno::Reference<container::XNameAccess> xTables = xTablesSupp->getTables(); if ( !xTables.is() ) return; aNames = xTables->getElementNames(); } else { - // get all queries + // get all queries uno::Reference<sdb::XQueriesSupplier> xQueriesSupp( xConnection, uno::UNO_QUERY ); if ( !xQueriesSupp.is() ) return; - uno::Reference<container::XNameAccess> xQueries = xQueriesSupp->getQueries(); + uno::Reference<container::XNameAccess> xQueries = xQueriesSupp->getQueries(); if ( !xQueries.is() ) return; aNames = xQueries->getElementNames(); } - - // fill list + + // fill list long nCount = aNames.getLength(); const rtl::OUString* pArray = aNames.getConstArray(); @@ -220,7 +220,7 @@ void ScDataPilotDatabaseDlg::FillObjects() } catch(uno::Exception&) { - // #71604# this may happen if an invalid database is selected -> no DBG_ERROR + // #71604# this may happen if an invalid database is selected -> no DBG_ERROR DBG_WARNING("exception in database"); } } diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index b9ca10fef09e..b4943d265ffd 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.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 @@ -86,14 +86,14 @@ ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, aFlFrame ( this, ScResId( FL_FRAME ) ), aFtService ( this, ScResId( FT_SERVICE ) ), aLbService ( this, ScResId( LB_SERVICE ) ), - aFtSource ( this, ScResId( FT_SOURCE ) ), - aEdSource ( this, ScResId( ED_SOURCE ) ), - aFtName ( this, ScResId( FT_NAME ) ), - aEdName ( this, ScResId( ED_NAME ) ), - aFtUser ( this, ScResId( FT_USER ) ), - aEdUser ( this, ScResId( ED_USER ) ), - aFtPasswd ( this, ScResId( FT_PASSWD ) ), - aEdPasswd ( this, ScResId( ED_PASSWD ) ), + aFtSource ( this, ScResId( FT_SOURCE ) ), + aEdSource ( this, ScResId( ED_SOURCE ) ), + aFtName ( this, ScResId( FT_NAME ) ), + aEdName ( this, ScResId( ED_NAME ) ), + aFtUser ( this, ScResId( FT_USER ) ), + aEdUser ( this, ScResId( ED_USER ) ), + aFtPasswd ( this, ScResId( FT_PASSWD ) ), + aEdPasswd ( this, ScResId( ED_PASSWD ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ) diff --git a/sc/source/ui/dbgui/dapitype.hrc b/sc/source/ui/dbgui/dapitype.hrc index efbabe64fa04..c7800ca66840 100644 --- a/sc/source/ui/dbgui/dapitype.hrc +++ b/sc/source/ui/dbgui/dapitype.hrc @@ -1,7 +1,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 @@ -25,29 +25,29 @@ * ************************************************************************/ -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 -#define BTN_SELECTION 4 -#define BTN_DATABASE 5 -#define BTN_EXTERNAL 6 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 +#define BTN_SELECTION 4 +#define BTN_DATABASE 5 +#define BTN_EXTERNAL 6 #define FL_FRAME 7 -#define FT_SERVICE 8 -#define LB_SERVICE 9 -#define FT_SOURCE 10 -#define ED_SOURCE 11 -#define FT_NAME 12 -#define ED_NAME 13 -#define FT_USER 14 -#define ED_USER 15 -#define FT_PASSWD 16 -#define ED_PASSWD 17 +#define FT_SERVICE 8 +#define LB_SERVICE 9 +#define FT_SOURCE 10 +#define ED_SOURCE 11 +#define FT_NAME 12 +#define ED_NAME 13 +#define FT_USER 14 +#define ED_USER 15 +#define FT_PASSWD 16 +#define ED_PASSWD 17 -#define FT_DATABASE 18 -#define LB_DATABASE 19 -#define FT_OBJECT 20 -#define CB_OBJECT 21 -#define FT_OBJTYPE 22 -#define LB_OBJTYPE 23 +#define FT_DATABASE 18 +#define LB_DATABASE 19 +#define FT_OBJECT 20 +#define CB_OBJECT 21 +#define FT_OBJTYPE 22 +#define LB_OBJTYPE 23 diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src index 5cf1dacad819..7453f4af4121 100644 --- a/sc/source/ui/dbgui/dapitype.src +++ b/sc/source/ui/dbgui/dapitype.src @@ -1,7 +1,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/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 1782e4245b1d..e9bd5a888cd6 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.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 @@ -42,7 +42,7 @@ #include "scresid.hxx" #include "globstr.hrc" #include "dbnamdlg.hrc" -#include "rangenam.hxx" // IsNameValid +#include "rangenam.hxx" // IsNameValid #define _DBNAMDLG_CXX #include "dbnamdlg.hxx" @@ -51,12 +51,12 @@ //============================================================================ -#define ABS_SREF SCA_VALID \ +#define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ +#define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D +#define ABS_SREF3D ABS_SREF | SCA_TAB_3D +#define ABS_DREF3D ABS_DREF | SCA_TAB_3D //---------------------------------------------------------------------------- @@ -68,7 +68,7 @@ static DBSaveData* pSaveObj = NULL; #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() //============================================================================ -// class DBSaveData +// class DBSaveData class DBSaveData { @@ -83,19 +83,19 @@ public: void Restore(); private: - Edit& rEdAssign; - CheckBox& rBtnHeader; - CheckBox& rBtnSize; - CheckBox& rBtnFormat; - CheckBox& rBtnStrip; - ScRange& rCurArea; - String aStr; - ScRange aArea; - BOOL bHeader:1; - BOOL bSize:1; - BOOL bFormat:1; - BOOL bStrip:1; - BOOL bDirty:1; + Edit& rEdAssign; + CheckBox& rBtnHeader; + CheckBox& rBtnSize; + CheckBox& rBtnFormat; + CheckBox& rBtnStrip; + ScRange& rCurArea; + String aStr; + ScRange aArea; + BOOL bHeader:1; + BOOL bSize:1; + BOOL bFormat:1; + BOOL bStrip:1; + BOOL bDirty:1; }; @@ -109,7 +109,7 @@ void DBSaveData::Save() bHeader = rBtnHeader.IsChecked(); bSize = rBtnSize.IsChecked(); bFormat = rBtnFormat.IsChecked(); - bStrip = rBtnStrip.IsChecked(); + bStrip = rBtnStrip.IsChecked(); bDirty = TRUE; } @@ -132,55 +132,55 @@ void DBSaveData::Restore() //============================================================================ -// class ScDbNameDlg +// class ScDbNameDlg //---------------------------------------------------------------------------- ScDbNameDlg::ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ) + ScViewData* ptrViewData ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_DBNAMES ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_DBNAMES ), // aFlName ( this, ScResId( FL_NAME ) ), - aEdName ( this, ScResId( ED_NAME ) ), + aEdName ( this, ScResId( ED_NAME ) ), aFlAssign ( this, ScResId( FL_ASSIGN ) ), aEdAssign ( this, this, ScResId( ED_DBAREA ) ), - aRbAssign ( this, ScResId( RB_DBAREA ), &aEdAssign, this ), + aRbAssign ( this, ScResId( RB_DBAREA ), &aEdAssign, this ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), - aBtnHeader ( this, ScResId( BTN_HEADER ) ), - aBtnDoSize ( this, ScResId( BTN_SIZE ) ), - aBtnKeepFmt ( this, ScResId( BTN_FORMAT ) ), - aBtnStripData ( this, ScResId( BTN_STRIPDATA ) ), - aFTSource ( this, ScResId( FT_SOURCE ) ), - aFTOperations ( this, ScResId( FT_OPERATIONS ) ), - - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), - - aStrAdd ( ScResId( STR_ADD ) ), - aStrModify ( ScResId( STR_MODIFY ) ), - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), - aStrInvalid ( ScResId( STR_DB_INVALID ) ), + aBtnHeader ( this, ScResId( BTN_HEADER ) ), + aBtnDoSize ( this, ScResId( BTN_SIZE ) ), + aBtnKeepFmt ( this, ScResId( BTN_FORMAT ) ), + aBtnStripData ( this, ScResId( BTN_STRIPDATA ) ), + aFTSource ( this, ScResId( FT_SOURCE ) ), + aFTOperations ( this, ScResId( FT_OPERATIONS ) ), + + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), + + aStrAdd ( ScResId( STR_ADD ) ), + aStrModify ( ScResId( STR_MODIFY ) ), + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), + aStrInvalid ( ScResId( STR_DB_INVALID ) ), // - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), - bRefInputMode ( FALSE ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), + bRefInputMode ( FALSE ), aAddrDetails ( pDoc->GetAddressConvention(), 0, 0 ), - aLocalDbCol ( *(pDoc->GetDBCollection()) ) + aLocalDbCol ( *(pDoc->GetDBCollection()) ) { // WB_NOLABEL can't be set in resource... aFTSource.SetStyle( aFTSource.GetStyle() | WB_NOLABEL ); aFTOperations.SetStyle( aFTOperations.GetStyle() | WB_NOLABEL ); - // damit die Strings in der Resource bei den FixedTexten bleiben koennen: - aStrSource = aFTSource.GetText(); - aStrOperations = aFTOperations.GetText(); + // damit die Strings in der Resource bei den FixedTexten bleiben koennen: + aStrSource = aFTSource.GetText(); + aStrOperations = aFTOperations.GetText(); pSaveObj = new DBSaveData( aEdAssign, aBtnHeader, aBtnDoSize, aBtnKeepFmt, aBtnStripData, theCurArea ); @@ -209,7 +209,7 @@ __EXPORT ScDbNameDlg::~ScDbNameDlg() void ScDbNameDlg::Init() { - aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen + aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen aBtnMore.AddWindow( &aFlOptions ); aBtnMore.AddWindow( &aBtnHeader ); @@ -219,29 +219,29 @@ void ScDbNameDlg::Init() aBtnMore.AddWindow( &aFTSource ); aBtnMore.AddWindow( &aFTOperations ); - String theAreaStr; - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCTAB nStartTab = 0; - SCCOL nEndCol = 0; - SCROW nEndRow = 0; - SCTAB nEndTab = 0; - - aBtnOk.SetClickHdl ( LINK( this, ScDbNameDlg, OkBtnHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScDbNameDlg, CancelBtnHdl ) ); - aBtnAdd.SetClickHdl ( LINK( this, ScDbNameDlg, AddBtnHdl ) ); - aBtnRemove.SetClickHdl ( LINK( this, ScDbNameDlg, RemoveBtnHdl ) ); - aEdName.SetModifyHdl ( LINK( this, ScDbNameDlg, NameModifyHdl ) ); - aEdAssign.SetModifyHdl ( LINK( this, ScDbNameDlg, AssModifyHdl ) ); + String theAreaStr; + SCCOL nStartCol = 0; + SCROW nStartRow = 0; + SCTAB nStartTab = 0; + SCCOL nEndCol = 0; + SCROW nEndRow = 0; + SCTAB nEndTab = 0; + + aBtnOk.SetClickHdl ( LINK( this, ScDbNameDlg, OkBtnHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScDbNameDlg, CancelBtnHdl ) ); + aBtnAdd.SetClickHdl ( LINK( this, ScDbNameDlg, AddBtnHdl ) ); + aBtnRemove.SetClickHdl ( LINK( this, ScDbNameDlg, RemoveBtnHdl ) ); + aEdName.SetModifyHdl ( LINK( this, ScDbNameDlg, NameModifyHdl ) ); + aEdAssign.SetModifyHdl ( LINK( this, ScDbNameDlg, AssModifyHdl ) ); UpdateNames(); if ( pViewData && pDoc ) { - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - ScDBData* pDBData = NULL; + ScDBCollection* pDBColl = pDoc->GetDBCollection(); + ScDBData* pDBData = NULL; pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); + nEndCol, nEndRow, nEndTab ); theCurArea = ScRange( ScAddress( nStartCol, nStartRow, nStartTab ), ScAddress( nEndCol, nEndRow, nEndTab ) ); @@ -254,9 +254,9 @@ void ScDbNameDlg::Init() pDBData = pDBColl->GetDBAtCursor( nStartCol, nStartRow, nStartTab, TRUE ); if ( pDBData ) { - String theDbName; - ScAddress& rStart = theCurArea.aStart; - ScAddress& rEnd = theCurArea.aEnd; + String theDbName; + ScAddress& rStart = theCurArea.aStart; + ScAddress& rEnd = theCurArea.aEnd; SCCOL nCol1; SCCOL nCol2; SCROW nRow1; @@ -353,9 +353,9 @@ void ScDbNameDlg::SetActive() { aEdAssign.GrabFocus(); - // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen - // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt) - // (der ausgewaehlte DB-Name hat sich auch nicht veraendert) + // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen + // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt) + // (der ausgewaehlte DB-Name hat sich auch nicht veraendert) RefInputDone(); } @@ -364,7 +364,7 @@ void ScDbNameDlg::SetActive() void ScDbNameDlg::UpdateNames() { - USHORT nNameCount = aLocalDbCol.GetCount(); + USHORT nNameCount = aLocalDbCol.GetCount(); aEdName.SetUpdateMode( FALSE ); //----------------------------------------------------------- @@ -373,8 +373,8 @@ void ScDbNameDlg::UpdateNames() if ( nNameCount > 0 ) { - ScDBData* pDbData = NULL; - String aString; + ScDBData* pDbData = NULL; + String aString; for ( USHORT i=0; i<nNameCount; i++ ) { @@ -402,9 +402,9 @@ void ScDbNameDlg::UpdateNames() void ScDbNameDlg::UpdateDBData( const String& rStrName ) { - String theArea; - USHORT nAt; - ScDBData* pData; + String theArea; + USHORT nAt; + ScDBData* pData; aLocalDbCol.SearchName( rStrName, nAt ); pData = (ScDBData*)(aLocalDbCol.At( nAt )); @@ -413,13 +413,13 @@ void ScDbNameDlg::UpdateDBData( const String& rStrName ) { SCCOL nColStart = 0; SCROW nRowStart = 0; - SCCOL nColEnd = 0; - SCROW nRowEnd = 0; - SCTAB nTab = 0; + SCCOL nColEnd = 0; + SCROW nRowEnd = 0; + SCTAB nTab = 0; pData->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd ); theCurArea = ScRange( ScAddress( nColStart, nRowStart, nTab ), - ScAddress( nColEnd, nRowEnd, nTab ) ); + ScAddress( nColEnd, nRowEnd, nTab ) ); theCurArea.Format( theArea, ABS_DREF3D, pDoc, aAddrDetails ); aEdAssign.SetText( theArea ); aBtnAdd.SetText( aStrModify ); @@ -481,8 +481,8 @@ IMPL_LINK_INLINE_END( ScDbNameDlg, CancelBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) { - String aNewName = aEdName.GetText(); - String aNewArea = aEdAssign.GetText(); + String aNewName = aEdName.GetText(); + String aNewArea = aEdAssign.GetText(); aNewName.EraseLeadingChars( ' ' ); aNewName.EraseTrailingChars( ' ' ); @@ -491,7 +491,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) { if ( ScRangeData::IsNameValid( aNewName, pDoc ) ) { - // weil jetzt editiert werden kann, muss erst geparst werden + // weil jetzt editiert werden kann, muss erst geparst werden ScRange aTmpRange; String aText = aEdAssign.GetText(); if ( aTmpRange.ParseAny( aText, pDoc, aAddrDetails ) & SCA_VALID ) @@ -506,7 +506,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) pOldEntry = aLocalDbCol[nFoundAt]; if (pOldEntry) { - // Bereich veraendern + // Bereich veraendern pOldEntry->MoveTo( aStart.Tab(), aStart.Col(), aStart.Row(), aEnd.Col(), aEnd.Row() ); @@ -518,7 +518,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) } else { - // neuen Bereich einfuegen + // neuen Bereich einfuegen ScDBData* pNewEntry = new ScDBData( aNewName, aStart.Tab(), aStart.Col(), aStart.Row(), @@ -540,11 +540,11 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) aBtnAdd.Disable(); aBtnRemove.Disable(); aEdAssign.SetText( EMPTY_STRING ); - aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen + aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen aBtnDoSize.Check( FALSE ); aBtnKeepFmt.Check( FALSE ); aBtnStripData.Check( FALSE ); - SetInfoStrings( NULL ); // leer + SetInfoStrings( NULL ); // leer theCurArea = ScRange(); bSaved=TRUE; pSaveObj->Save(); @@ -571,13 +571,13 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) { - USHORT nRemoveAt = 0; + USHORT nRemoveAt = 0; const String aStrEntry = aEdName.GetText(); if ( aLocalDbCol.SearchName( aStrEntry, nRemoveAt ) ) { String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY ); - String aMsg = aStrDelMsg.GetToken( 0, '#' ); + String aMsg = aStrDelMsg.GetToken( 0, '#' ); aMsg += aStrEntry; aMsg += aStrDelMsg.GetToken( 1, '#' ); @@ -607,11 +607,11 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) aBtnRemove.Disable(); aEdAssign.SetText( EMPTY_STRING ); theCurArea = ScRange(); - aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen + aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen aBtnDoSize.Check( FALSE ); aBtnKeepFmt.Check( FALSE ); aBtnStripData.Check( FALSE ); - SetInfoStrings( NULL ); // leer + SetInfoStrings( NULL ); // leer bSaved=FALSE; pSaveObj->Restore(); NameModifyHdl( 0 ); @@ -624,29 +624,29 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG ) { - String theName = aEdName.GetText(); - BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND + String theName = aEdName.GetText(); + BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND != aEdName.GetEntryPos( theName )); if ( theName.Len() == 0 ) { if ( aBtnAdd.GetText() != aStrAdd ) aBtnAdd.SetText( aStrAdd ); - aBtnAdd .Disable(); - aBtnRemove .Disable(); + aBtnAdd .Disable(); + aBtnRemove .Disable(); aFlAssign .Disable(); - aBtnHeader .Disable(); - aBtnDoSize .Disable(); - aBtnKeepFmt .Disable(); + aBtnHeader .Disable(); + aBtnDoSize .Disable(); + aBtnKeepFmt .Disable(); aBtnStripData.Disable(); - aFTSource .Disable(); + aFTSource .Disable(); aFTOperations.Disable(); - aEdAssign .Disable(); - aRbAssign .Disable(); + aEdAssign .Disable(); + aRbAssign .Disable(); //bSaved=FALSE; //pSaveObj->Restore(); //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg bRefInputMode = FALSE; } else @@ -709,7 +709,7 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG ) IMPL_LINK( ScDbNameDlg, AssModifyHdl, void *, EMPTYARG ) { - // hier parsen fuer Save() etc. + // hier parsen fuer Save() etc. ScRange aTmpRange; String aText = aEdAssign.GetText(); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index e665b215c0e9..d206783c358a 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.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/dbgui/dpgroupdlg.hrc b/sc/source/ui/dbgui/dpgroupdlg.hrc index 5a4797489ddf..a75edbb32345 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.hrc +++ b/sc/source/ui/dbgui/dpgroupdlg.hrc @@ -1,7 +1,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/dbgui/dpgroupdlg.src b/sc/source/ui/dbgui/dpgroupdlg.src index f9a5ac589af5..ba2aaec3edc1 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.src +++ b/sc/source/ui/dbgui/dpgroupdlg.src @@ -1,7 +1,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/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxx index b05d9c193638..01a66100d226 100644 --- a/sc/source/ui/dbgui/expftext.cxx +++ b/sc/source/ui/dbgui/expftext.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 @@ -35,16 +35,16 @@ #include <vcl/help.hxx> /************************************************************************* -#* Member: ScExpandedFixedText Datum:18.09.97 +#* Member: ScExpandedFixedText Datum:18.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: MD_Test +#* Klasse: MD_Test #* -#* Funktion: Konstruktor der Klasse SvxCtrDial +#* Funktion: Konstruktor der Klasse SvxCtrDial #* -#* Input: Parent- Window, Resource ID +#* Input: Parent- Window, Resource ID #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -56,25 +56,25 @@ ScExpandedFixedText::ScExpandedFixedText( Window* pParent, } /************************************************************************* -#* Member: RequestHelp Datum:18.09.97 +#* Member: RequestHelp Datum:18.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScExpandedFixedText +#* Klasse: ScExpandedFixedText #* -#* Funktion: Die Methode wird gerufen, um Hilfe fuer das Fenster -#* anzuzeigen. Zeigt das Fenster einen gekuerzten Text -#* an, so wird selbiger in voller Laenge angezeigt. +#* Funktion: Die Methode wird gerufen, um Hilfe fuer das Fenster +#* anzuzeigen. Zeigt das Fenster einen gekuerzten Text +#* an, so wird selbiger in voller Laenge angezeigt. #* -#* Input: HelpEvent +#* Input: HelpEvent #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ScExpandedFixedText::RequestHelp(const HelpEvent& rEvt) { - String aTxtStr = GetText(); - long nTxtWidth = GetTextWidth(aTxtStr); + String aTxtStr = GetText(); + long nTxtWidth = GetTextWidth(aTxtStr); if ( ( rEvt.GetMode() & HELPMODE_QUICK ) == HELPMODE_QUICK && nTxtWidth > GetSizePixel().Width()) { diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 8c181959f049..2aa99870587f 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.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 @@ -275,14 +275,14 @@ void ScDPFieldWindow::DrawField( void ScDPFieldWindow::Redraw() { - VirtualDevice aVirDev; + VirtualDevice aVirDev; // #i97623# VirtualDevice is always LTR while other windows derive direction from parent aVirDev.EnableRTL( IsRTLEnabled() ); aVirDev.SetMapMode( MAP_PIXEL ); - Point aPos0; - Size aSize( GetSizePixel() ); - Font aFont( GetFont() ); // Font vom Window + Point aPos0; + Size aSize( GetSizePixel() ); + Font aFont( GetFont() ); // Font vom Window aFont.SetTransparent( TRUE ); aVirDev.SetFont( aFont ); aVirDev.SetOutputSizePixel( aSize ); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index b95535f91717..d33a6743111b 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.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,41 +58,41 @@ // DEFINE -------------------------------------------------------------------- -#define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ +#define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString(rid) ).Execute() //============================================================================ -// class ScFilterDlg +// class ScFilterDlg //---------------------------------------------------------------------------- ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet& rArgSet ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_FILTER ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_FILTER ), // aFlCriteria ( this, ScResId( FL_CRITERIA ) ), - aLbConnect1 ( this, ScResId( LB_OP1 ) ), - aLbField1 ( this, ScResId( LB_FIELD1 ) ), - aLbCond1 ( this, ScResId( LB_COND1 ) ), - aEdVal1 ( this, ScResId( ED_VAL1 ) ), - aLbConnect2 ( this, ScResId( LB_OP2 ) ), - aLbField2 ( this, ScResId( LB_FIELD2 ) ), - aLbCond2 ( this, ScResId( LB_COND2 ) ), - aEdVal2 ( this, ScResId( ED_VAL2 ) ), - aLbConnect3 ( this, ScResId( LB_OP3 ) ), - aLbField3 ( this, ScResId( LB_FIELD3 ) ), - aLbCond3 ( this, ScResId( LB_COND3 ) ), - aEdVal3 ( this, ScResId( ED_VAL3 ) ), - aLbConnect4 ( this, ScResId( LB_OP4 ) ), - aLbField4 ( this, ScResId( LB_FIELD4 ) ), - aLbCond4 ( this, ScResId( LB_COND4 ) ), - aEdVal4 ( this, ScResId( ED_VAL4 ) ), - aFtConnect ( this, ScResId( FT_OP ) ), - aFtField ( this, ScResId( FT_FIELD ) ), - aFtCond ( this, ScResId( FT_COND ) ), - aFtVal ( this, ScResId( FT_VAL ) ), + aLbConnect1 ( this, ScResId( LB_OP1 ) ), + aLbField1 ( this, ScResId( LB_FIELD1 ) ), + aLbCond1 ( this, ScResId( LB_COND1 ) ), + aEdVal1 ( this, ScResId( ED_VAL1 ) ), + aLbConnect2 ( this, ScResId( LB_OP2 ) ), + aLbField2 ( this, ScResId( LB_FIELD2 ) ), + aLbCond2 ( this, ScResId( LB_COND2 ) ), + aEdVal2 ( this, ScResId( ED_VAL2 ) ), + aLbConnect3 ( this, ScResId( LB_OP3 ) ), + aLbField3 ( this, ScResId( LB_FIELD3 ) ), + aLbCond3 ( this, ScResId( LB_COND3 ) ), + aEdVal3 ( this, ScResId( ED_VAL3 ) ), + aLbConnect4 ( this, ScResId( LB_OP4 ) ), + aLbField4 ( this, ScResId( LB_FIELD4 ) ), + aLbCond4 ( this, ScResId( LB_COND4 ) ), + aEdVal4 ( this, ScResId( ED_VAL4 ) ), + aFtConnect ( this, ScResId( FT_OP ) ), + aFtField ( this, ScResId( FT_FIELD ) ), + aFtCond ( this, ScResId( FT_COND ) ), + aFtVal ( this, ScResId( FT_VAL ) ), aFlSeparator ( this, ScResId( FL_SEPARATOR ) ), aScrollBar ( this, ScResId( LB_SCROLL ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), @@ -101,28 +101,28 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), _INIT_COMMON_FILTER_RSCOBJS - aStrEmpty ( ScResId( SCSTR_EMPTY ) ), - aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ), - aStrRow ( ScResId( SCSTR_ROW ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aStrEmpty ( ScResId( SCSTR_EMPTY ) ), + aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ), + aStrRow ( ScResId( SCSTR_ROW ) ), + aStrColumn ( ScResId( SCSTR_COLUMN ) ), // - pOptionsMgr ( NULL ), - nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), - theQueryData ( ((const ScQueryItem&) + pOptionsMgr ( NULL ), + nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), + theQueryData ( ((const ScQueryItem&) rArgSet.Get( nWhichQuery )).GetQueryData() ), - pOutItem ( NULL ), - pViewData ( NULL ), - pDoc ( NULL ), - nSrcTab ( 0 ), - nFieldCount ( 0 ), - bRefInputMode ( FALSE ), - pTimer ( NULL ) + pOutItem ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), + nSrcTab ( 0 ), + nFieldCount ( 0 ), + bRefInputMode ( FALSE ), + pTimer ( NULL ) { for (USHORT i=0; i<=MAXCOL; i++) pEntryLists[i] = NULL; for (SCSIZE i=0;i<MAXQUERY;i++) { - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; } aBtnMore.SetMoreText( String(ScResId( SCSTR_MOREBTN_MOREOPTIONS )) ); aBtnMore.SetLessText( String(ScResId( SCSTR_MOREBTN_FEWEROPTIONS )) ); @@ -159,16 +159,16 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) const ScQueryItem& rQueryItem = (const ScQueryItem&) rArgSet.Get( nWhichQuery ); - aBtnOk.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); - aBtnMore.SetClickHdl ( LINK( this, ScFilterDlg, MoreClickHdl ) ); - aBtnHeader.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); - aBtnCase.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); + aBtnOk.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); + aBtnMore.SetClickHdl ( LINK( this, ScFilterDlg, MoreClickHdl ) ); + aBtnHeader.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); + aBtnCase.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); // - aLbField1.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); - aLbField2.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); - aLbField3.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); - aLbField4.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); + aLbField1.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); + aLbField2.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); + aLbField3.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); + aLbField4.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); aLbConnect1.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); aLbConnect2.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); aLbConnect3.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); @@ -179,23 +179,23 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) aLbCond3.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); aLbCond4.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); - pViewData = rQueryItem.GetViewData(); - pDoc = pViewData ? pViewData->GetDocument() : NULL; - nSrcTab = pViewData ? pViewData->GetTabNo() : static_cast<SCTAB>(0); + pViewData = rQueryItem.GetViewData(); + pDoc = pViewData ? pViewData->GetDocument() : NULL; + nSrcTab = pViewData ? pViewData->GetTabNo() : static_cast<SCTAB>(0); // fuer leichteren Zugriff: - aFieldLbArr [0] = &aLbField1; - aFieldLbArr [1] = &aLbField2; - aFieldLbArr [2] = &aLbField3; - aFieldLbArr [3] = &aLbField4; - aValueEdArr [0] = &aEdVal1; - aValueEdArr [1] = &aEdVal2; - aValueEdArr [2] = &aEdVal3; - aValueEdArr [3] = &aEdVal4; - aCondLbArr [0] = &aLbCond1; - aCondLbArr [1] = &aLbCond2; - aCondLbArr [2] = &aLbCond3; - aCondLbArr [3] = &aLbCond4; + aFieldLbArr [0] = &aLbField1; + aFieldLbArr [1] = &aLbField2; + aFieldLbArr [2] = &aLbField3; + aFieldLbArr [3] = &aLbField4; + aValueEdArr [0] = &aEdVal1; + aValueEdArr [1] = &aEdVal2; + aValueEdArr [2] = &aEdVal3; + aValueEdArr [3] = &aEdVal4; + aCondLbArr [0] = &aLbCond1; + aCondLbArr [1] = &aLbCond2; + aCondLbArr [2] = &aLbCond3; + aCondLbArr [3] = &aLbCond4; aConnLbArr [0] = &aLbConnect1; aConnLbArr [1] = &aLbConnect2; aConnLbArr [2] = &aLbConnect3; @@ -203,7 +203,7 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) // Optionen initialisieren lassen: - pOptionsMgr = new ScFilterOptionsMgr( + pOptionsMgr = new ScFilterOptionsMgr( this, pViewData, theQueryData, @@ -229,14 +229,14 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) for ( SCSIZE i=0; i<4; i++ ) { - String aValStr; - USHORT nCondPos = 0; - USHORT nFieldSelPos = 0; + String aValStr; + USHORT nCondPos = 0; + USHORT nFieldSelPos = 0; ScQueryEntry& rEntry = theQueryData.GetEntry(i); if ( rEntry.bDoQuery ) { - nCondPos = (USHORT)rEntry.eOp; + nCondPos = (USHORT)rEntry.eOp; nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) ); if ( rEntry.nVal == SC_EMPTYFIELDS && !rEntry.bQueryByString && *rEntry.pStr == EMPTY_STRING ) { @@ -272,31 +272,31 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) aScrollBar.SetRange( Range( 0, 4 ) ); aScrollBar.SetLineSize( 1 ); - aLbConnect1.Hide(); + aLbConnect1.Hide(); // Disable/Enable Logik: (aLbField1.GetSelectEntryPos() != 0) && (aLbField2.GetSelectEntryPos() != 0) - ? aLbConnect2.SelectEntryPos( (USHORT)theQueryData.GetEntry(1).eConnect ) + ? aLbConnect2.SelectEntryPos( (USHORT)theQueryData.GetEntry(1).eConnect ) : aLbConnect2.SetNoSelection(); (aLbField2.GetSelectEntryPos() != 0) && (aLbField3.GetSelectEntryPos() != 0) - ? aLbConnect3.SelectEntryPos( (USHORT)theQueryData.GetEntry(2).eConnect ) + ? aLbConnect3.SelectEntryPos( (USHORT)theQueryData.GetEntry(2).eConnect ) : aLbConnect3.SetNoSelection(); (aLbField3.GetSelectEntryPos() != 0) && (aLbField4.GetSelectEntryPos() != 0) - ? aLbConnect4.SelectEntryPos( (USHORT)theQueryData.GetEntry(3).eConnect ) + ? aLbConnect4.SelectEntryPos( (USHORT)theQueryData.GetEntry(3).eConnect ) : aLbConnect4.SetNoSelection(); if ( aLbField1.GetSelectEntryPos() == 0 ) { - aLbConnect2.Disable(); + aLbConnect2.Disable(); aLbField2.Disable(); aLbCond2.Disable(); aEdVal2.Disable(); } - else if ( aLbConnect2.GetSelectEntryCount() == 0 ) + else if ( aLbConnect2.GetSelectEntryCount() == 0 ) { aLbField2.Disable(); aLbCond2.Disable(); @@ -305,12 +305,12 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) if ( aLbField2.GetSelectEntryPos() == 0 ) { - aLbConnect3.Disable(); + aLbConnect3.Disable(); aLbField3.Disable(); aLbCond3.Disable(); aEdVal3.Disable(); } - else if ( aLbConnect3.GetSelectEntryCount() == 0 ) + else if ( aLbConnect3.GetSelectEntryCount() == 0 ) { aLbField3.Disable(); aLbCond3.Disable(); @@ -318,12 +318,12 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) } if ( aLbField3.GetSelectEntryPos() == 0 ) { - aLbConnect4.Disable(); + aLbConnect4.Disable(); aLbField4.Disable(); aLbCond4.Disable(); aEdVal4.Disable(); } - else if ( aLbConnect4.GetSelectEntryCount() == 0 ) + else if ( aLbConnect4.GetSelectEntryCount() == 0 ) { aLbField4.Disable(); aLbCond4.Disable(); @@ -333,9 +333,9 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) if(pDoc!=NULL && pDoc->GetChangeTrack()!=NULL) aBtnCopyResult.Disable(); // Modal-Modus einschalten -// SetDispatcherLock( TRUE ); +// SetDispatcherLock( TRUE ); //@BugID 54702 Enablen/Disablen nur noch in Basisklasse -// SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg +// SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } @@ -356,7 +356,7 @@ BOOL __EXPORT ScFilterDlg::Close() void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { - if ( bRefInputMode ) // Nur moeglich, wenn im Referenz-Editmodus + if ( bRefInputMode ) // Nur moeglich, wenn im Referenz-Editmodus { if ( rRef.aStart != rRef.aEnd ) RefInputStart( &aEdCopyArea ); @@ -398,13 +398,13 @@ void ScFilterDlg::FillFieldLists() if ( pDoc ) { - String aFieldName; - SCTAB nTab = nSrcTab; - SCCOL nFirstCol = theQueryData.nCol1; - SCROW nFirstRow = theQueryData.nRow1; - SCCOL nMaxCol = theQueryData.nCol2; - SCCOL col = 0; - USHORT i=1; + String aFieldName; + SCTAB nTab = nSrcTab; + SCCOL nFirstCol = theQueryData.nCol1; + SCROW nFirstRow = theQueryData.nRow1; + SCCOL nMaxCol = theQueryData.nCol2; + SCCOL col = 0; + USHORT i=1; for ( col=nFirstCol; col<=nMaxCol; col++ ) { @@ -432,10 +432,10 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) { if ( pDoc && nList>0 && nList<=4 ) { - ComboBox* pValList = aValueEdArr[nList-1]; - USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); - USHORT nListPos = 0; - String aCurValue = pValList->GetText(); + ComboBox* pValList = aValueEdArr[nList-1]; + USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); + USHORT nListPos = 0; + String aCurValue = pValList->GetText(); pValList->Clear(); pValList->InsertEntry( aStrNotEmpty, 0 ); @@ -444,26 +444,26 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) if ( nFieldSelPos ) { - WaitObject aWaiter( this ); // auch wenn nur die ListBox gefuellt wird + WaitObject aWaiter( this ); // auch wenn nur die ListBox gefuellt wird SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1; if (!pEntryLists[nColumn]) { USHORT nOffset = GetSliderPos(); - SCTAB nTab = nSrcTab; + SCTAB nTab = nSrcTab; SCROW nFirstRow = theQueryData.nRow1; SCROW nLastRow = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2; mbHasDates[nOffset+nList-1] = false; - // erstmal ohne die erste Zeile + // erstmal ohne die erste Zeile pEntryLists[nColumn] = new TypedScStrCollection( 128, 128 ); pEntryLists[nColumn]->SetCaseSensitive( aBtnCase.IsChecked() ); pDoc->GetFilterEntriesArea( nColumn, nFirstRow+1, nLastRow, nTab, *pEntryLists[nColumn], mbHasDates[nOffset+nList-1] ); - // Eintrag fuer die erste Zeile - //! Eintrag (pHdrEntry) ohne Collection erzeugen? + // Eintrag fuer die erste Zeile + //! Eintrag (pHdrEntry) ohne Collection erzeugen? nHeaderPos[nColumn] = USHRT_MAX; TypedScStrCollection aHdrColl( 1, 1 ); @@ -481,7 +481,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) "Header-Eintrag nicht wiedergefunden" ); } else - delete pNewEntry; // war schon drin + delete pNewEntry; // war schon drin } } @@ -505,7 +505,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) void ScFilterDlg::UpdateHdrInValueList( USHORT nList ) { - //! GetText / SetText ?? + //! GetText / SetText ?? if ( pDoc && nList>0 && nList<=4 ) { @@ -519,7 +519,7 @@ void ScFilterDlg::UpdateHdrInValueList( USHORT nList ) if ( nPos != USHRT_MAX ) { ComboBox* pValList = aValueEdArr[nList-1]; - USHORT nListPos = nPos + 2; // nach "leer" und "nicht leer" + USHORT nListPos = nPos + 2; // nach "leer" und "nicht leer" TypedStrData* pHdrEntry = (*pEntryLists[nColumn])[nPos]; if ( pHdrEntry ) @@ -528,12 +528,12 @@ void ScFilterDlg::UpdateHdrInValueList( USHORT nList ) BOOL bWasThere = ( pValList->GetEntry(nListPos) == aHdrStr ); BOOL bInclude = !aBtnHeader.IsChecked(); - if (bInclude) // Eintrag aufnehmen + if (bInclude) // Eintrag aufnehmen { if (!bWasThere) pValList->InsertEntry(aHdrStr, nListPos); } - else // Eintrag weglassen + else // Eintrag weglassen { if (bWasThere) pValList->RemoveEntry(nListPos); @@ -582,8 +582,8 @@ USHORT ScFilterDlg::GetFieldSelPos( SCCOL nField ) ScQueryItem* ScFilterDlg::GetOutputItem() { - ScAddress theCopyPos; - ScQueryParam theParam( theQueryData ); + ScAddress theCopyPos; + ScQueryParam theParam( theQueryData ); BOOL bCopyPosOk = FALSE; if ( aBtnCopyResult.IsChecked() ) @@ -601,26 +601,26 @@ ScQueryItem* ScFilterDlg::GetOutputItem() if ( aBtnCopyResult.IsChecked() && bCopyPosOk ) { theParam.bInplace = FALSE; - theParam.nDestTab = theCopyPos.Tab(); - theParam.nDestCol = theCopyPos.Col(); - theParam.nDestRow = theCopyPos.Row(); + theParam.nDestTab = theCopyPos.Tab(); + theParam.nDestCol = theCopyPos.Col(); + theParam.nDestRow = theCopyPos.Row(); } else { theParam.bInplace = TRUE; - theParam.nDestTab = 0; - theParam.nDestCol = 0; - theParam.nDestRow = 0; + theParam.nDestTab = 0; + theParam.nDestCol = 0; + theParam.nDestRow = 0; } - theParam.bHasHeader = aBtnHeader.IsChecked(); - theParam.bByRow = TRUE; - theParam.bDuplicate = !aBtnUnique.IsChecked(); - theParam.bCaseSens = aBtnCase.IsChecked(); - theParam.bRegExp = aBtnRegExp.IsChecked(); - theParam.bDestPers = aBtnDestPers.IsChecked(); + theParam.bHasHeader = aBtnHeader.IsChecked(); + theParam.bByRow = TRUE; + theParam.bDuplicate = !aBtnUnique.IsChecked(); + theParam.bCaseSens = aBtnCase.IsChecked(); + theParam.bRegExp = aBtnRegExp.IsChecked(); + theParam.bDestPers = aBtnDestPers.IsChecked(); - // nur die drei eingestellten - alles andere zuruecksetzen + // nur die drei eingestellten - alles andere zuruecksetzen DELETEZ( pOutItem ); pOutItem = new ScQueryItem( nWhichQuery, &theParam ); @@ -690,7 +690,7 @@ IMPL_LINK( ScFilterDlg, MoreClickHdl, MoreButton*, EMPTYARG ) pTimer->Stop(); bRefInputMode = FALSE; //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } return 0; } @@ -728,7 +728,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbCond1.Enable(); aEdVal1.Enable(); - USHORT nConnect1 = aLbConnect1.GetSelectEntryPos(); + USHORT nConnect1 = aLbConnect1.GetSelectEntryPos(); USHORT nQE = nOffset; theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect1; bRefreshExceptQuery[nQE]=TRUE; @@ -740,7 +740,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbCond2.Enable(); aEdVal2.Enable(); - USHORT nConnect2 = aLbConnect2.GetSelectEntryPos(); + USHORT nConnect2 = aLbConnect2.GetSelectEntryPos(); USHORT nQE = 1+nOffset; theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect2; bRefreshExceptQuery[nQE]=TRUE; @@ -751,7 +751,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbCond3.Enable(); aEdVal3.Enable(); - USHORT nConnect3 = aLbConnect3.GetSelectEntryPos(); + USHORT nConnect3 = aLbConnect3.GetSelectEntryPos(); USHORT nQE = 2+nOffset; theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect3; bRefreshExceptQuery[nQE]=TRUE; @@ -763,7 +763,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbCond4.Enable(); aEdVal4.Enable(); - USHORT nConnect4 = aLbConnect4.GetSelectEntryPos(); + USHORT nConnect4 = aLbConnect4.GetSelectEntryPos(); USHORT nQE = 3+nOffset; theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect4; bRefreshExceptQuery[nQE]=TRUE; @@ -802,7 +802,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) for (USHORT i= nOffset; i< MAXQUERY; i++) { theQueryData.GetEntry(i).bDoQuery = FALSE; - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0); } bRefreshExceptQuery[nOffset] =TRUE; @@ -815,7 +815,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbConnect2.Enable(); } theQueryData.GetEntry(nOffset).bDoQuery = TRUE; - USHORT nField = pLb->GetSelectEntryPos(); + USHORT nField = pLb->GetSelectEntryPos(); theQueryData.GetEntry(nOffset).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; } } @@ -846,10 +846,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) for (USHORT i= nTemp; i< MAXQUERY; i++) { theQueryData.GetEntry(i).bDoQuery = FALSE; - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0); } - bRefreshExceptQuery[nTemp]=TRUE; + bRefreshExceptQuery[nTemp]=TRUE; } else { @@ -858,7 +858,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { aLbConnect3.Enable(); } - USHORT nField = pLb->GetSelectEntryPos(); + USHORT nField = pLb->GetSelectEntryPos(); USHORT nQ=1+nOffset; theQueryData.GetEntry(nQ).bDoQuery = TRUE; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -883,10 +883,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) for (USHORT i= nTemp; i< MAXQUERY; i++) { theQueryData.GetEntry(i).bDoQuery = FALSE; - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0); } - bRefreshExceptQuery[nTemp]=TRUE; + bRefreshExceptQuery[nTemp]=TRUE; } else { @@ -895,8 +895,8 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { aLbConnect4.Enable(); } - - USHORT nField = pLb->GetSelectEntryPos(); + + USHORT nField = pLb->GetSelectEntryPos(); USHORT nQ=2+nOffset; theQueryData.GetEntry(nQ).bDoQuery = TRUE; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -912,15 +912,15 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) for (USHORT i= nTemp; i< MAXQUERY; i++) { theQueryData.GetEntry(i).bDoQuery = FALSE; - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0); } - bRefreshExceptQuery[nTemp]=TRUE; + bRefreshExceptQuery[nTemp]=TRUE; } else { UpdateValueList( 4 ); - USHORT nField = pLb->GetSelectEntryPos(); + USHORT nField = pLb->GetSelectEntryPos(); USHORT nQ=3+nOffset; theQueryData.GetEntry(nQ).bDoQuery = TRUE; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -941,7 +941,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) USHORT nQ=2+nOffset; theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos(); } - else + else { USHORT nQ=3+nOffset; theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos(); @@ -955,13 +955,13 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { - // Spaltenkoepfe: - // FeldListen: Spaltexx <-> Spaltenkopf-String - // WertListen: Spaltenkopf-Wert entfaellt. - // Gross-/Kleinschreibung: - // WertListen: komplett neu + // Spaltenkoepfe: + // FeldListen: Spaltexx <-> Spaltenkopf-String + // WertListen: Spaltenkopf-Wert entfaellt. + // Gross-/Kleinschreibung: + // WertListen: komplett neu - if ( pBox == &aBtnHeader ) // Feldlisten und Wertlisten + if ( pBox == &aBtnHeader ) // Feldlisten und Wertlisten { USHORT nCurSel1 = aLbField1.GetSelectEntryPos(); USHORT nCurSel2 = aLbField2.GetSelectEntryPos(); @@ -979,12 +979,12 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) UpdateHdrInValueList( 4 ); } - if ( pBox == &aBtnCase ) // Wertlisten komplett + if ( pBox == &aBtnCase ) // Wertlisten komplett { for (USHORT i=0; i<=MAXCOL; i++) DELETEZ( pEntryLists[i] ); - UpdateValueList( 1 ); // aktueller Text wird gemerkt + UpdateValueList( 1 ); // aktueller Text wird gemerkt UpdateValueList( 2 ); UpdateValueList( 3 ); UpdateValueList( 4 ); @@ -1003,9 +1003,9 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) USHORT nQE =i + nOffset; if ( pEd ) { - String aStrVal = pEd->GetText(); - ListBox* pLbCond = &aLbCond1; - ListBox* pLbField = &aLbField1; + String aStrVal = pEd->GetText(); + ListBox* pLbCond = &aLbCond1; + ListBox* pLbField = &aLbField1; if ( pEd == &aEdVal2 ) { pLbCond = &aLbCond2; @@ -1056,21 +1056,21 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) } else { - *rEntry.pStr = aStrVal; - rEntry.nVal = 0; + *rEntry.pStr = aStrVal; + rEntry.nVal = 0; rEntry.bQueryByString = TRUE; } - USHORT nField = pLbField->GetSelectEntryPos(); + USHORT nField = pLbField->GetSelectEntryPos(); rEntry.nField = nField ? (theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0); - + ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectEntryPos(); - rEntry.eOp = eOp; + rEntry.eOp = eOp; rEntry.bQueryByDate = mbHasDates[nQE]; } - } + } return 0; } @@ -1091,23 +1091,23 @@ USHORT ScFilterDlg::GetSliderPos() return (USHORT) aScrollBar.GetThumbPos(); } void ScFilterDlg::RefreshEditRow( USHORT nOffset ) -{ - if (nOffset==0) +{ + if (nOffset==0) aConnLbArr[0]->Hide(); else - aConnLbArr[0]->Show(); + aConnLbArr[0]->Show(); for ( USHORT i=0; i<4; i++ ) { - String aValStr; - USHORT nCondPos = 0; - USHORT nFieldSelPos = 0; + String aValStr; + USHORT nCondPos = 0; + USHORT nFieldSelPos = 0; USHORT nQE = i+nOffset; ScQueryEntry& rEntry = theQueryData.GetEntry( nQE); if ( rEntry.bDoQuery || bRefreshExceptQuery[nQE] ) { - nCondPos = (USHORT)rEntry.eOp; + nCondPos = (USHORT)rEntry.eOp; if(rEntry.bDoQuery) nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) ); @@ -1156,9 +1156,9 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset ) else aConnLbArr[i]->SetNoSelection(); } - + } - else + else { if (nOffset==0) { @@ -1166,7 +1166,7 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset ) { aConnLbArr[i+1]->SetNoSelection(); aConnLbArr[i+1]->Disable(); - } + } } else { @@ -1179,7 +1179,7 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset ) aFieldLbArr[i]->Disable(); aCondLbArr[i]->Disable(); aValueEdArr[i]->Disable(); - } + } aFieldLbArr[i]->SelectEntryPos( nFieldSelPos ); aCondLbArr [i]->SelectEntryPos( nCondPos ); aValueEdArr[i]->SetText( aValStr ); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index d6b331494667..894e1ae80bd9 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.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,44 +52,44 @@ //---------------------------------------------------------------------------- ScFilterOptionsMgr::ScFilterOptionsMgr( - Dialog* ptrDlg, - ScViewData* ptrViewData, - const ScQueryParam& refQueryData, - MoreButton& refBtnMore, - CheckBox& refBtnCase, - CheckBox& refBtnRegExp, - CheckBox& refBtnHeader, - CheckBox& refBtnUnique, - CheckBox& refBtnCopyResult, - CheckBox& refBtnDestPers, - ListBox& refLbCopyArea, - Edit& refEdCopyArea, - formula::RefButton& refRbCopyArea, - FixedText& refFtDbAreaLabel, - FixedInfo& refFtDbArea, + Dialog* ptrDlg, + ScViewData* ptrViewData, + const ScQueryParam& refQueryData, + MoreButton& refBtnMore, + CheckBox& refBtnCase, + CheckBox& refBtnRegExp, + CheckBox& refBtnHeader, + CheckBox& refBtnUnique, + CheckBox& refBtnCopyResult, + CheckBox& refBtnDestPers, + ListBox& refLbCopyArea, + Edit& refEdCopyArea, + formula::RefButton& refRbCopyArea, + FixedText& refFtDbAreaLabel, + FixedInfo& refFtDbArea, FixedLine& refFlOptions, - const String& refStrNoName, - const String& refStrUndefined ) - - : pDlg ( ptrDlg ), - pViewData ( ptrViewData ), - pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ), - rBtnMore ( refBtnMore ), - rBtnCase ( refBtnCase ), - rBtnRegExp ( refBtnRegExp ), - rBtnHeader ( refBtnHeader ), - rBtnUnique ( refBtnUnique ), - rBtnCopyResult ( refBtnCopyResult ), - rBtnDestPers ( refBtnDestPers ), - rLbCopyPos ( refLbCopyArea ), - rEdCopyPos ( refEdCopyArea ), - rRbCopyPos ( refRbCopyArea ), - rFtDbAreaLabel ( refFtDbAreaLabel ), - rFtDbArea ( refFtDbArea ), + const String& refStrNoName, + const String& refStrUndefined ) + + : pDlg ( ptrDlg ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ), + rBtnMore ( refBtnMore ), + rBtnCase ( refBtnCase ), + rBtnRegExp ( refBtnRegExp ), + rBtnHeader ( refBtnHeader ), + rBtnUnique ( refBtnUnique ), + rBtnCopyResult ( refBtnCopyResult ), + rBtnDestPers ( refBtnDestPers ), + rLbCopyPos ( refLbCopyArea ), + rEdCopyPos ( refEdCopyArea ), + rRbCopyPos ( refRbCopyArea ), + rFtDbAreaLabel ( refFtDbAreaLabel ), + rFtDbArea ( refFtDbArea ), rFlOptions ( refFlOptions ), - rStrNoName ( refStrNoName ), - rStrUndefined ( refStrUndefined ), - rQueryData ( refQueryData ) + rStrNoName ( refStrNoName ), + rStrUndefined ( refStrUndefined ), + rQueryData ( refQueryData ) { Init(); } @@ -113,8 +113,8 @@ void ScFilterOptionsMgr::Init() { DBG_ASSERT( pViewData && pDoc, "Init failed :-/" ); - rLbCopyPos.SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbPosSelHdl ) ); - rEdCopyPos.SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdPosModifyHdl ) ); + rLbCopyPos.SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbPosSelHdl ) ); + rEdCopyPos.SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdPosModifyHdl ) ); rBtnCopyResult.SetClickHdl( LINK( this, ScFilterOptionsMgr, BtnCopyResultHdl ) ); rBtnMore.AddWindow( &rBtnCase ); @@ -130,23 +130,23 @@ void ScFilterOptionsMgr::Init() rBtnMore.AddWindow( &rFtDbArea ); rBtnMore.AddWindow( &rFlOptions ); - rBtnCase .Check( rQueryData.bCaseSens ); - rBtnHeader .Check( rQueryData.bHasHeader ); - rBtnRegExp .Check( rQueryData.bRegExp ); - rBtnUnique .Check( !rQueryData.bDuplicate ); + rBtnCase .Check( rQueryData.bCaseSens ); + rBtnHeader .Check( rQueryData.bHasHeader ); + rBtnRegExp .Check( rQueryData.bRegExp ); + rBtnUnique .Check( !rQueryData.bDuplicate ); if ( pViewData && pDoc ) { - String theAreaStr; - ScRange theCurArea ( ScAddress( rQueryData.nCol1, + String theAreaStr; + ScRange theCurArea ( ScAddress( rQueryData.nCol1, rQueryData.nRow1, pViewData->GetTabNo() ), ScAddress( rQueryData.nCol2, rQueryData.nRow2, pViewData->GetTabNo() ) ); - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - String theDbArea; - String theDbName = rStrNoName; + ScDBCollection* pDBColl = pDoc->GetDBCollection(); + String theDbArea; + String theDbName = rStrNoName; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv ); @@ -168,7 +168,7 @@ void ScFilterOptionsMgr::Init() rLbCopyPos.SetEntryData( nInsert, new String( aRefStr ) ); } - rBtnDestPers.Check( TRUE ); // beim Aufruf immer an + rBtnDestPers.Check( TRUE ); // beim Aufruf immer an rLbCopyPos.SelectEntryPos( 0 ); rEdCopyPos.SetText( EMPTY_STRING ); @@ -181,9 +181,9 @@ void ScFilterOptionsMgr::Init() if ( pDBColl ) { - ScAddress& rStart = theCurArea.aStart; - ScAddress& rEnd = theCurArea.aEnd; - ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(), + ScAddress& rStart = theCurArea.aStart; + ScAddress& rEnd = theCurArea.aEnd; + ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(), rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() ); if ( pDBData ) @@ -282,15 +282,15 @@ IMPL_LINK( ScFilterOptionsMgr, EdPosModifyHdl, Edit*, pEd ) { if ( pEd == &rEdCopyPos ) { - String theCurPosStr = pEd->GetText(); - USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); + String theCurPosStr = pEd->GetText(); + USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); if ( SCA_VALID == (nResult & SCA_VALID) ) { - String* pStr = NULL; - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = rLbCopyPos.GetEntryCount(); + String* pStr = NULL; + BOOL bFound = FALSE; + USHORT i = 0; + USHORT nCount = rLbCopyPos.GetEntryCount(); for ( i=2; i<nCount && !bFound; i++ ) { diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index 641ce7dc6374..b7a614e9224f 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.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 @@ -39,8 +39,8 @@ static const sal_Char pStrFix[] = "FIX"; //------------------------------------------------------------------------ -// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) -// darum ab Version 336 Komma stattdessen +// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) +// darum ab Version 336 Komma stattdessen ScImportOptions::ScImportOptions( const String& rStr ) @@ -55,8 +55,8 @@ ScImportOptions::ScImportOptions( const String& rStr ) else nFieldSepCode = (sal_Unicode) aToken.ToInt32(); nTextSepCode = (sal_Unicode) rStr.GetToken(1,',').ToInt32(); - aStrFont = rStr.GetToken(2,','); - eCharSet = ScGlobal::GetCharsetValue(aStrFont); + aStrFont = rStr.GetToken(2,','); + eCharSet = ScGlobal::GetCharsetValue(aStrFont); bSaveAsShown = (rStr.GetToken( 3, ',' ).ToInt32() ? TRUE : FALSE); } } @@ -65,7 +65,7 @@ ScImportOptions::ScImportOptions( const String& rStr ) String ScImportOptions::BuildString() const { - String aResult; + String aResult; if( bFixedWidth ) aResult.AppendAscii( pStrFix ); diff --git a/sc/source/ui/dbgui/imoptdlg.hrc b/sc/source/ui/dbgui/imoptdlg.hrc index 5fd9256e8009..b6f1bf5555d2 100644 --- a/sc/source/ui/dbgui/imoptdlg.hrc +++ b/sc/source/ui/dbgui/imoptdlg.hrc @@ -1,7 +1,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 @@ -28,16 +28,16 @@ //#define RID_SCDLG_IMPORTOPT 2256 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 -#define FT_FIELDSEP 4 -#define ED_FIELDSEP 5 -#define FT_TEXTSEP 6 -#define ED_TEXTSEP 7 -#define FT_FONT 8 -#define DDLB_FONT 9 -#define LB_FONT 10 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 +#define FT_FIELDSEP 4 +#define ED_FIELDSEP 5 +#define FT_TEXTSEP 6 +#define ED_TEXTSEP 7 +#define FT_FONT 8 +#define DDLB_FONT 9 +#define LB_FONT 10 #define FL_FIELDOPT 11 #define CB_FIXEDWIDTH 12 #define CB_SAVESHOWN 13 diff --git a/sc/source/ui/dbgui/imoptdlg.src b/sc/source/ui/dbgui/imoptdlg.src index 914f2d1fb027..af38520aadb3 100644 --- a/sc/source/ui/dbgui/imoptdlg.src +++ b/sc/source/ui/dbgui/imoptdlg.src @@ -1,7 +1,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 @@ -99,7 +99,7 @@ ModalDialog RID_SCDLG_IMPORTOPT CheckBox CB_SAVESHOWN { Pos = MAP_APPFONT( 12, 66 ); - Size = MAP_APPFONT( 172, 10 ); + Size = MAP_APPFONT( 172, 10 ); TabStop = TRUE; Hide = TRUE; Text [ en-US ] = "Save cell content as ~shown"; diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src index cd59bf3b099d..7f8eab69f716 100644 --- a/sc/source/ui/dbgui/outline.src +++ b/sc/source/ui/dbgui/outline.src @@ -1,7 +1,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/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index dfbf7e8989fa..5108b69b2d1f 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.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,54 +57,54 @@ //================================================================== -ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, - const SfxItemSet& rArgSet, - SCTAB nSourceTab ) +ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, + const SfxItemSet& rArgSet, + SCTAB nSourceTab ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTFILTER ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTFILTER ) ), // aFlCriteria ( this, ScResId( FL_CRITERIA ) ), - aLbField1 ( this, ScResId( LB_FIELD1 ) ), - aLbCond1 ( this, ScResId( LB_COND1 ) ), - aEdVal1 ( this, ScResId( ED_VAL1 ) ), - aLbConnect1 ( this, ScResId( LB_OP1 ) ), - aLbField2 ( this, ScResId( LB_FIELD2 ) ), - aLbCond2 ( this, ScResId( LB_COND2 ) ), - aEdVal2 ( this, ScResId( ED_VAL2 ) ), - aLbConnect2 ( this, ScResId( LB_OP2 ) ), - aLbField3 ( this, ScResId( LB_FIELD3 ) ), - aLbCond3 ( this, ScResId( LB_COND3 ) ), - aEdVal3 ( this, ScResId( ED_VAL3 ) ), - aFtConnect ( this, ScResId( FT_OP ) ), - aFtField ( this, ScResId( FT_FIELD ) ), - aFtCond ( this, ScResId( FT_COND ) ), - aFtVal ( this, ScResId( FT_VAL ) ), + aLbField1 ( this, ScResId( LB_FIELD1 ) ), + aLbCond1 ( this, ScResId( LB_COND1 ) ), + aEdVal1 ( this, ScResId( ED_VAL1 ) ), + aLbConnect1 ( this, ScResId( LB_OP1 ) ), + aLbField2 ( this, ScResId( LB_FIELD2 ) ), + aLbCond2 ( this, ScResId( LB_COND2 ) ), + aEdVal2 ( this, ScResId( ED_VAL2 ) ), + aLbConnect2 ( this, ScResId( LB_OP2 ) ), + aLbField3 ( this, ScResId( LB_FIELD3 ) ), + aLbCond3 ( this, ScResId( LB_COND3 ) ), + aEdVal3 ( this, ScResId( ED_VAL3 ) ), + aFtConnect ( this, ScResId( FT_OP ) ), + aFtField ( this, ScResId( FT_FIELD ) ), + aFtCond ( this, ScResId( FT_COND ) ), + aFtVal ( this, ScResId( FT_VAL ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), - aBtnCase ( this, ScResId( BTN_CASE ) ), - aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), - aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), - aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), - aFtDbArea ( this, ScResId( FT_DBAREA ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), - aStrNone ( ScResId( SCSTR_NONE ) ), - aStrEmpty ( ScResId( SCSTR_EMPTY ) ), - aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ), - aStrRow ( ScResId( SCSTR_ROW ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aBtnCase ( this, ScResId( BTN_CASE ) ), + aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), + aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), + aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), + aFtDbArea ( this, ScResId( FT_DBAREA ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), + aStrNone ( ScResId( SCSTR_NONE ) ), + aStrEmpty ( ScResId( SCSTR_EMPTY ) ), + aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ), + aStrRow ( ScResId( SCSTR_ROW ) ), + aStrColumn ( ScResId( SCSTR_COLUMN ) ), // - nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), - theQueryData ( ((const ScQueryItem&) + nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), + theQueryData ( ((const ScQueryItem&) rArgSet.Get( nWhichQuery )).GetQueryData() ), - pOutItem ( NULL ), - pViewData ( NULL ), - pDoc ( NULL ), - nSrcTab ( nSourceTab ), // ist nicht im QueryParam - nFieldCount ( 0 ) + pOutItem ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), + nSrcTab ( nSourceTab ), // ist nicht im QueryParam + nFieldCount ( 0 ) { for (USHORT i=0; i<=MAXCOL; i++) pEntryLists[i] = NULL; @@ -131,11 +131,11 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) const ScQueryItem& rQueryItem = (const ScQueryItem&) rArgSet.Get( nWhichQuery ); - aBtnCase.SetClickHdl ( LINK( this, ScPivotFilterDlg, CheckBoxHdl ) ); + aBtnCase.SetClickHdl ( LINK( this, ScPivotFilterDlg, CheckBoxHdl ) ); - aLbField1.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); - aLbField2.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); - aLbField3.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); + aLbField1.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); + aLbField2.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); + aLbField3.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); aLbConnect1.SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); aLbConnect2.SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); @@ -146,36 +146,36 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) aBtnMore.AddWindow( &aFtDbArea ); aBtnMore.AddWindow( &aFlOptions ); - aBtnCase .Check( theQueryData.bCaseSens ); - aBtnRegExp .Check( theQueryData.bRegExp ); - aBtnUnique .Check( !theQueryData.bDuplicate ); + aBtnCase .Check( theQueryData.bCaseSens ); + aBtnRegExp .Check( theQueryData.bRegExp ); + aBtnUnique .Check( !theQueryData.bDuplicate ); - pViewData = rQueryItem.GetViewData(); - pDoc = pViewData ? pViewData->GetDocument() : NULL; + pViewData = rQueryItem.GetViewData(); + pDoc = pViewData ? pViewData->GetDocument() : NULL; // fuer leichteren Zugriff: - aFieldLbArr [0] = &aLbField1; - aFieldLbArr [1] = &aLbField2; - aFieldLbArr [2] = &aLbField3; - aValueEdArr [0] = &aEdVal1; - aValueEdArr [1] = &aEdVal2; - aValueEdArr [2] = &aEdVal3; - aCondLbArr [0] = &aLbCond1; - aCondLbArr [1] = &aLbCond2; - aCondLbArr [2] = &aLbCond3; + aFieldLbArr [0] = &aLbField1; + aFieldLbArr [1] = &aLbField2; + aFieldLbArr [2] = &aLbField3; + aValueEdArr [0] = &aEdVal1; + aValueEdArr [1] = &aEdVal2; + aValueEdArr [2] = &aEdVal3; + aCondLbArr [0] = &aLbCond1; + aCondLbArr [1] = &aLbCond2; + aCondLbArr [2] = &aLbCond3; if ( pViewData && pDoc ) { - String theAreaStr; - ScRange theCurArea ( ScAddress( theQueryData.nCol1, + String theAreaStr; + ScRange theCurArea ( ScAddress( theQueryData.nCol1, theQueryData.nRow1, nSrcTab ), ScAddress( theQueryData.nCol2, theQueryData.nRow2, nSrcTab ) ); - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - String theDbArea; - String theDbName = aStrNoName; + ScDBCollection* pDBColl = pDoc->GetDBCollection(); + String theDbArea; + String theDbName = aStrNoName; /* * Ueberpruefen, ob es sich bei dem uebergebenen @@ -186,9 +186,9 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) if ( pDBColl ) { - ScAddress& rStart = theCurArea.aStart; - ScAddress& rEnd = theCurArea.aEnd; - ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(), + ScAddress& rStart = theCurArea.aStart; + ScAddress& rEnd = theCurArea.aEnd; + ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(), rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() ); if ( pDBData ) @@ -215,7 +215,7 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) { ScQueryEntry& rEntry = theQueryData.GetEntry(i); - String aValStr = *rEntry.pStr; + String aValStr = *rEntry.pStr; if (!rEntry.bQueryByString && aValStr == EMPTY_STRING) { if (rEntry.nVal == SC_EMPTYFIELDS) @@ -223,8 +223,8 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) else if (rEntry.nVal == SC_NONEMPTYFIELDS) aValStr = aStrNotEmpty; } - USHORT nCondPos = (USHORT)rEntry.eOp; - USHORT nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) ); + USHORT nCondPos = (USHORT)rEntry.eOp; + USHORT nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) ); aFieldLbArr[i]->SelectEntryPos( nFieldSelPos ); aCondLbArr [i]->SelectEntryPos( nCondPos ); @@ -297,13 +297,13 @@ void ScPivotFilterDlg::FillFieldLists() if ( pDoc ) { - String aFieldName; - SCTAB nTab = nSrcTab; - SCCOL nFirstCol = theQueryData.nCol1; - SCROW nFirstRow = theQueryData.nRow1; - SCCOL nMaxCol = theQueryData.nCol2; - SCCOL col = 0; - USHORT i=1; + String aFieldName; + SCTAB nTab = nSrcTab; + SCCOL nFirstCol = theQueryData.nCol1; + SCROW nFirstRow = theQueryData.nRow1; + SCCOL nMaxCol = theQueryData.nCol2; + SCCOL col = 0; + USHORT i=1; for ( col=nFirstCol; col<=nMaxCol; col++ ) { @@ -329,10 +329,10 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList ) { if ( pDoc && nList>0 && nList<=3 ) { - ComboBox* pValList = aValueEdArr[nList-1]; - USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); - USHORT nListPos = 0; - String aCurValue = pValList->GetText(); + ComboBox* pValList = aValueEdArr[nList-1]; + USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); + USHORT nListPos = 0; + String aCurValue = pValList->GetText(); pValList->Clear(); pValList->InsertEntry( aStrNotEmpty, 0 ); @@ -346,9 +346,9 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList ) { WaitObject aWaiter( this ); - SCTAB nTab = nSrcTab; - SCROW nFirstRow = theQueryData.nRow1; - SCROW nLastRow = theQueryData.nRow2; + SCTAB nTab = nSrcTab; + SCROW nFirstRow = theQueryData.nRow1; + SCROW nLastRow = theQueryData.nRow2; nFirstRow++; bool bHasDates = false; @@ -401,14 +401,14 @@ USHORT ScPivotFilterDlg::GetFieldSelPos( SCCOL nField ) const ScQueryItem& ScPivotFilterDlg::GetOutputItem() { - ScQueryParam theParam( theQueryData ); - USHORT nConnect1 = aLbConnect1.GetSelectEntryPos(); - USHORT nConnect2 = aLbConnect2.GetSelectEntryPos(); + ScQueryParam theParam( theQueryData ); + USHORT nConnect1 = aLbConnect1.GetSelectEntryPos(); + USHORT nConnect2 = aLbConnect2.GetSelectEntryPos(); for ( SCSIZE i=0; i<3; i++ ) { - USHORT nField = aFieldLbArr[i]->GetSelectEntryPos(); - ScQueryOp eOp = (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos(); + USHORT nField = aFieldLbArr[i]->GetSelectEntryPos(); + ScQueryOp eOp = (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos(); BOOL bDoThis = (aFieldLbArr[i]->GetSelectEntryPos() != 0); theParam.GetEntry(i).bDoQuery = bDoThis; @@ -426,26 +426,26 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() */ if ( aStrVal == aStrEmpty ) { - *rEntry.pStr = EMPTY_STRING; - rEntry.nVal = SC_EMPTYFIELDS; + *rEntry.pStr = EMPTY_STRING; + rEntry.nVal = SC_EMPTYFIELDS; rEntry.bQueryByString = FALSE; } else if ( aStrVal == aStrNotEmpty ) { - *rEntry.pStr = EMPTY_STRING; - rEntry.nVal = SC_NONEMPTYFIELDS; + *rEntry.pStr = EMPTY_STRING; + rEntry.nVal = SC_NONEMPTYFIELDS; rEntry.bQueryByString = FALSE; } else { - *rEntry.pStr = aStrVal; - rEntry.nVal = 0; + *rEntry.pStr = aStrVal; + rEntry.nVal = 0; rEntry.bQueryByString = TRUE; } - rEntry.nField = nField ? (theQueryData.nCol1 + + rEntry.nField = nField ? (theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0); - rEntry.eOp = eOp; + rEntry.eOp = eOp; } } @@ -457,13 +457,13 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() : SC_AND; theParam.bInplace = FALSE; - theParam.nDestTab = 0; // Woher kommen diese Werte? - theParam.nDestCol = 0; - theParam.nDestRow = 0; + theParam.nDestTab = 0; // Woher kommen diese Werte? + theParam.nDestCol = 0; + theParam.nDestRow = 0; - theParam.bDuplicate = !aBtnUnique.IsChecked(); - theParam.bCaseSens = aBtnCase.IsChecked(); - theParam.bRegExp = aBtnRegExp.IsChecked(); + theParam.bDuplicate = !aBtnUnique.IsChecked(); + theParam.bCaseSens = aBtnCase.IsChecked(); + theParam.bRegExp = aBtnRegExp.IsChecked(); if ( pOutItem ) DELETEZ( pOutItem ); pOutItem = new ScQueryItem( nWhichQuery, &theParam ); @@ -570,9 +570,9 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { - // bei Gross-/Kleinschreibung die Werte-Listen aktualisieren + // bei Gross-/Kleinschreibung die Werte-Listen aktualisieren - if ( pBox == &aBtnCase ) // Wertlisten + if ( pBox == &aBtnCase ) // Wertlisten { for (USHORT i=0; i<=MAXCOL; i++) DELETEZ( pEntryLists[i] ); @@ -597,11 +597,11 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) { if ( pEd ) { - String aStrVal = pEd->GetText(); - ListBox* pLb = &aLbCond1; + String aStrVal = pEd->GetText(); + ListBox* pLb = &aLbCond1; if ( pEd == &aEdVal2 ) pLb = &aLbCond2; - else if ( pEd == &aEdVal3 ) pLb = &aLbCond3; + else if ( pEd == &aEdVal3 ) pLb = &aLbCond3; // wenn einer der Sonderwerte leer/nicht-leer // gewaehlt wird, so macht nur der =-Operator Sinn: diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc index 1a97d4c75b52..097b0931ff3a 100644 --- a/sc/source/ui/dbgui/pivot.hrc +++ b/sc/source/ui/dbgui/pivot.hrc @@ -1,7 +1,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 @@ -26,7 +26,7 @@ ************************************************************************/ #include "sc.hrc" // ->RID_SCDLG_PIVOT_LAYOUT -#define BTN_OK 1 +#define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 #define BTN_MORE 4 @@ -67,15 +67,15 @@ #define RB_INAREA 41 #define ED_INAREA 42 -#define PIVOTSTR_SUM 1 -#define PIVOTSTR_COUNT 2 -#define PIVOTSTR_AVG 3 -#define PIVOTSTR_MAX 4 -#define PIVOTSTR_MIN 5 -#define PIVOTSTR_PROD 6 -#define PIVOTSTR_COUNT2 7 -#define PIVOTSTR_DEV 8 -#define PIVOTSTR_DEV2 9 -#define PIVOTSTR_VAR 10 -#define PIVOTSTR_VAR2 11 +#define PIVOTSTR_SUM 1 +#define PIVOTSTR_COUNT 2 +#define PIVOTSTR_AVG 3 +#define PIVOTSTR_MAX 4 +#define PIVOTSTR_MIN 5 +#define PIVOTSTR_PROD 6 +#define PIVOTSTR_COUNT2 7 +#define PIVOTSTR_DEV 8 +#define PIVOTSTR_DEV2 9 +#define PIVOTSTR_VAR 10 +#define PIVOTSTR_VAR2 11 diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src index 359c8a92d8e5..7e7fe2491ced 100644 --- a/sc/source/ui/dbgui/pivot.src +++ b/sc/source/ui/dbgui/pivot.src @@ -1,7 +1,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/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 4e834fb95935..ca4fbafb1400 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.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 @@ -833,7 +833,7 @@ short ScDPShowDetailDlg::Execute() String ScDPShowDetailDlg::GetDimensionName() const { - // Look up the internal dimension name which may be different from the + // Look up the internal dimension name which may be different from the // displayed field name. String aSelectedName = maLbDims.GetSelectEntry(); DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName); diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc index c9b6f562a9e1..4e155cadf1b9 100644 --- a/sc/source/ui/dbgui/pvfundlg.hrc +++ b/sc/source/ui/dbgui/pvfundlg.hrc @@ -1,7 +1,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 @@ #define FT_HIERARCHY 10 #define FT_DIMS 11 -#define CB_SHOWALL 1 +#define CB_SHOWALL 1 #define CB_LAYOUT_EMPTY 2 #define CB_SHOW 3 diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src index ed00f6a65fa5..b3ff8cab02bf 100644 --- a/sc/source/ui/dbgui/pvfundlg.src +++ b/sc/source/ui/dbgui/pvfundlg.src @@ -1,7 +1,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/dbgui/pvglob.hxx b/sc/source/ui/dbgui/pvglob.hxx index 2ad61405aae8..33e192afc4b3 100644 --- a/sc/source/ui/dbgui/pvglob.hxx +++ b/sc/source/ui/dbgui/pvglob.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/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 3b26d1c836f6..9757259181b7 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.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 @@ -106,7 +106,7 @@ PointerStyle lclGetPointerForField( ScDPFieldType eType ) ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const ScDPObject& rDPObject, bool bNewOutput ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_PIVOT_LAYOUT ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_PIVOT_LAYOUT ), aFlLayout ( this, ScResId( FL_LAYOUT ) ), aFtPage ( this, ScResId( FT_PAGE ) ), aWndPage ( this, ScResId( WND_PAGE ), TYPE_PAGE, &aFtPage ), @@ -117,49 +117,49 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar aFtData ( this, ScResId( FT_DATA ) ), aWndData ( this, ScResId( WND_DATA ), TYPE_DATA, &aFtData ), aWndSelect ( this, ScResId( WND_SELECT ), TYPE_SELECT, String(ScResId(STR_SELECT)) ), - aSlider ( this, ScResId( WND_HSCROLL ) ), - aFtInfo ( this, ScResId( FT_INFO ) ), + aSlider ( this, ScResId( WND_HSCROLL ) ), + aFtInfo ( this, ScResId( FT_INFO ) ), aFlAreas ( this, ScResId( FL_OUTPUT ) ), - aFtInArea ( this, ScResId( FT_INAREA) ), - aEdInPos ( this, ScResId( ED_INAREA) ), - aRbInPos ( this, ScResId( RB_INAREA ), &aEdInPos, this ), + aFtInArea ( this, ScResId( FT_INAREA) ), + aEdInPos ( this, ScResId( ED_INAREA) ), + aRbInPos ( this, ScResId( RB_INAREA ), &aEdInPos, this ), - aLbOutPos ( this, ScResId( LB_OUTAREA ) ), - aFtOutArea ( this, ScResId( FT_OUTAREA ) ), + aLbOutPos ( this, ScResId( LB_OUTAREA ) ), + aFtOutArea ( this, ScResId( FT_OUTAREA ) ), aEdOutPos ( this, this, ScResId( ED_OUTAREA ) ), - aRbOutPos ( this, ScResId( RB_OUTAREA ), &aEdOutPos, this ), + aRbOutPos ( this, ScResId( RB_OUTAREA ), &aEdOutPos, this ), aBtnIgnEmptyRows( this, ScResId( BTN_IGNEMPTYROWS ) ), - aBtnDetectCat ( this, ScResId( BTN_DETECTCAT ) ), - aBtnTotalCol ( this, ScResId( BTN_TOTALCOL ) ), - aBtnTotalRow ( this, ScResId( BTN_TOTALROW ) ), + aBtnDetectCat ( this, ScResId( BTN_DETECTCAT ) ), + aBtnTotalCol ( this, ScResId( BTN_TOTALCOL ) ), + aBtnTotalRow ( this, ScResId( BTN_TOTALROW ) ), aBtnFilter ( this, ScResId( BTN_FILTER ) ), aBtnDrillDown ( this, ScResId( BTN_DRILLDOWN ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), aBtnRemove ( this, ScResId( BTN_REMOVE ) ), aBtnOptions ( this, ScResId( BTN_OPTIONS ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrNewTable ( ScResId( SCSTR_NEWTABLE ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrNewTable ( ScResId( SCSTR_NEWTABLE ) ), - bIsDrag ( FALSE ), + bIsDrag ( FALSE ), pEditActive ( NULL ), eLastActiveType ( TYPE_SELECT ), - nOffset ( 0 ), + nOffset ( 0 ), // xDlgDPObject ( new ScDPObject( rDPObject ) ), - pViewData ( ((ScTabViewShell*)SfxViewShell::Current())-> + pViewData ( ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData() ), - pDoc ( ((ScTabViewShell*)SfxViewShell::Current())-> + pDoc ( ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData()->GetDocument() ), - bRefInputMode ( FALSE ) + bRefInputMode ( FALSE ) { xDlgDPObject->SetAlive( TRUE ); // needed to get structure information xDlgDPObject->FillOldParam( thePivotData, FALSE ); @@ -264,7 +264,7 @@ void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput) aLbOutPos .SetSelectHdl( LINK( this, ScDPLayoutDlg, SelAreaHdl ) ); aEdOutPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdModifyHdl ) ); - aEdInPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdInModifyHdl ) ); + aEdInPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdInModifyHdl ) ); aBtnOk .SetClickHdl ( LINK( this, ScDPLayoutDlg, OkHdl ) ); aBtnCancel.SetClickHdl ( LINK( this, ScDPLayoutDlg, CancelHdl ) ); Link aLink = LINK( this, ScDPLayoutDlg, GetFocusHdl ); @@ -291,7 +291,7 @@ void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput) String aRefStr; while ( aIter.Next( aName, aRange ) ) { - if ( !aIter.WasDBName() ) // hier keine DB-Bereiche ! + if ( !aIter.WasDBName() ) // hier keine DB-Bereiche ! { USHORT nInsert = aLbOutPos.InsertEntry( aName ); @@ -330,8 +330,8 @@ void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput) aBtnIgnEmptyRows.Check( thePivotData.bIgnoreEmptyRows ); aBtnDetectCat .Check( thePivotData.bDetectCategories ); - aBtnTotalCol .Check( thePivotData.bMakeTotalCol ); - aBtnTotalRow .Check( thePivotData.bMakeTotalRow ); + aBtnTotalCol .Check( thePivotData.bMakeTotalCol ); + aBtnTotalRow .Check( thePivotData.bMakeTotalRow ); if( const ScDPSaveData* pSaveData = xDlgDPObject->GetSaveData() ) { @@ -352,10 +352,10 @@ void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput) InitFocus(); -// SetDispatcherLock( TRUE ); // Modal-Modus einschalten +// SetDispatcherLock( TRUE ); // Modal-Modus einschalten //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } @@ -1011,7 +1011,7 @@ PointerStyle ScDPLayoutDlg::NotifyMouseMove( const Point& rAt ) PointerStyle ScDPLayoutDlg::NotifyMouseButtonDown( ScDPFieldType eType, size_t nFieldIndex ) { - bIsDrag = TRUE; + bIsDrag = TRUE; eDnDFromType = eType; nDnDFromIndex = nFieldIndex; return lclGetPointerForField( eType ); @@ -1211,7 +1211,7 @@ BOOL ScDPLayoutDlg::Contains( ScDPFuncDataVec* pArr, SCsCOL nCol, size_t& nAt ) if ( !pArr ) return FALSE; - BOOL bFound = FALSE; + BOOL bFound = FALSE; size_t i = 0; while ( (i<pArr->size()) && ((*pArr)[i].get() != NULL) && !bFound ) @@ -1331,16 +1331,16 @@ String ScDPLayoutDlg::GetFuncString( USHORT& rFuncMask, BOOL bIsValue ) rFuncMask = PIVOT_FUNC_COUNT; } } - else if ( rFuncMask == PIVOT_FUNC_SUM ) aStr = FSTR(PIVOTSTR_SUM); - else if ( rFuncMask == PIVOT_FUNC_COUNT ) aStr = FSTR(PIVOTSTR_COUNT); - else if ( rFuncMask == PIVOT_FUNC_AVERAGE ) aStr = FSTR(PIVOTSTR_AVG); - else if ( rFuncMask == PIVOT_FUNC_MAX ) aStr = FSTR(PIVOTSTR_MAX); - else if ( rFuncMask == PIVOT_FUNC_MIN ) aStr = FSTR(PIVOTSTR_MIN); - else if ( rFuncMask == PIVOT_FUNC_PRODUCT ) aStr = FSTR(PIVOTSTR_PROD); + else if ( rFuncMask == PIVOT_FUNC_SUM ) aStr = FSTR(PIVOTSTR_SUM); + else if ( rFuncMask == PIVOT_FUNC_COUNT ) aStr = FSTR(PIVOTSTR_COUNT); + else if ( rFuncMask == PIVOT_FUNC_AVERAGE ) aStr = FSTR(PIVOTSTR_AVG); + else if ( rFuncMask == PIVOT_FUNC_MAX ) aStr = FSTR(PIVOTSTR_MAX); + else if ( rFuncMask == PIVOT_FUNC_MIN ) aStr = FSTR(PIVOTSTR_MIN); + else if ( rFuncMask == PIVOT_FUNC_PRODUCT ) aStr = FSTR(PIVOTSTR_PROD); else if ( rFuncMask == PIVOT_FUNC_COUNT_NUM ) aStr = FSTR(PIVOTSTR_COUNT2); - else if ( rFuncMask == PIVOT_FUNC_STD_DEV ) aStr = FSTR(PIVOTSTR_DEV); + else if ( rFuncMask == PIVOT_FUNC_STD_DEV ) aStr = FSTR(PIVOTSTR_DEV); else if ( rFuncMask == PIVOT_FUNC_STD_DEVP ) aStr = FSTR(PIVOTSTR_DEV2); - else if ( rFuncMask == PIVOT_FUNC_STD_VAR ) aStr = FSTR(PIVOTSTR_VAR); + else if ( rFuncMask == PIVOT_FUNC_STD_VAR ) aStr = FSTR(PIVOTSTR_VAR); else if ( rFuncMask == PIVOT_FUNC_STD_VARP ) aStr = FSTR(PIVOTSTR_VAR2); else { @@ -1390,10 +1390,10 @@ void ScDPLayoutDlg::CalcWndSizes() aSlider.SetPosSizePixel( aSliderPos, aSliderSize ); aRectPage = Rectangle( aWndPage.GetPosPixel(), aWndPage.GetSizePixel() ); - aRectRow = Rectangle( aWndRow.GetPosPixel(), aWndRow.GetSizePixel() ); - aRectCol = Rectangle( aWndCol.GetPosPixel(), aWndCol.GetSizePixel() ); - aRectData = Rectangle( aWndData.GetPosPixel(), aWndData.GetSizePixel() ); - aRectSelect = Rectangle( aWndSelect.GetPosPixel(), aWndSelect.GetSizePixel() ); + aRectRow = Rectangle( aWndRow.GetPosPixel(), aWndRow.GetSizePixel() ); + aRectCol = Rectangle( aWndCol.GetPosPixel(), aWndCol.GetSizePixel() ); + aRectData = Rectangle( aWndData.GetPosPixel(), aWndData.GetSizePixel() ); + aRectSelect = Rectangle( aWndSelect.GetPosPixel(), aWndSelect.GetSizePixel() ); } @@ -1401,8 +1401,8 @@ void ScDPLayoutDlg::CalcWndSizes() BOOL ScDPLayoutDlg::GetPivotArrays( PivotField* pPageArr, PivotField* pColArr, - PivotField* pRowArr, - PivotField* pDataArr, + PivotField* pRowArr, + PivotField* pDataArr, USHORT& rPageCount, USHORT& rColCount, USHORT& rRowCount, @@ -1432,7 +1432,7 @@ BOOL ScDPLayoutDlg::GetPivotArrays( PivotField* pPageArr, else if ( rColCount < aColArr.size() ) pColArr[rColCount++].nCol = PIVOT_DATA_FIELD; else - bFit = FALSE; // kein Platz fuer Datenfeld + bFit = FALSE; // kein Platz fuer Datenfeld return bFit; } @@ -1557,10 +1557,10 @@ IMPL_LINK( ScDPLayoutDlg, ClickHdl, PushButton *, pBtn ) IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) { - String aOutPosStr( aEdOutPos.GetText() ); - ScAddress aAdrDest; - BOOL bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1); - USHORT nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc, pDoc->GetAddressConvention() ) : 0; + String aOutPosStr( aEdOutPos.GetText() ); + ScAddress aAdrDest; + BOOL bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1); + USHORT nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc, pDoc->GetAddressConvention() ) : 0; if ( bToNewTable || ( (aOutPosStr.Len() > 0) && (SCA_VALID == (nResult & SCA_VALID)) ) ) @@ -1568,11 +1568,11 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) //@BugID 54702 Enablen/Disablen nur noch in Basisklasse //SFX_APPWINDOW->Enable(); - ScPivotParam theOutParam; + ScPivotParam theOutParam; PivotPageFieldArr aPageFieldArr; - PivotFieldArr aColFieldArr; - PivotFieldArr aRowFieldArr; - PivotFieldArr aDataFieldArr; + PivotFieldArr aColFieldArr; + PivotFieldArr aRowFieldArr; + PivotFieldArr aDataFieldArr; USHORT nPageCount; USHORT nColCount; USHORT nRowCount; @@ -1584,7 +1584,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) { ScDPSaveData* pOldSaveData = xDlgDPObject->GetSaveData(); - ScRange aOutRange( aAdrDest ); // bToNewTable is passed separately + ScRange aOutRange( aAdrDest ); // bToNewTable is passed separately ScDPSaveData aSaveData; aSaveData.SetIgnoreEmptyRows( aBtnIgnEmptyRows.IsChecked() ); @@ -1676,15 +1676,15 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) USHORT nWhichPivot = SC_MOD()->GetPool().GetWhich( SID_PIVOT_TABLE ); ScPivotItem aOutItem( nWhichPivot, &aSaveData, &aOutRange, bToNewTable ); - bRefInputMode = FALSE; // to allow deselecting when switching sheets + bRefInputMode = FALSE; // to allow deselecting when switching sheets SetDispatcherLock( FALSE ); SwitchToDocument(); - // #95513# don't hide the dialog before executing the slot, instead it is used as - // parent for message boxes in ScTabViewShell::GetDialogParent + // #95513# don't hide the dialog before executing the slot, instead it is used as + // parent for message boxes in ScTabViewShell::GetDialogParent - const SfxPoolItem* pRet = GetBindings().GetDispatcher()->Execute( + const SfxPoolItem* pRet = GetBindings().GetDispatcher()->Execute( SID_PIVOT_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aOutItem, 0L, 0L ); bool bSuccess = true; @@ -1698,7 +1698,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) // Table successfully inserted. Close(); else - { + { // Table insertion failed. Keep the dialog open. bRefInputMode = true; SetDispatcherLock(true); @@ -1760,7 +1760,7 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG ) { bRefInputMode = FALSE; //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } return 0; } @@ -1770,15 +1770,15 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG ) IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG ) { - String theCurPosStr = aEdOutPos.GetText(); - USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); + String theCurPosStr = aEdOutPos.GetText(); + USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); if ( SCA_VALID == (nResult & SCA_VALID) ) { - String* pStr = NULL; - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = aLbOutPos.GetEntryCount(); + String* pStr = NULL; + BOOL bFound = FALSE; + USHORT i = 0; + USHORT nCount = aLbOutPos.GetEntryCount(); for ( i=2; i<nCount && !bFound; i++ ) { @@ -1806,8 +1806,8 @@ IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG ) IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG ) { - String aString; - USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); + String aString; + USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); if ( nSelPos > 1 ) { diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 916bb0db8a34..113274a25688 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.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 @@ -54,30 +54,30 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL bEdit, BOOL bSheetProtected) - : ModalDialog ( pParent, ScResId( RID_SCDLG_NEWSCENARIO ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_NEWSCENARIO ) ), aFlName ( this, ScResId( FL_NAME )), - aEdName ( this, ScResId( ED_NAME ) ), + aEdName ( this, ScResId( ED_NAME ) ), aFlComment ( this, ScResId( FL_COMMENT ) ), - aEdComment ( this, ScResId( ED_COMMENT ) ), + aEdComment ( this, ScResId( ED_COMMENT ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), - aCbShowFrame ( this, ScResId( CB_SHOWFRAME ) ), - aLbColor ( this, ScResId( LB_COLOR ) ), - //aCbPrintFrame ( this, ScResId( CB_PRINTFRAME ) ), - aCbTwoWay ( this, ScResId( CB_TWOWAY ) ), - //aCbAttrib ( this, ScResId( CB_ATTRIB ) ), - //aCbValue ( this, ScResId( CB_VALUE ) ), - aCbCopyAll ( this, ScResId( CB_COPYALL ) ), + aCbShowFrame ( this, ScResId( CB_SHOWFRAME ) ), + aLbColor ( this, ScResId( LB_COLOR ) ), + //aCbPrintFrame ( this, ScResId( CB_PRINTFRAME ) ), + aCbTwoWay ( this, ScResId( CB_TWOWAY ) ), + //aCbAttrib ( this, ScResId( CB_ATTRIB ) ), + //aCbValue ( this, ScResId( CB_VALUE ) ), + aCbCopyAll ( this, ScResId( CB_COPYALL ) ), aCbProtect ( this, ScResId( CB_PROTECT ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), aDefScenarioName( rName ), - bIsEdit ( bEdit ) + bIsEdit ( bEdit ) { if (bIsEdit) SetText(String(ScResId(STR_EDIT))); - SfxObjectShell* pDocSh = SfxObjectShell::Current(); + SfxObjectShell* pDocSh = SfxObjectShell::Current(); if ( pDocSh ) { const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); @@ -113,9 +113,9 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ", " )); aComment += ScGlobal::GetpLocaleData()->getTime( Time() ); - aEdComment .SetText( aComment ); - aEdName .SetText( rName ); - aBtnOk .SetClickHdl( LINK( this, ScNewScenarioDlg, OkHdl ) ); + aEdComment .SetText( aComment ); + aEdName .SetText( rName ); + aBtnOk .SetClickHdl( LINK( this, ScNewScenarioDlg, OkHdl ) ); aCbShowFrame.SetClickHdl( LINK( this, ScNewScenarioDlg, EnableHdl ) ); FreeResource(); @@ -137,7 +137,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b if (bSheetProtected) aCbProtect.Enable(FALSE); - //! die drei funktionieren noch nicht... + //! die drei funktionieren noch nicht... /* aCbPrintFrame.Enable(FALSE); aCbAttrib.Enable(FALSE); @@ -157,7 +157,7 @@ void ScNewScenarioDlg::GetScenarioData( String& rName, String& rComment, Color& rColor, USHORT& rFlags ) const { rComment = aEdComment.GetText(); - rName = aEdName.GetText(); + rName = aEdName.GetText(); if ( rName.Len() == 0 ) rName = aDefScenarioName; @@ -198,7 +198,7 @@ void ScNewScenarioDlg::SetScenarioData( const String& rName, const String& rComm aCbTwoWay.Check ( (nFlags & SC_SCENARIO_TWOWAY) != 0 ); //aCbAttrib.Check ( (nFlags & SC_SCENARIO_ATTRIB) != 0 ); //aCbValue.Check ( (nFlags & SC_SCENARIO_VALUE) != 0 ); - // CopyAll nicht + // CopyAll nicht aCbProtect.Check ( (nFlags & SC_SCENARIO_PROTECT) != 0 ); } @@ -206,8 +206,8 @@ void ScNewScenarioDlg::SetScenarioData( const String& rName, const String& rComm IMPL_LINK( ScNewScenarioDlg, OkHdl, OKButton *, EMPTYARG ) { - String aName ( aEdName.GetText() ); - ScDocument* pDoc = ((ScTabViewShell*)SfxViewShell::Current())-> + String aName ( aEdName.GetText() ); + ScDocument* pDoc = ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData()->GetDocument(); aName.EraseLeadingChars( ' ' ); @@ -230,7 +230,7 @@ IMPL_LINK( ScNewScenarioDlg, OkHdl, OKButton *, EMPTYARG ) EndDialog( RET_OK ); return 0; - //! beim Editieren testen, ob eine andere Tabelle den Namen hat! + //! beim Editieren testen, ob eine andere Tabelle den Namen hat! } //------------------------------------------------------------------------ diff --git a/sc/source/ui/dbgui/scendlg.hrc b/sc/source/ui/dbgui/scendlg.hrc index 83818773bf5a..fe01da8ffb48 100644 --- a/sc/source/ui/dbgui/scendlg.hrc +++ b/sc/source/ui/dbgui/scendlg.hrc @@ -1,7 +1,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/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.src index 40cfeb01b8ff..7e08ec7816cf 100644 --- a/sc/source/ui/dbgui/scendlg.src +++ b/sc/source/ui/dbgui/scendlg.src @@ -1,7 +1,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/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 67817a140af2..1fe0fcc9e91f 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.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,7 +87,7 @@ void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect ) if ( (sal_Unicode)rList.GetToken(i+1,'\t').ToInt32() == cSelect ) aStr = rList.GetToken(i,'\t'); if (!aStr.Len()) - aStr = cSelect; // Ascii + aStr = cSelect; // Ascii rCombo.SetText(aStr); } @@ -118,8 +118,8 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList ) return c; } -static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators, - bool &bMergeDelimiters, bool& bQuotedAsText, bool& bDetectSpecialNum, +static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators, + bool &bMergeDelimiters, bool& bQuotedAsText, bool& bDetectSpecialNum, bool &bFixedWidth, sal_Int32 &nFromRow, sal_Int32 &nCharSet, sal_Int32& nLanguage ) { @@ -157,7 +157,7 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato if( pProperties[5].hasValue() ) pProperties[5] >>= nCharSet; - + if ( pProperties[6].hasValue() ) pProperties[6] >>= bQuotedAsText; @@ -168,7 +168,7 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato pProperties[8] >>= nLanguage; } -static void save_Separators( +static void save_Separators( String maSeparators, String maTxtSep, bool bMergeDelimiters, bool bQuotedAsText, bool bDetectSpecialNum, bool bFixedWidth, sal_Int32 nFromRow, sal_Int32 nCharSet, sal_Int32 nLanguage ) { @@ -208,7 +208,7 @@ static void save_Separators( ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, SvStream* pInStream, sal_Unicode /*cSep*/ ) : - ModalDialog ( pParent, ScResId( RID_SCDLG_ASCII ) ), + ModalDialog ( pParent, ScResId( RID_SCDLG_ASCII ) ), mpDatStream ( pInStream ), mnStreamPos( pInStream ? pInStream->Tell() : 0 ), @@ -216,46 +216,46 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, mnRowPosCount(0), aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ), - aFtCharSet ( this, ScResId( FT_CHARSET ) ), - aLbCharSet ( this, ScResId( LB_CHARSET ) ), + aFtCharSet ( this, ScResId( FT_CHARSET ) ), + aLbCharSet ( this, ScResId( LB_CHARSET ) ), aFtCustomLang( this, ScResId( FT_CUSTOMLANG ) ), - aLbCustomLang( this, ScResId( LB_CUSTOMLANG ) ), + aLbCustomLang( this, ScResId( LB_CUSTOMLANG ) ), - aFtRow ( this, ScResId( FT_AT_ROW ) ), - aNfRow ( this, ScResId( NF_AT_ROW ) ), + aFtRow ( this, ScResId( FT_AT_ROW ) ), + aNfRow ( this, ScResId( NF_AT_ROW ) ), aFlSepOpt ( this, ScResId( FL_SEPOPT ) ), - aRbFixed ( this, ScResId( RB_FIXED ) ), + aRbFixed ( this, ScResId( RB_FIXED ) ), aRbSeparated( this, ScResId( RB_SEPARATED ) ), - aCkbTab ( this, ScResId( CKB_TAB ) ), + aCkbTab ( this, ScResId( CKB_TAB ) ), aCkbSemicolon(this, ScResId( CKB_SEMICOLON ) ), - aCkbComma ( this, ScResId( CKB_COMMA ) ), - aCkbSpace ( this, ScResId( CKB_SPACE ) ), - aCkbOther ( this, ScResId( CKB_OTHER ) ), - aEdOther ( this, ScResId( ED_OTHER ) ), - aCkbAsOnce ( this, ScResId( CB_ASONCE) ), - aFlOtherOpt ( this, ScResId( FL_OTHER_OPTIONS ) ), + aCkbComma ( this, ScResId( CKB_COMMA ) ), + aCkbSpace ( this, ScResId( CKB_SPACE ) ), + aCkbOther ( this, ScResId( CKB_OTHER ) ), + aEdOther ( this, ScResId( ED_OTHER ) ), + aCkbAsOnce ( this, ScResId( CB_ASONCE) ), + aFlOtherOpt ( this, ScResId( FL_OTHER_OPTIONS ) ), - aFtTextSep ( this, ScResId( FT_TEXTSEP ) ), - aCbTextSep ( this, ScResId( CB_TEXTSEP ) ), + aFtTextSep ( this, ScResId( FT_TEXTSEP ) ), + aCbTextSep ( this, ScResId( CB_TEXTSEP ) ), aCkbQuotedAsText( this, ScResId(CB_QUOTED_AS_TEXT) ), aCkbDetectNumber( this, ScResId(CB_DETECT_SPECIAL_NUMBER) ), aFlWidth ( this, ScResId( FL_WIDTH ) ), - aFtType ( this, ScResId( FT_TYPE ) ), - aLbType ( this, ScResId( LB_TYPE1 ) ), + aFtType ( this, ScResId( FT_TYPE ) ), + aLbType ( this, ScResId( LB_TYPE1 ) ), maTableBox ( this, ScResId( CTR_TABLEBOX ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), aCharSetUser( ScResId( SCSTR_CHARSET_USER ) ), - aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ), - aFldSepList ( ScResId( SCSTR_FIELDSEP ) ), + aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ), + aFldSepList ( ScResId( SCSTR_FIELDSEP ) ), aTextSepList( ScResId( SCSTR_TEXTSEP ) ), mcTextSep ( ScAsciiOptions::cDefaultTextSep ), maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) ), @@ -286,7 +286,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, sal_Int32 nLanguage = 0; if (mbFileImport) // load separators only when importing csv files. - load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters, + load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters, bQuotedFieldAsText, bDetectSpecialNum, bFixedWidth, nFromRow, nCharSet, nLanguage); maFieldSeparators = String(sFieldSeparators); @@ -317,7 +317,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, aEdOther.SetText( aEdOther.GetText() + OUString( aSep[i] ) ); } } - + // Get Separators from the dialog maFieldSeparators = GetSeparators(); @@ -330,7 +330,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, mpDatStream->StartReadingUnicodeText(); ULONG nUniPos = mpDatStream->Tell(); if ( nUniPos > 0 ) - bPreselectUnicode = TRUE; // read 0xfeff/0xfffe + bPreselectUnicode = TRUE; // read 0xfeff/0xfffe else { UINT16 n; @@ -484,10 +484,10 @@ bool ScImportAsciiDlg::GetLine( ULONG nLine, String &rText ) mnStreamPos = mpDatStream->Tell(); } - // #107455# If the file content isn't unicode, ReadUniStringLine - // may try to seek beyond the file's end and cause a CANTSEEK error - // (depending on the stream type). The error code has to be cleared, - // or further read operations (including non-unicode) will fail. + // #107455# If the file content isn't unicode, ReadUniStringLine + // may try to seek beyond the file's end and cause a CANTSEEK error + // (depending on the stream type). The error code has to be cleared, + // or further read operations (including non-unicode) will fail. if ( mpDatStream->GetError() == ERRCODE_IO_CANTSEEK ) mpDatStream->ResetError(); @@ -540,10 +540,10 @@ void ScImportAsciiDlg::SaveParameters() // We save parameters only for file import. return; - save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked(), - aCkbQuotedAsText.IsChecked(), aCkbDetectNumber.IsChecked(), - aRbFixed.IsChecked(), - static_cast<sal_Int32>(aNfRow.GetValue()), + save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked(), + aCkbQuotedAsText.IsChecked(), aCkbDetectNumber.IsChecked(), + aRbFixed.IsChecked(), + static_cast<sal_Int32>(aNfRow.GetValue()), static_cast<sal_Int32>(aLbCharSet.GetSelectEntryPos()), static_cast<sal_Int32>(aLbCustomLang.GetSelectLanguage()) ); } diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 547983af83fe..67d874a0a271 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.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,23 +45,23 @@ class ScDelimiterTable { public: ScDelimiterTable( const String& rDelTab ) - : theDelTab ( rDelTab ), - cSep ( '\t' ), - nCount ( rDelTab.GetTokenCount('\t') ), - nIter ( 0 ) + : theDelTab ( rDelTab ), + cSep ( '\t' ), + nCount ( rDelTab.GetTokenCount('\t') ), + nIter ( 0 ) {} - USHORT GetCode( const String& rDelimiter ) const; - String GetDelimiter( sal_Unicode nCode ) const; + USHORT GetCode( const String& rDelimiter ) const; + String GetDelimiter( sal_Unicode nCode ) const; - String FirstDel() { nIter = 0; return theDelTab.GetToken( nIter, cSep ); } - String NextDel() { nIter +=2; return theDelTab.GetToken( nIter, cSep ); } + String FirstDel() { nIter = 0; return theDelTab.GetToken( nIter, cSep ); } + String NextDel() { nIter +=2; return theDelTab.GetToken( nIter, cSep ); } private: - const String theDelTab; - const sal_Unicode cSep; - const xub_StrLen nCount; - xub_StrLen nIter; + const String theDelTab; + const sal_Unicode cSep; + const xub_StrLen nCount; + xub_StrLen nIter; }; //------------------------------------------------------------------------ @@ -125,18 +125,18 @@ ScImportOptionsDlg::ScImportOptionsDlg( BOOL bOnlyDbtoolsEncodings, BOOL bImport ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_IMPORTOPT ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_IMPORTOPT ) ), aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ), - aFtFont ( this, ScResId( FT_FONT ) ), + aFtFont ( this, ScResId( FT_FONT ) ), aLbFont ( this, ScResId( bAscii ? DDLB_FONT : LB_FONT ) ), - aFtFieldSep ( this, ScResId( FT_FIELDSEP ) ), - aEdFieldSep ( this, ScResId( ED_FIELDSEP ) ), - aFtTextSep ( this, ScResId( FT_TEXTSEP ) ), - aEdTextSep ( this, ScResId( ED_TEXTSEP ) ), + aFtFieldSep ( this, ScResId( FT_FIELDSEP ) ), + aEdFieldSep ( this, ScResId( ED_FIELDSEP ) ), + aFtTextSep ( this, ScResId( FT_TEXTSEP ) ), + aEdTextSep ( this, ScResId( ED_TEXTSEP ) ), aCbFixed ( this, ScResId( CB_FIXEDWIDTH ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), aCbShown ( this, ScResId( CB_SAVESHOWN ) ) { // im Ctor-Initializer nicht moeglich (MSC kann das nicht): @@ -278,7 +278,7 @@ USHORT ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const if ( !aStr.Len() ) { - nCode = 0; // kein Trennzeichen + nCode = 0; // kein Trennzeichen } else { diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index d66ff75d7530..2d8c43b88ae8 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.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,19 +62,19 @@ //============================================================================ -// class ScSpecialFilterDialog +// class ScSpecialFilterDialog //---------------------------------------------------------------------------- ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet& rArgSet ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SPEC_FILTER ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SPEC_FILTER ), // - aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ), - aFtFilterArea ( this, ScResId( FT_CRITERIA_AREA ) ), + aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ), + aFtFilterArea ( this, ScResId( FT_CRITERIA_AREA ) ), aEdFilterArea ( this, this, ScResId( ED_CRITERIA_AREA ) ), - aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ), + aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ), // aFlOptions ( this, ScResId( FL_OPTIONS ) ), _INIT_COMMON_FILTER_RSCOBJS @@ -83,16 +83,16 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi aBtnHelp ( this, ScResId( BTN_HELP ) ), aBtnMore ( this, ScResId( BTN_MORE ) ), // - pOptionsMgr ( NULL ), - nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), - theQueryData ( ((const ScQueryItem&) + pOptionsMgr ( NULL ), + nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), + theQueryData ( ((const ScQueryItem&) rArgSet.Get( nWhichQuery )).GetQueryData() ), - pOutItem ( NULL ), - pViewData ( NULL ), - pDoc ( NULL ), - pRefInputEdit ( NULL ), - bRefInputMode ( FALSE ), - pTimer ( NULL ) + pOutItem ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), + pRefInputEdit ( NULL ), + bRefInputMode ( FALSE ), + pTimer ( NULL ) { Init( rArgSet ); aEdFilterArea.GrabFocus(); @@ -135,22 +135,22 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) const ScQueryItem& rQueryItem = (const ScQueryItem&) rArgSet.Get( nWhichQuery ); - aBtnOk.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) ); - aLbFilterArea.SetSelectHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaSelHdl ) ); - aEdFilterArea.SetModifyHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaModHdl ) ); + aBtnOk.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) ); + aLbFilterArea.SetSelectHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaSelHdl ) ); + aEdFilterArea.SetModifyHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaModHdl ) ); - pViewData = rQueryItem.GetViewData(); - pDoc = pViewData ? pViewData->GetDocument() : NULL; + pViewData = rQueryItem.GetViewData(); + pDoc = pViewData ? pViewData->GetDocument() : NULL; - aEdFilterArea.SetText( EMPTY_STRING ); // may be overwritten below + aEdFilterArea.SetText( EMPTY_STRING ); // may be overwritten below if ( pViewData && pDoc ) { if(pDoc->GetChangeTrack()!=NULL) aBtnCopyResult.Disable(); - ScRangeName* pRangeNames = pDoc->GetRangeName(); - const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0; + ScRangeName* pRangeNames = pDoc->GetRangeName(); + const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0; /* * Aus den RangeNames des Dokumentes werden nun die @@ -162,9 +162,9 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) if ( nCount > 0 ) { - String aString; + String aString; ScRangeData* pData = NULL; - USHORT nInsert = 0; + USHORT nInsert = 0; for ( USHORT i=0; i<nCount; i++ ) { @@ -183,7 +183,7 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) } } - // is there a stored source range? + // is there a stored source range? ScRange aAdvSource; if (rQueryItem.GetAdvancedQuerySource(aAdvSource)) @@ -198,7 +198,7 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) // Optionen initialisieren lassen: - pOptionsMgr = new ScFilterOptionsMgr( + pOptionsMgr = new ScFilterOptionsMgr( this, pViewData, theQueryData, @@ -218,14 +218,14 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) aStrNoName, aStrUndefined ); - // #35206# Spezialfilter braucht immer Spaltenkoepfe + // #35206# Spezialfilter braucht immer Spaltenkoepfe aBtnHeader.Check(TRUE); aBtnHeader.Disable(); // Modal-Modus einschalten -// SetDispatcherLock( TRUE ); +// SetDispatcherLock( TRUE ); //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } @@ -246,7 +246,7 @@ BOOL __EXPORT ScSpecialFilterDlg::Close() void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { - if ( bRefInputMode && pRefInputEdit ) // Nur moeglich, wenn im Referenz-Editmodus + if ( bRefInputMode && pRefInputEdit ) // Nur moeglich, wenn im Referenz-Editmodus { if ( rRef.aStart != rRef.aEnd ) RefInputStart( pRefInputEdit ); @@ -320,13 +320,13 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) if ( (pBtn == &aBtnOk) && pDoc && pViewData ) { - String theCopyStr( aEdCopyArea.GetText() ); - String theAreaStr( aEdFilterArea.GetText() ); - ScQueryParam theOutParam( theQueryData ); - ScAddress theAdrCopy; - BOOL bEditInputOk = TRUE; - BOOL bQueryOk = FALSE; - ScRange theFilterArea; + String theCopyStr( aEdCopyArea.GetText() ); + String theAreaStr( aEdFilterArea.GetText() ); + ScQueryParam theOutParam( theQueryData ); + ScAddress theAdrCopy; + BOOL bEditInputOk = TRUE; + BOOL bQueryOk = FALSE; + ScRange theFilterArea; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( aBtnCopyResult.IsChecked() ) @@ -369,7 +369,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) * ein ScQueryParam zu erzeugen: */ - USHORT nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv ); + USHORT nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv ); if ( SCA_VALID == (nResult & SCA_VALID) ) { @@ -378,23 +378,23 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) if ( aBtnCopyResult.IsChecked() ) { - theOutParam.bInplace = FALSE; - theOutParam.nDestTab = theAdrCopy.Tab(); - theOutParam.nDestCol = theAdrCopy.Col(); - theOutParam.nDestRow = theAdrCopy.Row(); + theOutParam.bInplace = FALSE; + theOutParam.nDestTab = theAdrCopy.Tab(); + theOutParam.nDestCol = theAdrCopy.Col(); + theOutParam.nDestRow = theAdrCopy.Row(); } else { - theOutParam.bInplace = TRUE; - theOutParam.nDestTab = 0; - theOutParam.nDestCol = 0; - theOutParam.nDestRow = 0; + theOutParam.bInplace = TRUE; + theOutParam.nDestTab = 0; + theOutParam.nDestCol = 0; + theOutParam.nDestRow = 0; } theOutParam.bHasHeader = aBtnHeader.IsChecked(); - theOutParam.bByRow = TRUE; + theOutParam.bByRow = TRUE; theOutParam.bCaseSens = aBtnCase.IsChecked(); - theOutParam.bRegExp = aBtnRegExp.IsChecked(); + theOutParam.bRegExp = aBtnRegExp.IsChecked(); theOutParam.bDuplicate = !aBtnUnique.IsChecked(); theOutParam.bDestPers = aBtnDestPers.IsChecked(); @@ -406,14 +406,14 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) rStart.Tab(), theOutParam ); - // an der DB-Collection koennen nur MAXQUERY Filter-Eintraege - // gespeichert werden + // an der DB-Collection koennen nur MAXQUERY Filter-Eintraege + // gespeichert werden if ( bQueryOk && theOutParam.GetEntryCount() > MAXQUERY && theOutParam.GetEntry(MAXQUERY).bDoQuery ) { - bQueryOk = FALSE; // zu viele - //! andere Fehlermeldung ?? + bQueryOk = FALSE; // zu viele + //! andere Fehlermeldung ?? } } } @@ -437,7 +437,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { Close(); } - return 0; + return 0; } @@ -478,8 +478,8 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) { if ( pLb == &aLbFilterArea ) { - String aString; - USHORT nSelPos = aLbFilterArea.GetSelectEntryPos(); + String aString; + USHORT nSelPos = aLbFilterArea.GetSelectEntryPos(); if ( nSelPos > 0 ) aString = *(String*)aLbFilterArea.GetEntryData( nSelPos ); @@ -499,15 +499,15 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) { if ( pDoc && pViewData ) { - String theCurAreaStr = pEd->GetText(); - USHORT nResult = ScRange().Parse( theCurAreaStr, pDoc ); + String theCurAreaStr = pEd->GetText(); + USHORT nResult = ScRange().Parse( theCurAreaStr, pDoc ); if ( SCA_VALID == (nResult & SCA_VALID) ) { - String* pStr = NULL; - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = aLbFilterArea.GetEntryCount(); + String* pStr = NULL; + BOOL bFound = FALSE; + USHORT i = 0; + USHORT nCount = aLbFilterArea.GetEntryCount(); for ( i=1; i<nCount && !bFound; i++ ) { diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 0fbbe991e327..878922312e5d 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.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 @@ -42,24 +42,24 @@ #include <layout/layout-pre.hxx> #endif -ScSortDlg::ScSortDlg( Window* pParent, +ScSortDlg::ScSortDlg( Window* pParent, const SfxItemSet* pArgSet ) : SfxTabDialog( pParent, ScResId( RID_SCDLG_SORT ), pArgSet ), - bIsHeaders ( FALSE ), - bIsByRows ( FALSE ) + bIsHeaders ( FALSE ), + bIsByRows ( FALSE ) { #if LAYOUT_SFX_TABDIALOG_BROKEN - AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 ); - AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 ); + AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 ); + AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 ); #else String fields = rtl::OUString::createFromAscii ("fields"); AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND); String options = rtl::OUString::createFromAscii ("options"); - AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND); -#endif + AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND); +#endif FreeResource(); } @@ -68,7 +68,7 @@ __EXPORT ScSortDlg::~ScSortDlg() } //================================================================== -ScSortWarningDlg::ScSortWarningDlg( Window* pParent, +ScSortWarningDlg::ScSortWarningDlg( Window* pParent, const String& rExtendText, const String& rCurrentText ): ModalDialog ( pParent, ScResId( RID_SCDLG_SORT_WARNING ) ), @@ -83,7 +83,7 @@ ScSortWarningDlg::ScSortWarningDlg( Window* pParent, sTextName.SearchAndReplaceAscii("%2", rCurrentText); aFtText.SetText( sTextName ); - aBtnExtSort .SetClickHdl( LINK( this, ScSortWarningDlg, BtnHdl ) ); + aBtnExtSort .SetClickHdl( LINK( this, ScSortWarningDlg, BtnHdl ) ); aBtnCurSort .SetClickHdl( LINK( this, ScSortWarningDlg, BtnHdl ) ); FreeResource(); diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index 172e887cf51e..97f7e2e8d005 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.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,12 +41,12 @@ //================================================================== -ScSubTotalDlg::ScSubTotalDlg( Window* pParent, - const SfxItemSet* pArgSet ) : +ScSubTotalDlg::ScSubTotalDlg( Window* pParent, + const SfxItemSet* pArgSet ) : SfxTabDialog( pParent, ScResId( RID_SCDLG_SUBTOTALS ), pArgSet ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ) + aBtnRemove ( this, ScResId( BTN_REMOVE ) ) { AddTabPage( PAGE_GROUP1, ScTpSubTotalGroup1::Create, 0 ); AddTabPage( PAGE_GROUP2, ScTpSubTotalGroup2::Create, 0 ); diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 99253d6cc5a1..9dd22f0aee57 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent) : maBtnCancel(this, ScResId(BTN_CANCEL)), maBtnHelp(this, ScResId(BTN_HELP)), maFlChooseLang(this, ScResId(FL_CHOOSE_LANG)), - maRbAutomatic(this, ScResId(RB_AUTOMATIC)), + maRbAutomatic(this, ScResId(RB_AUTOMATIC)), maRbCustom(this, ScResId(RB_CUSTOM)), maLbCustomLang(this, ScResId(LB_CUSTOM_LANG)), maFlOption(this, ScResId(FL_OPTION)), diff --git a/sc/source/ui/dbgui/textimportoptions.src b/sc/source/ui/dbgui/textimportoptions.src index 69e2d69b3142..eacd8f008a46 100644 --- a/sc/source/ui/dbgui/textimportoptions.src +++ b/sc/source/ui/dbgui/textimportoptions.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS Pos = MAP_APPFONT( 6, 3 ) ; Size = MAP_APPFONT( 165, 14 ) ; - Text [ en-US ] = "Select the language to use for import" ; + Text [ en-US ] = "Select the language to use for import" ; }; RadioButton RB_AUTOMATIC @@ -71,7 +71,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS Size = MAP_APPFONT( 159, 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Automatic" ; + Text [ en-US ] = "Automatic" ; }; RadioButton RB_CUSTOM @@ -80,7 +80,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS Size = MAP_APPFONT( 159, 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Custom" ; + Text [ en-US ] = "Custom" ; }; ListBox LB_CUSTOM_LANG diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 7a54da38da03..6d5f6dc5c8d1 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.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 @@ -86,7 +86,7 @@ static USHORT pSortRanges[] = * * virtual BOOL HasExchangeSupport() const; -> return TRUE; * virtual void ActivatePage(const SfxItemSet &); - * virtual int DeactivatePage(SfxItemSet * = 0); + * virtual int DeactivatePage(SfxItemSet * = 0); * * muss noch geaendert werden! */ @@ -95,41 +95,41 @@ static USHORT pSortRanges[] = //======================================================================== // Sortierkriterien-Tabpage: -ScTabPageSortFields::ScTabPageSortFields( Window* pParent, +ScTabPageSortFields::ScTabPageSortFields( Window* pParent, const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_SORT_FIELDS ), rArgSet ), // aFlSort1 ( this, ScResId( FL_SORT1 ) ), - aLbSort1 ( this, ScResId( LB_SORT1 ) ), + aLbSort1 ( this, ScResId( LB_SORT1 ) ), aBtnUp1 ( this, ScResId( BTN_UP1 ) ), - aBtnDown1 ( this, ScResId( BTN_DOWN1 ) ), + aBtnDown1 ( this, ScResId( BTN_DOWN1 ) ), // aFlSort2 ( this, ScResId( FL_SORT2 ) ), - aLbSort2 ( this, ScResId( LB_SORT2 ) ), + aLbSort2 ( this, ScResId( LB_SORT2 ) ), aBtnUp2 ( this, ScResId( BTN_UP2 ) ), - aBtnDown2 ( this, ScResId( BTN_DOWN2 ) ), + aBtnDown2 ( this, ScResId( BTN_DOWN2 ) ), // aFlSort3 ( this, ScResId( FL_SORT3 ) ), - aLbSort3 ( this, ScResId( LB_SORT3 ) ), + aLbSort3 ( this, ScResId( LB_SORT3 ) ), aBtnUp3 ( this, ScResId( BTN_UP3 ) ), - aBtnDown3 ( this, ScResId( BTN_DOWN3 ) ), + aBtnDown3 ( this, ScResId( BTN_DOWN3 ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), - aStrRow ( ScResId( SCSTR_ROW ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aStrRow ( ScResId( SCSTR_ROW ) ), // - nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), - pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ), - pViewData ( NULL ), - rSortData ( ((const ScSortItem&) + nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), + pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ), + pViewData ( NULL ), + rSortData ( ((const ScSortItem&) rArgSet.Get( nWhichSort )). GetSortData() ), - nFieldCount ( 0 ), - bHasHeader ( FALSE ), - bSortByRows ( FALSE ) + nFieldCount ( 0 ), + bHasHeader ( FALSE ), + bSortByRows ( FALSE ) { Init(); FreeResource(); @@ -164,15 +164,15 @@ void ScTabPageSortFields::Init() aLbSort2.Clear(); aLbSort3.Clear(); - aSortLbArr[0] = &aLbSort1; - aSortLbArr[1] = &aLbSort2; - aSortLbArr[2] = &aLbSort3; - aDirBtnArr[0][0] = &aBtnUp1; - aDirBtnArr[0][1] = &aBtnDown1; - aDirBtnArr[1][0] = &aBtnUp2; - aDirBtnArr[1][1] = &aBtnDown2; - aDirBtnArr[2][0] = &aBtnUp3; - aDirBtnArr[2][1] = &aBtnDown3; + aSortLbArr[0] = &aLbSort1; + aSortLbArr[1] = &aLbSort2; + aSortLbArr[2] = &aLbSort3; + aDirBtnArr[0][0] = &aBtnUp1; + aDirBtnArr[0][1] = &aBtnDown1; + aDirBtnArr[1][0] = &aBtnUp2; + aDirBtnArr[1][1] = &aBtnDown2; + aDirBtnArr[2][0] = &aBtnUp3; + aDirBtnArr[2][1] = &aBtnDown3; aFlArr[0] = &aFlSort1; aFlArr[1] = &aFlSort2; aFlArr[2] = &aFlSort3; @@ -187,8 +187,8 @@ USHORT* __EXPORT ScTabPageSortFields::GetRanges() // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTabPageSortFields( pParent, rArgSet ) ); } @@ -198,7 +198,7 @@ SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent, void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) { bSortByRows = rSortData.bByRow; - bHasHeader = rSortData.bHasHeader; + bHasHeader = rSortData.bHasHeader; if ( aLbSort1.GetEntryCount() == 0 ) FillFieldLists(); @@ -215,13 +215,13 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) GetFieldSelPos( rSortData.nField[i] ) ); (rSortData.bAscending[i]) - ? aDirBtnArr[i][0]->Check() // Up - : aDirBtnArr[i][1]->Check(); // Down + ? aDirBtnArr[i][0]->Check() // Up + : aDirBtnArr[i][1]->Check(); // Down } else { aSortLbArr[i]->SelectEntryPos( 0 ); // "keiner" selektieren - aDirBtnArr[i][0]->Check(); // Up + aDirBtnArr[i][0]->Check(); // Up } } @@ -242,7 +242,7 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) else if( nCol > rSortData.nCol2 ) nCol = rSortData.nCol2; - USHORT nSort1Pos = nCol - rSortData.nCol1+1; + USHORT nSort1Pos = nCol - rSortData.nCol1+1; aLbSort1.SelectEntryPos( nSort1Pos ); aLbSort2.SelectEntryPos( 0 ); aLbSort3.SelectEntryPos( 0 ); @@ -274,9 +274,9 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) theSortData = ((const ScSortItem*)pItem)->GetSortData(); } - USHORT nSort1Pos = aLbSort1.GetSelectEntryPos(); - USHORT nSort2Pos = aLbSort2.GetSelectEntryPos(); - USHORT nSort3Pos = aLbSort3.GetSelectEntryPos(); + USHORT nSort1Pos = aLbSort1.GetSelectEntryPos(); + USHORT nSort2Pos = aLbSort2.GetSelectEntryPos(); + USHORT nSort3Pos = aLbSort3.GetSelectEntryPos(); DBG_ASSERT( (nSort1Pos <= SC_MAXFIELDS) && (nSort2Pos <= SC_MAXFIELDS) @@ -315,7 +315,7 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) theSortData.bAscending[0] = aBtnUp1.IsChecked(); theSortData.bAscending[1] = aBtnUp2.IsChecked(); theSortData.bAscending[2] = aBtnUp3.IsChecked(); - // bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert + // bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert } else { @@ -341,11 +341,11 @@ void __EXPORT ScTabPageSortFields::ActivatePage() if ( bHasHeader != pDlg->GetHeaders() || bSortByRows != pDlg->GetByRows() ) { - USHORT nCurSel1 = aLbSort1.GetSelectEntryPos(); - USHORT nCurSel2 = aLbSort2.GetSelectEntryPos(); - USHORT nCurSel3 = aLbSort3.GetSelectEntryPos(); + USHORT nCurSel1 = aLbSort1.GetSelectEntryPos(); + USHORT nCurSel2 = aLbSort2.GetSelectEntryPos(); + USHORT nCurSel3 = aLbSort3.GetSelectEntryPos(); - bHasHeader = pDlg->GetHeaders(); + bHasHeader = pDlg->GetHeaders(); bSortByRows = pDlg->GetByRows(); FillFieldLists(); aLbSort1.SelectEntryPos( nCurSel1 ); @@ -382,7 +382,7 @@ void ScTabPageSortFields::DisableField( USHORT nField ) if ( nField<=2 ) { - aSortLbArr[nField] ->Disable(); + aSortLbArr[nField] ->Disable(); aDirBtnArr[nField][0]->Disable(); aDirBtnArr[nField][1]->Disable(); aFlArr[nField] ->Disable(); @@ -397,7 +397,7 @@ void ScTabPageSortFields::EnableField( USHORT nField ) if ( nField<=2 ) { - aSortLbArr[nField] ->Enable(); + aSortLbArr[nField] ->Enable(); aDirBtnArr[nField][0]->Enable(); aDirBtnArr[nField][1]->Enable(); aFlArr[nField] ->Enable(); @@ -421,23 +421,23 @@ void ScTabPageSortFields::FillFieldLists() aLbSort2.InsertEntry( aStrUndefined, 0 ); aLbSort3.InsertEntry( aStrUndefined, 0 ); - SCCOL nFirstSortCol = rSortData.nCol1; - SCROW nFirstSortRow = rSortData.nRow1; - SCTAB nTab = pViewData->GetTabNo(); - USHORT i = 1; + SCCOL nFirstSortCol = rSortData.nCol1; + SCROW nFirstSortRow = rSortData.nRow1; + SCTAB nTab = pViewData->GetTabNo(); + USHORT i = 1; if ( bSortByRows ) { - String aFieldName; - SCCOL nMaxCol = rSortData.nCol2; - SCCOL col; + String aFieldName; + SCCOL nMaxCol = rSortData.nCol2; + SCCOL col; for ( col=nFirstSortCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ ) { pDoc->GetString( col, nFirstSortRow, nTab, aFieldName ); if ( !bHasHeader || (aFieldName.Len() == 0) ) { - aFieldName = aStrColumn; + aFieldName = aStrColumn; aFieldName += ' '; aFieldName += ScColToAlpha( col ); } @@ -450,16 +450,16 @@ void ScTabPageSortFields::FillFieldLists() } else { - String aFieldName; - SCROW nMaxRow = rSortData.nRow2; - SCROW row; + String aFieldName; + SCROW nMaxRow = rSortData.nRow2; + SCROW row; for ( row=nFirstSortRow; row<=nMaxRow && i<SC_MAXFIELDS; row++ ) { pDoc->GetString( nFirstSortCol, row, nTab, aFieldName ); if ( !bHasHeader || (aFieldName.Len() == 0) ) { - aFieldName = aStrRow; + aFieldName = aStrRow; aFieldName += ' '; aFieldName += String::CreateFromInt32( row+1 ); } @@ -479,8 +479,8 @@ void ScTabPageSortFields::FillFieldLists() USHORT ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField ) { - USHORT nFieldPos = 0; - BOOL bFound = FALSE; + USHORT nFieldPos = 0; + BOOL bFound = FALSE; for ( USHORT n=1; n<nFieldCount && !bFound; n++ ) { @@ -554,50 +554,50 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) #endif /* ENABLE_LAYOUT_EXPERIMENTAL */ -ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, - const SfxItemSet& rArgSet ) +ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, + const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_SORT_OPTIONS ), rArgSet ), // - aBtnCase ( this, ScResId( BTN_CASESENSITIVE ) ), - aBtnHeader ( this, ScResId( BTN_LABEL ) ), - aBtnFormats ( this, ScResId( BTN_FORMATS ) ), + aBtnCase ( this, ScResId( BTN_CASESENSITIVE ) ), + aBtnHeader ( this, ScResId( BTN_LABEL ) ), + aBtnFormats ( this, ScResId( BTN_FORMATS ) ), aBtnNaturalSort ( this, ScResId( BTN_NATURALSORT ) ), aBtnCopyResult ( this, ScResId( BTN_COPYRESULT ) ), - aLbOutPos ( this, ScResId( LB_OUTAREA ) ), - aEdOutPos ( this, ScResId( ED_OUTAREA ) ), - aBtnSortUser ( this, ScResId( BTN_SORT_USER ) ), - aLbSortUser ( this, ScResId( LB_SORT_USER ) ), + aLbOutPos ( this, ScResId( LB_OUTAREA ) ), + aEdOutPos ( this, ScResId( ED_OUTAREA ) ), + aBtnSortUser ( this, ScResId( BTN_SORT_USER ) ), + aLbSortUser ( this, ScResId( LB_SORT_USER ) ), aFtLanguage ( this, ScResId( FT_LANGUAGE ) ), - aLbLanguage ( this, ScResId( LB_LANGUAGE ) ), + aLbLanguage ( this, ScResId( LB_LANGUAGE ) ), aFtAlgorithm ( this, ScResId( FT_ALGORITHM ) ), - aLbAlgorithm ( this, ScResId( LB_ALGORITHM ) ), - aLineDirection ( this, ScResId( FL_DIRECTION ) ), - aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ), - aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ), -// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ), -// aFtArea ( this, ScResId( FT_AREA ) ), + aLbAlgorithm ( this, ScResId( LB_ALGORITHM ) ), + aLineDirection ( this, ScResId( FL_DIRECTION ) ), + aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ), + aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ), +// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ), +// aFtArea ( this, ScResId( FT_AREA ) ), // #if ENABLE_LAYOUT_EXPERIMENTAL #undef this #undef ScResId #define ScResId(x) this, #x #endif /* ENABLE_LAYOUT_EXPERIMENTAL */ - aStrRowLabel ( ScResId( STR_ROW_LABEL ) ), - aStrColLabel ( ScResId( STR_COL_LABEL ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), + aStrRowLabel ( ScResId( STR_ROW_LABEL ) ), + aStrColLabel ( ScResId( STR_COL_LABEL ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), // - nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), - rSortData ( ((const ScSortItem&) + nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), + rSortData ( ((const ScSortItem&) rArgSet.Get( nWhichSort )).GetSortData() ), - pViewData ( NULL ), - pDoc ( NULL ), - pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ), - pColRes ( NULL ), - pColWrap ( NULL ) + pViewData ( NULL ), + pDoc ( NULL ), + pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ), + pColRes ( NULL ), + pColWrap ( NULL ) { Init(); FreeResource(); @@ -614,44 +614,44 @@ __EXPORT ScTabPageSortOptions::~ScTabPageSortOptions() delete (String*)aLbOutPos.GetEntryData( i ); delete pColRes; - delete pColWrap; //! not if from document + delete pColWrap; //! not if from document } // ----------------------------------------------------------------------- void ScTabPageSortOptions::Init() { -// aStrAreaLabel = aFtAreaLabel.GetText(); -// aStrAreaLabel.Append( (sal_Unicode) ' ' ); +// aStrAreaLabel = aFtAreaLabel.GetText(); +// aStrAreaLabel.Append( (sal_Unicode) ' ' ); - // CollatorRessource has user-visible names for sort algorithms + // CollatorRessource has user-visible names for sort algorithms pColRes = new CollatorRessource(); - //! use CollatorWrapper from document? + //! use CollatorWrapper from document? pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() ); - const ScSortItem& rSortItem = (const ScSortItem&) + const ScSortItem& rSortItem = (const ScSortItem&) GetItemSet().Get( nWhichSort ); - aLbOutPos.SetSelectHdl ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) ); + aLbOutPos.SetSelectHdl ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) ); aBtnCopyResult.SetClickHdl( LINK( this, ScTabPageSortOptions, EnableHdl ) ); aBtnSortUser.SetClickHdl ( LINK( this, ScTabPageSortOptions, EnableHdl ) ); - aBtnTopDown.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) ); + aBtnTopDown.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) ); aBtnLeftRight.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) ); aLbLanguage.SetSelectHdl ( LINK( this, ScTabPageSortOptions, FillAlgorHdl ) ); pViewData = rSortItem.GetViewData(); - pDoc = pViewData ? pViewData->GetDocument() : NULL; + pDoc = pViewData ? pViewData->GetDocument() : NULL; DBG_ASSERT( pViewData, "ViewData not found! :-/" ); if ( pViewData && pDoc ) { - String theArea; - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - String theDbArea; - String theDbName = aStrNoName; - const SCTAB nCurTab = pViewData->GetTabNo(); + String theArea; + ScDBCollection* pDBColl = pDoc->GetDBCollection(); + String theDbArea; + String theDbName = aStrNoName; + const SCTAB nCurTab = pViewData->GetTabNo(); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); aLbOutPos.Clear(); @@ -709,7 +709,7 @@ void ScTabPageSortOptions::Init() FillUserSortListBox(); - // get available languages + // get available languages aLbLanguage.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE ); aLbLanguage.InsertLanguage( LANGUAGE_SYSTEM ); @@ -728,8 +728,8 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges() #undef SfxTabPage #endif /* ENABLE_LAYOUT_EXPERIMENTAL */ SfxTabPage* __EXPORT ScTabPageSortOptions::Create( - Window* pParent, - const SfxItemSet& rArgSet ) + Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTabPageSortOptions( pParent, rArgSet ) ); } @@ -751,10 +751,10 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) aLbSortUser.SelectEntryPos( 0 ); } - aBtnCase.Check ( rSortData.bCaseSens ); - aBtnFormats.Check ( rSortData.bIncludePattern ); - aBtnHeader.Check ( rSortData.bHasHeader ); - aBtnNaturalSort.Check ( rSortData.bNaturalSort ); + aBtnCase.Check ( rSortData.bCaseSens ); + aBtnFormats.Check ( rSortData.bIncludePattern ); + aBtnHeader.Check ( rSortData.bHasHeader ); + aBtnNaturalSort.Check ( rSortData.bNaturalSort ); if ( rSortData.bByRow ) { @@ -771,7 +771,7 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) if ( eLang == LANGUAGE_DONTKNOW ) eLang = LANGUAGE_SYSTEM; aLbLanguage.SelectLanguage( eLang ); - FillAlgorHdl( &aLbLanguage ); // get algorithms, select default + FillAlgorHdl( &aLbLanguage ); // get algorithms, select default if ( rSortData.aCollatorAlgorithm.Len() ) aLbAlgorithm.SelectEntry( pColRes->GetTranslation( rSortData.aCollatorAlgorithm ) ); @@ -817,17 +817,17 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) theSortData = ((const ScSortItem*)pItem)->GetSortData(); } - theSortData.bByRow = aBtnTopDown.IsChecked(); - theSortData.bHasHeader = aBtnHeader.IsChecked(); - theSortData.bCaseSens = aBtnCase.IsChecked(); - theSortData.bNaturalSort = aBtnNaturalSort.IsChecked(); + theSortData.bByRow = aBtnTopDown.IsChecked(); + theSortData.bHasHeader = aBtnHeader.IsChecked(); + theSortData.bCaseSens = aBtnCase.IsChecked(); + theSortData.bNaturalSort = aBtnNaturalSort.IsChecked(); theSortData.bIncludePattern = aBtnFormats.IsChecked(); - theSortData.bInplace = !aBtnCopyResult.IsChecked(); - theSortData.nDestCol = theOutPos.Col(); - theSortData.nDestRow = theOutPos.Row(); - theSortData.nDestTab = theOutPos.Tab(); - theSortData.bUserDef = aBtnSortUser.IsChecked(); - theSortData.nUserIndex = (aBtnSortUser.IsChecked()) + theSortData.bInplace = !aBtnCopyResult.IsChecked(); + theSortData.nDestCol = theOutPos.Col(); + theSortData.nDestRow = theOutPos.Row(); + theSortData.nDestTab = theOutPos.Tab(); + theSortData.bUserDef = aBtnSortUser.IsChecked(); + theSortData.nUserIndex = (aBtnSortUser.IsChecked()) ? aLbSortUser.GetSelectEntryPos() : 0; @@ -885,17 +885,17 @@ int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) if ( aBtnCopyResult.IsChecked() ) { - String thePosStr = aEdOutPos.GetText(); - ScAddress thePos; - xub_StrLen nColonPos = thePosStr.Search( ':' ); + String thePosStr = aEdOutPos.GetText(); + ScAddress thePos; + xub_StrLen nColonPos = thePosStr.Search( ':' ); if ( STRING_NOTFOUND != nColonPos ) thePosStr.Erase( nColonPos ); if ( pViewData ) { - // visible table is default for input without table - // must be changed to GetRefTabNo when sorting has RefInput! + // visible table is default for input without table + // must be changed to GetRefTabNo when sorting has RefInput! thePos.SetTab( pViewData->GetTabNo() ); } @@ -987,8 +987,8 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) { if ( pLb == &aLbOutPos ) { - String aString; - USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); + String aString; + USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); if ( nSelPos > 0 ) aString = *(String*)aLbOutPos.GetEntryData( nSelPos ); @@ -1019,15 +1019,15 @@ void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) { if ( pEd == &aEdOutPos ) { - String theCurPosStr = aEdOutPos.GetText(); - USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); + String theCurPosStr = aEdOutPos.GetText(); + USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); if ( SCA_VALID == (nResult & SCA_VALID) ) { - String* pStr = NULL; - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = aLbOutPos.GetEntryCount(); + String* pStr = NULL; + BOOL bFound = FALSE; + USHORT i = 0; + USHORT nCount = aLbOutPos.GetEntryCount(); for ( i=2; i<nCount && !bFound; i++ ) { @@ -1053,11 +1053,11 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG ) LanguageType eLang = aLbLanguage.GetSelectLanguage(); if ( eLang == LANGUAGE_SYSTEM ) { - // for LANGUAGE_SYSTEM no algorithm can be selected because - // it wouldn't necessarily exist for other languages - // -> leave list box empty if LANGUAGE_SYSTEM is selected + // for LANGUAGE_SYSTEM no algorithm can be selected because + // it wouldn't necessarily exist for other languages + // -> leave list box empty if LANGUAGE_SYSTEM is selected aFtAlgorithm.Enable( FALSE ); // nothing to select - aLbAlgorithm.Enable( FALSE ); // nothing to select + aLbAlgorithm.Enable( FALSE ); // nothing to select } else { @@ -1072,9 +1072,9 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG ) String sUser = pColRes->GetTranslation( sAlg ); aLbAlgorithm.InsertEntry( sUser, LISTBOX_APPEND ); } - aLbAlgorithm.SelectEntryPos( 0 ); // first entry is default + aLbAlgorithm.SelectEntryPos( 0 ); // first entry is default aFtAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice - aLbAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice + aLbAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice } aLbAlgorithm.SetUpdateMode( TRUE ); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index b4d6519d3388..cceac3df79e5 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.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 @@ -60,26 +60,26 @@ static USHORT pSubTotalsRanges[] = ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId, const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( nResId ), rArgSet ), // - aFtGroup ( this, ScResId( FT_GROUP ) ), - aLbGroup ( this, ScResId( LB_GROUP ) ), - aFtColumns ( this, ScResId( FT_COLUMNS ) ), - aLbColumns ( this, ScResId( WND_COLUMNS ) ), - aFtFunctions ( this, ScResId( FT_FUNCTIONS ) ), - aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ), - aStrNone ( ScResId( SCSTR_NONE ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aFtGroup ( this, ScResId( FT_GROUP ) ), + aLbGroup ( this, ScResId( LB_GROUP ) ), + aFtColumns ( this, ScResId( FT_COLUMNS ) ), + aLbColumns ( this, ScResId( WND_COLUMNS ) ), + aFtFunctions ( this, ScResId( FT_FUNCTIONS ) ), + aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ), + aStrNone ( ScResId( SCSTR_NONE ) ), + aStrColumn ( ScResId( SCSTR_COLUMN ) ), // - pViewData ( NULL ), - pDoc ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ), - rSubTotalData ( ((const ScSubTotalItem&) + rSubTotalData ( ((const ScSubTotalItem&) rArgSet.Get( nWhichSubTotals )). GetSubTotalData() ), - nFieldCount ( 0 ) + nFieldCount ( 0 ) { // Font is correctly initialized by SvTreeListBox ctor aLbColumns.SetSelectionMode( SINGLE_SELECTION ); @@ -95,7 +95,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId, __EXPORT ScTpSubTotalGroup::~ScTpSubTotalGroup() { - USHORT nCount = (USHORT)aLbColumns.GetEntryCount(); + USHORT nCount = (USHORT)aLbColumns.GetEntryCount(); if ( nCount > 0 ) { @@ -118,15 +118,15 @@ void ScTpSubTotalGroup::Init() const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&) GetItemSet().Get( nWhichSubTotals ); - pViewData = rSubTotalItem.GetViewData(); - pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL; + pViewData = rSubTotalItem.GetViewData(); + pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL; DBG_ASSERT( pViewData && pDoc, "ViewData or Document not found :-(" ); - aLbGroup.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); - aLbColumns.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); - aLbColumns.SetCheckButtonHdl ( LINK( this, ScTpSubTotalGroup, CheckHdl ) ); - aLbFunctions.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); + aLbGroup.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); + aLbColumns.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); + aLbColumns.SetCheckButtonHdl ( LINK( this, ScTpSubTotalGroup, CheckHdl ) ); + aLbFunctions.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); nFieldArr[0] = 0; FillListBoxes(); @@ -141,8 +141,8 @@ USHORT* __EXPORT ScTpSubTotalGroup::GetRanges() // ----------------------------------------------------------------------- -BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, - const SfxItemSet& rArgSet ) +BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, + const SfxItemSet& rArgSet ) { USHORT nGroupIdx = 0; @@ -169,16 +169,16 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, if ( theSubTotalData.bGroupActive[nGroupIdx] ) { - SCCOL nField = theSubTotalData.nField[nGroupIdx]; - SCCOL nSubTotals = theSubTotalData.nSubTotals[nGroupIdx]; - SCCOL* pSubTotals = theSubTotalData.pSubTotals[nGroupIdx]; - ScSubTotalFunc* pFunctions = theSubTotalData.pFunctions[nGroupIdx]; + SCCOL nField = theSubTotalData.nField[nGroupIdx]; + SCCOL nSubTotals = theSubTotalData.nSubTotals[nGroupIdx]; + SCCOL* pSubTotals = theSubTotalData.pSubTotals[nGroupIdx]; + ScSubTotalFunc* pFunctions = theSubTotalData.pFunctions[nGroupIdx]; aLbGroup.SelectEntryPos( GetFieldSelPos( nField )+1 ); for ( USHORT i=0; i<nSubTotals; i++ ) { - USHORT nCheckPos = GetFieldSelPos( pSubTotals[i] ); + USHORT nCheckPos = GetFieldSelPos( pSubTotals[i] ); USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nCheckPos ); aLbColumns.CheckEntryPos( nCheckPos ); @@ -198,8 +198,8 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, // ----------------------------------------------------------------------- -BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, - SfxItemSet& rArgSet ) +BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, + SfxItemSet& rArgSet ) { USHORT nGroupIdx = 0; @@ -221,7 +221,7 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, //---------------------------------------------------------- - ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt + ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); if ( pDlg ) { @@ -231,26 +231,26 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData(); } - ScSubTotalFunc* pFunctions = NULL; - SCCOL* pSubTotals = NULL; - USHORT nGroup = aLbGroup.GetSelectEntryPos(); - USHORT nEntryCount = (USHORT)aLbColumns.GetEntryCount(); - USHORT nCheckCount = aLbColumns.GetCheckedEntryCount(); + ScSubTotalFunc* pFunctions = NULL; + SCCOL* pSubTotals = NULL; + USHORT nGroup = aLbGroup.GetSelectEntryPos(); + USHORT nEntryCount = (USHORT)aLbColumns.GetEntryCount(); + USHORT nCheckCount = aLbColumns.GetCheckedEntryCount(); - theSubTotalData.nCol1 = rSubTotalData.nCol1; - theSubTotalData.nRow1 = rSubTotalData.nRow1; - theSubTotalData.nCol2 = rSubTotalData.nCol2; - theSubTotalData.nRow2 = rSubTotalData.nRow2; + theSubTotalData.nCol1 = rSubTotalData.nCol1; + theSubTotalData.nRow1 = rSubTotalData.nRow1; + theSubTotalData.nCol2 = rSubTotalData.nCol2; + theSubTotalData.nRow2 = rSubTotalData.nRow2; theSubTotalData.bGroupActive[nGroupIdx] = (nGroup != 0); - theSubTotalData.nField[nGroupIdx] = (nGroup != 0) + theSubTotalData.nField[nGroupIdx] = (nGroup != 0) ? nFieldArr[nGroup-1] : static_cast<SCCOL>(0); if ( nEntryCount>0 && nCheckCount>0 && nGroup!=0 ) { - USHORT nFunction = 0; + USHORT nFunction = 0; - pSubTotals = new SCCOL [nCheckCount]; + pSubTotals = new SCCOL [nCheckCount]; pFunctions = new ScSubTotalFunc [nCheckCount]; for ( USHORT i=0, nCheck=0; i<nEntryCount; i++ ) @@ -265,7 +265,7 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, nCheck++; } } - theSubTotalData.SetSubTotals( nGroupNo, // Gruppen-Nr. + theSubTotalData.SetSubTotals( nGroupNo, // Gruppen-Nr. pSubTotals, pFunctions, nCheckCount ); // Anzahl der Array-Elemente @@ -288,13 +288,13 @@ void ScTpSubTotalGroup::FillListBoxes() if ( pViewData && pDoc ) { - SCCOL nFirstCol = rSubTotalData.nCol1; - SCROW nFirstRow = rSubTotalData.nRow1; - SCTAB nTab = pViewData->GetTabNo(); - SCCOL nMaxCol = rSubTotalData.nCol2; - SCCOL col; - USHORT i=0; - String aFieldName; + SCCOL nFirstCol = rSubTotalData.nCol1; + SCROW nFirstRow = rSubTotalData.nRow1; + SCTAB nTab = pViewData->GetTabNo(); + SCCOL nMaxCol = rSubTotalData.nCol2; + SCCOL col; + USHORT i=0; + String aFieldName; aLbGroup.Clear(); aLbColumns.Clear(); @@ -325,8 +325,8 @@ void ScTpSubTotalGroup::FillListBoxes() USHORT ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField ) { - USHORT nFieldPos = 0; - BOOL bFound = FALSE; + USHORT nFieldPos = 0; + BOOL bFound = FALSE; for ( USHORT n=0; n<nFieldCount && !bFound; n++ ) { @@ -346,18 +346,18 @@ ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( USHORT nPos ) { switch ( nPos ) { -// case 0: return SUBTOTAL_FUNC_NONE; - case 2: return SUBTOTAL_FUNC_AVE; - case 6: return SUBTOTAL_FUNC_CNT; - case 1: return SUBTOTAL_FUNC_CNT2; - case 3: return SUBTOTAL_FUNC_MAX; - case 4: return SUBTOTAL_FUNC_MIN; - case 5: return SUBTOTAL_FUNC_PROD; - case 7: return SUBTOTAL_FUNC_STD; - case 8: return SUBTOTAL_FUNC_STDP; - case 0: return SUBTOTAL_FUNC_SUM; - case 9: return SUBTOTAL_FUNC_VAR; - case 10: return SUBTOTAL_FUNC_VARP; +// case 0: return SUBTOTAL_FUNC_NONE; + case 2: return SUBTOTAL_FUNC_AVE; + case 6: return SUBTOTAL_FUNC_CNT; + case 1: return SUBTOTAL_FUNC_CNT2; + case 3: return SUBTOTAL_FUNC_MAX; + case 4: return SUBTOTAL_FUNC_MIN; + case 5: return SUBTOTAL_FUNC_PROD; + case 7: return SUBTOTAL_FUNC_STD; + case 8: return SUBTOTAL_FUNC_STDP; + case 0: return SUBTOTAL_FUNC_SUM; + case 9: return SUBTOTAL_FUNC_VAR; + case 10: return SUBTOTAL_FUNC_VARP; default: DBG_ERROR( "ScTpSubTotalGroup::LbPosToFunc" ); return SUBTOTAL_FUNC_NONE; @@ -370,18 +370,18 @@ USHORT ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) { switch ( eFunc ) { -// case SUBTOTAL_FUNC_NONE: return 0; - case SUBTOTAL_FUNC_AVE: return 2; - case SUBTOTAL_FUNC_CNT: return 6; - case SUBTOTAL_FUNC_CNT2: return 1; - case SUBTOTAL_FUNC_MAX: return 3; - case SUBTOTAL_FUNC_MIN: return 4; - case SUBTOTAL_FUNC_PROD: return 5; - case SUBTOTAL_FUNC_STD: return 7; - case SUBTOTAL_FUNC_STDP: return 8; - case SUBTOTAL_FUNC_SUM: return 0; - case SUBTOTAL_FUNC_VAR: return 9; - case SUBTOTAL_FUNC_VARP: return 10; +// case SUBTOTAL_FUNC_NONE: return 0; + case SUBTOTAL_FUNC_AVE: return 2; + case SUBTOTAL_FUNC_CNT: return 6; + case SUBTOTAL_FUNC_CNT2: return 1; + case SUBTOTAL_FUNC_MAX: return 3; + case SUBTOTAL_FUNC_MIN: return 4; + case SUBTOTAL_FUNC_PROD: return 5; + case SUBTOTAL_FUNC_STD: return 7; + case SUBTOTAL_FUNC_STDP: return 8; + case SUBTOTAL_FUNC_SUM: return 0; + case SUBTOTAL_FUNC_VAR: return 9; + case SUBTOTAL_FUNC_VARP: return 10; default: DBG_ERROR( "ScTpSubTotalGroup::FuncToLbPos" ); return 0; @@ -397,9 +397,9 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) if ( (aLbColumns.GetEntryCount() > 0) && (aLbColumns.GetSelectionCount() > 0) ) { - USHORT nFunction = aLbFunctions.GetSelectEntryPos(); - USHORT nColumn = aLbColumns.GetSelectEntryPos(); - USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nColumn ); + USHORT nFunction = aLbFunctions.GetSelectEntryPos(); + USHORT nColumn = aLbColumns.GetSelectEntryPos(); + USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nColumn ); DBG_ASSERT( pFunction, "EntryData nicht gefunden!" ); if ( !pFunction ) @@ -412,7 +412,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) else if ( pLb == &aLbFunctions ) { *pFunction = nFunction; -// aLbColumns.CheckEntryPos( nColumn, (nFunction != 0) );//XXX +// aLbColumns.CheckEntryPos( nColumn, (nFunction != 0) );//XXX aLbColumns.CheckEntryPos( nColumn, TRUE ); } } @@ -439,20 +439,20 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) //======================================================================== // Abgeleitete Gruppen-TabPages: -SfxTabPage* __EXPORT ScTpSubTotalGroup1::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTpSubTotalGroup1::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTpSubTotalGroup2::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTpSubTotalGroup2::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTpSubTotalGroup3::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTpSubTotalGroup3::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); } // ----------------------------------------------------------------------- @@ -497,28 +497,28 @@ BOOL __EXPORT ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FI //======================================================================== // Optionen-Tabpage: -ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, - const SfxItemSet& rArgSet ) +ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, + const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_SUBT_OPTIONS ), rArgSet ), // aFlGroup ( this, ScResId( FL_GROUP ) ), - aBtnPagebreak ( this, ScResId( BTN_PAGEBREAK ) ), - aBtnCase ( this, ScResId( BTN_CASE ) ), - aBtnSort ( this, ScResId( BTN_SORT ) ), + aBtnPagebreak ( this, ScResId( BTN_PAGEBREAK ) ), + aBtnCase ( this, ScResId( BTN_CASE ) ), + aBtnSort ( this, ScResId( BTN_SORT ) ), aFlSort ( this, ScResId( FL_SORT ) ), - aBtnAscending ( this, ScResId( BTN_ASCENDING ) ), - aBtnDescending ( this, ScResId( BTN_DESCENDING ) ), - aBtnFormats ( this, ScResId( BTN_FORMATS ) ), - aBtnUserDef ( this, ScResId( BTN_USERDEF ) ), - aLbUserDef ( this, ScResId( LB_USERDEF ) ), + aBtnAscending ( this, ScResId( BTN_ASCENDING ) ), + aBtnDescending ( this, ScResId( BTN_DESCENDING ) ), + aBtnFormats ( this, ScResId( BTN_FORMATS ) ), + aBtnUserDef ( this, ScResId( BTN_USERDEF ) ), + aLbUserDef ( this, ScResId( LB_USERDEF ) ), // - pViewData ( NULL ), - pDoc ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ), - rSubTotalData ( ((const ScSubTotalItem&) + rSubTotalData ( ((const ScSubTotalItem&) rArgSet.Get( nWhichSubTotals )). GetSubTotalData() ) { @@ -539,21 +539,21 @@ void ScTpSubTotalOptions::Init() const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&) GetItemSet().Get( nWhichSubTotals ); - pViewData = rSubTotalItem.GetViewData(); - pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL; + pViewData = rSubTotalItem.GetViewData(); + pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL; DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" ); - aBtnSort.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); - aBtnUserDef.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); + aBtnSort.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); + aBtnUserDef.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); FillUserSortListBox(); } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalOptions( pParent, rArgSet ) ); } @@ -563,9 +563,9 @@ SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) { aBtnPagebreak.Check ( rSubTotalData.bPagebreak ); - aBtnCase.Check ( rSubTotalData.bCaseSens ); - aBtnFormats.Check ( rSubTotalData.bIncludePattern ); - aBtnSort.Check ( rSubTotalData.bDoSort ); + aBtnCase.Check ( rSubTotalData.bCaseSens ); + aBtnFormats.Check ( rSubTotalData.bIncludePattern ); + aBtnSort.Check ( rSubTotalData.bDoSort ); aBtnAscending.Check ( rSubTotalData.bAscending ); aBtnDescending.Check( !rSubTotalData.bAscending ); @@ -589,7 +589,7 @@ void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) { - ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt + ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); if ( pDlg ) { @@ -599,14 +599,14 @@ BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData(); } - theSubTotalData.bPagebreak = aBtnPagebreak.IsChecked(); - theSubTotalData.bReplace = TRUE; - theSubTotalData.bCaseSens = aBtnCase.IsChecked(); + theSubTotalData.bPagebreak = aBtnPagebreak.IsChecked(); + theSubTotalData.bReplace = TRUE; + theSubTotalData.bCaseSens = aBtnCase.IsChecked(); theSubTotalData.bIncludePattern = aBtnFormats.IsChecked(); - theSubTotalData.bDoSort = aBtnSort.IsChecked(); - theSubTotalData.bAscending = aBtnAscending.IsChecked(); - theSubTotalData.bUserDef = aBtnUserDef.IsChecked(); - theSubTotalData.nUserIndex = (aBtnUserDef.IsChecked()) + theSubTotalData.bDoSort = aBtnSort.IsChecked(); + theSubTotalData.bAscending = aBtnAscending.IsChecked(); + theSubTotalData.bUserDef = aBtnUserDef.IsChecked(); + theSubTotalData.nUserIndex = (aBtnUserDef.IsChecked()) ? aLbUserDef.GetSelectEntryPos() : 0; @@ -641,10 +641,10 @@ IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) if ( aBtnSort.IsChecked() ) { aFlSort .Enable(); - aBtnFormats .Enable(); - aBtnUserDef .Enable(); - aBtnAscending .Enable(); - aBtnDescending .Enable(); + aBtnFormats .Enable(); + aBtnUserDef .Enable(); + aBtnAscending .Enable(); + aBtnDescending .Enable(); if ( aBtnUserDef.IsChecked() ) aLbUserDef.Enable(); @@ -652,11 +652,11 @@ IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) else { aFlSort .Disable(); - aBtnFormats .Disable(); - aBtnUserDef .Disable(); - aBtnAscending .Disable(); - aBtnDescending .Disable(); - aLbUserDef .Disable(); + aBtnFormats .Disable(); + aBtnUserDef .Disable(); + aBtnAscending .Disable(); + aBtnDescending .Disable(); + aLbUserDef .Disable(); } } else if ( pBox == &aBtnUserDef ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 6eed9ab7fee0..9ec9740e1208 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.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 @@ -53,7 +53,7 @@ #include "formula/opcode.hxx" // cell range picker -#include "tabvwsh.hxx" +#include "tabvwsh.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/childwin.hxx> #include "reffact.hxx" @@ -62,7 +62,7 @@ static USHORT pValueRanges[] = { - FID_VALID_MODE, FID_VALID_ERRTEXT, + FID_VALID_MODE, FID_VALID_ERRTEXT, FID_VALID_LISTTYPE, FID_VALID_LISTTYPE, 0 }; @@ -70,7 +70,7 @@ static USHORT pValueRanges[] = // ============================================================================ -ScValidationDlg::ScValidationDlg( Window* pParent, +ScValidationDlg::ScValidationDlg( Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/ @@ -90,12 +90,12 @@ void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pD { if ( rRange.aStart != rRange.aEnd ) if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) - if( m_pRefEdit ) + if( m_pRefEdit ) pValidationDlg->RefInputStart( m_pRefEdit ); if ( m_pRefEdit ) { - String aStr; + String aStr; rRange.Format( aStr, SCR_ABS_3D, pDoc ); m_pRefEdit->SetRefString( aStr ); } @@ -104,15 +104,15 @@ void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pD void ScTPValidationValue:: SetActiveHdl() { if ( m_pRefEdit ) m_pRefEdit->GrabFocus(); - + if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) - if( m_pRefEdit ) + if( m_pRefEdit ) { pValidationDlg->RefInputDone(); } } -void ScTPValidationValue::RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton ) +void ScTPValidationValue::RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton ) { if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) { @@ -131,9 +131,9 @@ void ScTPValidationValue::RefInputStartPreHdl( ScRefEdit* pEdit, ScRe } } -void ScTPValidationValue::RefInputDonePreHdl() +void ScTPValidationValue::RefInputDonePreHdl() { - + if( m_pRefEdit && m_pRefEdit->GetParent()!= this ) { if( Window *pPreWnd = m_pRefEdit==&maEdMax?&maFtMax:(m_pRefEdit==&maEdMin?&maFtMin:NULL) ) @@ -146,19 +146,19 @@ void ScTPValidationValue::RefInputDonePreHdl() m_btnRef.SetParent( m_pRefEdit ); //if Edit SetParent but button not, the tab order will be incorrect, need button to setparent to anthor window and restore parent later in order to restore the tab order } - + if( m_btnRef.GetParent()!=this ) m_btnRef.SetParent( this ); } -void ScTPValidationValue::RefInputDonePostHdl() +void ScTPValidationValue::RefInputDonePostHdl() { - - + + if( m_pRefEdit && !m_pRefEdit->HasFocus() ) m_pRefEdit->GrabFocus(); } - + BOOL ScValidationDlg::Close() { @@ -483,7 +483,7 @@ ScValidationDlg * ScTPValidationValue::GetValidationDlg() if( Window *pParent = GetParent() ) do{ if ( dynamic_cast<ScValidationDlg*>( pParent ) ) - return static_cast< ScValidationDlg * >( pParent ); + return static_cast< ScValidationDlg * >( pParent ); }while ( NULL != ( pParent = pParent->GetParent() ) ); return NULL; } @@ -566,7 +566,7 @@ void ScTPValidationValue::TidyListBoxes() pWnd = GetChild(0); - while( std::find( alstOrder.begin(), alstOrder.end(), pWnd ) != alstOrder.end() && NULL != ( pWnd = pWnd->GetWindow( WINDOW_NEXT) ) ) ; + while( std::find( alstOrder.begin(), alstOrder.end(), pWnd ) != alstOrder.end() && NULL != ( pWnd = pWnd->GetWindow( WINDOW_NEXT) ) ) ; if ( pWnd ) { @@ -583,7 +583,7 @@ void ScTPValidationValue::TidyListBoxes() IMPL_LINK( ScTPValidationValue, EditSetFocusHdl, Edit *, EMPTYARG) { USHORT nPos=maLbAllow.GetSelectEntryPos(); - + if ( nPos == SC_VALIDDLG_ALLOW_RANGE ) { SetupRefDlg(); @@ -594,7 +594,7 @@ IMPL_LINK( ScTPValidationValue, EditSetFocusHdl, Edit *, EMPTYARG) IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd ) { - if( pWnd == m_pRefEdit || pWnd == &m_btnRef ) + if( pWnd == m_pRefEdit || pWnd == &m_btnRef ) if( ScValidationDlg *pValidationDlg = GetValidationDlg() ) if ( (pValidationDlg->IsActive() || pValidationDlg->IsChildFocus() ) && !pValidationDlg->IsRefInputting() ) if( ( !m_pRefEdit || !m_pRefEdit->HasFocus()) && !m_btnRef.HasFocus() ) @@ -672,18 +672,18 @@ IMPL_LINK( ScTPValidationValue, CheckHdl, CheckBox*, EMPTYARG ) //======================================================================== // Input Help Page -ScTPValidationHelp::ScTPValidationHelp( Window* pParent, +ScTPValidationHelp::ScTPValidationHelp( Window* pParent, const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( TP_VALIDATION_INPUTHELP ), rArgSet ), - aTsbHelp ( this, ScResId( TSB_HELP ) ), + aTsbHelp ( this, ScResId( TSB_HELP ) ), aFlContent ( this, ScResId( FL_CONTENT ) ), - aFtTitle ( this, ScResId( FT_TITLE ) ), - aEdtTitle ( this, ScResId( EDT_TITLE ) ), - aFtInputHelp ( this, ScResId( FT_INPUTHELP ) ), - aEdInputHelp ( this, ScResId( EDT_INPUTHELP ) ), + aFtTitle ( this, ScResId( FT_TITLE ) ), + aEdtTitle ( this, ScResId( EDT_TITLE ) ), + aFtInputHelp ( this, ScResId( FT_INPUTHELP ) ), + aEdInputHelp ( this, ScResId( EDT_INPUTHELP ) ), mrArgSet ( rArgSet ) { @@ -713,8 +713,8 @@ USHORT* __EXPORT ScTPValidationHelp::GetRanges() // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTPValidationHelp::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTPValidationHelp::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTPValidationHelp( pParent, rArgSet ) ); } @@ -756,21 +756,21 @@ BOOL __EXPORT ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) //======================================================================== // Error Alert Page -ScTPValidationError::ScTPValidationError( Window* pParent, +ScTPValidationError::ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( TP_VALIDATION_ERROR ), rArgSet ), - aTsbShow ( this, ScResId( TSB_SHOW ) ), + aTsbShow ( this, ScResId( TSB_SHOW ) ), aFlContent ( this, ScResId( FL_CONTENT ) ), - aFtAction ( this, ScResId( FT_ACTION ) ), - aLbAction ( this, ScResId( LB_ACTION ) ), - aBtnSearch ( this, ScResId( BTN_SEARCH ) ), - aFtTitle ( this, ScResId( FT_TITLE ) ), - aEdtTitle ( this, ScResId( EDT_TITLE ) ), - aFtError ( this, ScResId( FT_ERROR ) ), - aEdError ( this, ScResId( EDT_ERROR ) ), + aFtAction ( this, ScResId( FT_ACTION ) ), + aLbAction ( this, ScResId( LB_ACTION ) ), + aBtnSearch ( this, ScResId( BTN_SEARCH ) ), + aFtTitle ( this, ScResId( FT_TITLE ) ), + aEdtTitle ( this, ScResId( EDT_TITLE ) ), + aFtError ( this, ScResId( FT_ERROR ) ), + aEdError ( this, ScResId( EDT_ERROR ) ), mrArgSet ( rArgSet ) { @@ -806,8 +806,8 @@ USHORT* __EXPORT ScTPValidationError::GetRanges() // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTPValidationError::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTPValidationError::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTPValidationError( pParent, rArgSet ) ); } @@ -948,12 +948,12 @@ bool ScValidationDlg::RemoveRefDlg( BOOL bRestoreModal /* = TRUE */ ) } if ( !m_bOwnRefHdlr ) return false; - if( LeaveRefStatus() && LeaveRefMode() ) + if( LeaveRefStatus() && LeaveRefMode() ) { m_bOwnRefHdlr = false; if( bRestoreModal ) - SetModal( TRUE ); + SetModal( TRUE ); } if ( SfxChildWindow* pWnd = pTabVwSh->GetViewFrame()->GetChildWindow( SID_VALIDITY_REFERENCE ) ) @@ -969,7 +969,7 @@ void ScTPValidationValue::ScRefButtonEx::Click() { if( ScTPValidationValue *pParent = dynamic_cast< ScTPValidationValue*>( GetParent() ) ) pParent->OnClick( this ); - + ScRefButton::Click(); } @@ -990,7 +990,7 @@ BOOL ScValidationDlg::IsChildFocus() } -bool ScValidationDlg::IsAlive() +bool ScValidationDlg::IsAlive() { return SC_MOD()->IsAliveRefDlg( SLOTID, this ); } diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src index c861fbc200cb..67207cdfaba2 100644 --- a/sc/source/ui/dbgui/validate.src +++ b/sc/source/ui/dbgui/validate.src @@ -1,7 +1,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 @@ -63,7 +63,7 @@ TabDialog TAB_DLG_VALIDATION Text [ en-US ] = "Validity" ; }; //<!--Added by PengYunQuan for Validity Cell Range Picker -#define OFFSET_X 30 +#define OFFSET_X 30 //-->Added by PengYunQuan for Validity Cell Range Picker TabPage TP_VALIDATION_VALUES { @@ -121,7 +121,7 @@ TabPage TP_VALIDATION_VALUES Size = MAP_APPFONT ( 90 , 90 ) ; TabStop = TRUE ; DropDown = TRUE ; - // Reihenfolge entspricht enum ScConditionMode + // Reihenfolge entspricht enum ScConditionMode StringList [ en-US ] = { < "equal" ; SC_VALIDDLG_DATA_EQUAL ; > ; @@ -342,7 +342,7 @@ TabPage TP_VALIDATION_ERROR Size = MAP_APPFONT ( 107 , 76 ) ; TabStop = TRUE ; DropDown = TRUE ; - // Reihenfolge entspricht enum ScValidErrorStyle + // Reihenfolge entspricht enum ScValidErrorStyle StringList [ en-US ] = { < "Stop" ; Default ; > ; diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 69a62985e02f..3e3804584e2f 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.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 @@ -54,9 +54,9 @@ #include "hints.hxx" #include "filter.hxx" -#include "attrib.hxx" // raus, wenn ResetAttrib am Dokument -#include "patattr.hxx" // raus, wenn ResetAttrib am Dokument -#include "docpool.hxx" // raus, wenn ResetAttrib am Dokument +#include "attrib.hxx" // raus, wenn ResetAttrib am Dokument +#include "patattr.hxx" // raus, wenn ResetAttrib am Dokument +#include "docpool.hxx" // raus, wenn ResetAttrib am Dokument #include "sc.hrc" #include "scabstdlg.hxx" @@ -79,16 +79,16 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile, const String& rArea, const ScRange& rDest, ULONG nRefresh ) : ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,FORMAT_FILE), - ScRefreshTimer ( nRefresh ), + ScRefreshTimer ( nRefresh ), pImpl ( new AreaLink_Impl() ), - aFileName (rFile), - aFilterName (rFilter), - aOptions (rOpt), - aSourceArea (rArea), - aDestArea (rDest), - bAddUndo (TRUE), - bInCreate (FALSE), - bDoInsert (TRUE) + aFileName (rFile), + aFilterName (rFilter), + aOptions (rOpt), + aSourceArea (rArea), + aDestArea (rDest), + bAddUndo (TRUE), + bInCreate (FALSE), + bDoInsert (TRUE) { DBG_ASSERT(pShell->ISA(ScDocShell), "ScAreaLink mit falscher ObjectShell"); pImpl->m_pDocSh = static_cast< ScDocShell* >( pShell ); @@ -104,9 +104,9 @@ __EXPORT ScAreaLink::~ScAreaLink() void __EXPORT ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ ) { - // use own dialog instead of SvBaseLink::Edit... - // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom - // ein Optionen-Dialog kommt... + // use own dialog instead of SvBaseLink::Edit... + // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom + // ein Optionen-Dialog kommt... ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); @@ -121,8 +121,8 @@ void __EXPORT ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ ) void __EXPORT ScAreaLink::DataChanged( const String&, const ::com::sun::star::uno::Any& ) { - // bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im - // LinkManager zu setzen, ohne die Daten im Dokument zu aendern + // bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im + // LinkManager zu setzen, ohne die Daten im Dokument zu aendern if (bInCreate) return; @@ -135,8 +135,8 @@ void __EXPORT ScAreaLink::DataChanged( const String&, String aArea; pLinkManager->GetDisplayNames( this,0,&aFile,&aArea,&aFilter); - // the file dialog returns the filter name with the application prefix - // -> remove prefix + // the file dialog returns the filter name with the application prefix + // -> remove prefix ScDocumentLoader::RemoveAppPrefix( aFilter ); // #81155# dialog doesn't set area, so keep old one @@ -166,7 +166,7 @@ void __EXPORT ScAreaLink::Closed() aFileName, aFilterName, aOptions, aSourceArea, aDestArea, GetRefreshDelay() ) ); - bAddUndo = FALSE; // nur einmal + bAddUndo = FALSE; // nur einmal } SCTAB nDestTab = aDestArea.aStart.Tab(); @@ -178,18 +178,18 @@ void __EXPORT ScAreaLink::Closed() void ScAreaLink::SetDestArea(const ScRange& rNew) { - aDestArea = rNew; // fuer Undo + aDestArea = rNew; // fuer Undo } void ScAreaLink::SetSource(const String& rDoc, const String& rFlt, const String& rOpt, const String& rArea) { - aFileName = rDoc; - aFilterName = rFlt; - aOptions = rOpt; - aSourceArea = rArea; + aFileName = rDoc; + aFilterName = rFlt; + aOptions = rOpt; + aSourceArea = rArea; - // also update link name for dialog + // also update link name for dialog String aNewLinkName; sfx2::MakeLnkName( aNewLinkName, NULL, aFileName, aSourceArea, &aFilterName ); SetName( aNewLinkName ); @@ -208,15 +208,15 @@ BOOL ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin BOOL bFound = FALSE; ScRangeName* pNames = pSrcDoc->GetRangeName(); USHORT nPos; - if (pNames) // benannte Bereiche + if (pNames) // benannte Bereiche { if (pNames->SearchName( rAreaName, nPos )) if ( (*pNames)[nPos]->IsValidReference( rRange ) ) bFound = TRUE; } - if (!bFound) // Datenbankbereiche + if (!bFound) // Datenbankbereiche { - ScDBCollection* pDBColl = pSrcDoc->GetDBCollection(); + ScDBCollection* pDBColl = pSrcDoc->GetDBCollection(); if (pDBColl) if (pDBColl->SearchName( rAreaName, nPos )) { @@ -228,7 +228,7 @@ BOOL ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin bFound = TRUE; } } - if (!bFound) // direct reference (range or cell) + if (!bFound) // direct reference (range or cell) { ScAddress::Details aDetails(pSrcDoc->GetAddressConvention(), 0, 0); if ( rRange.ParseAny( rAreaName, pSrcDoc, aDetails ) & SCA_VALID ) @@ -237,12 +237,12 @@ BOOL ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin return bFound; } -// ausfuehren: +// ausfuehren: BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, const String& rNewArea, ULONG nNewRefresh ) { - // Dokument laden - wie TabLink + // Dokument laden - wie TabLink if (!rNewFile.Len() || !rNewFilter.Len()) return FALSE; @@ -259,11 +259,11 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, BOOL bUndo (pDoc->IsUndoEnabled()); pDoc->SetInLinkUpdate( TRUE ); - // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen + // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen if ( rNewFilter != aFilterName ) aOptions.Erase(); - // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann + // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() ); if ( aOptions.Len() ) pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) ); @@ -271,7 +271,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter); ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL); -//REMOVE SvEmbeddedObjectRef aRef = pSrcShell; +//REMOVE SvEmbeddedObjectRef aRef = pSrcShell; SfxObjectShellRef aRef = pSrcShell; pSrcShell->DoLoad(pMed); @@ -313,12 +313,12 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, if( nHeight > 0 ) nHeight--; - // alte Daten loeschen / neue kopieren + // alte Daten loeschen / neue kopieren ScAddress aDestPos = aDestArea.aStart; SCTAB nDestTab = aDestPos.Tab(); ScRange aOldRange = aDestArea; - ScRange aNewRange = aDestArea; // alter Bereich, wenn Datei nicht gefunden o.ae. + ScRange aNewRange = aDestArea; // alter Bereich, wenn Datei nicht gefunden o.ae. if (nWidth > 0 && nHeight > 0) { aNewRange.aEnd.SetCol( aNewRange.aStart.Col() + nWidth - 1 ); @@ -339,7 +339,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, ScRange aMaxRange( aDestPos, ScAddress(Max(nOldEndX,nNewEndX), Max(nOldEndY,nNewEndY), nDestTab) ); - // Undo initialisieren + // Undo initialisieren ScDocument* pUndoDoc = NULL; ScDocument* pRedoDoc = NULL; @@ -348,32 +348,32 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); if ( bDoInsert ) { - if ( nNewEndX != nOldEndX || nNewEndY != nOldEndY ) // Bereich veraendert? + if ( nNewEndX != nOldEndX || nNewEndY != nOldEndY ) // Bereich veraendert? { pUndoDoc->InitUndo( pDoc, 0, pDoc->GetTableCount()-1 ); pDoc->CopyToDocument( 0,0,0,MAXCOL,MAXROW,MAXTAB, - IDF_FORMULA, FALSE, pUndoDoc ); // alle Formeln + IDF_FORMULA, FALSE, pUndoDoc ); // alle Formeln } else - pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle + pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle pDoc->CopyToDocument( aOldRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc ); } - else // ohne Einfuegen + else // ohne Einfuegen { - pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle + pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle pDoc->CopyToDocument( aMaxRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc ); } } - // Zellen einfuegen / loeschen - // DeleteAreaTab loescht auch MERGE_FLAG Attribute + // Zellen einfuegen / loeschen + // DeleteAreaTab loescht auch MERGE_FLAG Attribute if (bDoInsert) - pDoc->FitBlock( aOldRange, aNewRange ); // incl. loeschen + pDoc->FitBlock( aOldRange, aNewRange ); // incl. loeschen else pDoc->DeleteAreaTab( aMaxRange, IDF_ALL & ~IDF_NOTE ); - // Daten kopieren + // Daten kopieren if (nWidth > 0 && nHeight > 0) { @@ -388,7 +388,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, { SCTAB nSrcTab = aTokenRange.aStart.Tab(); ScMarkData aSourceMark; - aSourceMark.SelectOneTable( nSrcTab ); // selektieren fuer CopyToClip + aSourceMark.SelectOneTable( nSrcTab ); // selektieren fuer CopyToClip aSourceMark.SetMarkArea( aTokenRange ); ScClipParam aClipParam(aTokenRange, false); @@ -397,10 +397,10 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, if ( aClipDoc.HasAttrib( 0,0,nSrcTab, MAXCOL,MAXROW,nSrcTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) ) { - //! ResetAttrib am Dokument !!! + //! ResetAttrib am Dokument !!! ScPatternAttr aPattern( pSrcDoc->GetPool() ); - aPattern.GetItemSet().Put( ScMergeAttr() ); // Defaults + aPattern.GetItemSet().Put( ScMergeAttr() ); // Defaults aPattern.GetItemSet().Put( ScMergeFlagAttr() ); aClipDoc.ApplyPatternAreaTab( 0,0, MAXCOL,MAXROW, nSrcTab, aPattern ); } @@ -421,7 +421,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, pDoc->SetString( aDestPos.Col(), aDestPos.Row(), aDestPos.Tab(), aErr ); } - // Undo eintragen + // Undo eintragen if ( bAddUndo && bUndo) { @@ -438,7 +438,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, pUndoDoc, pRedoDoc, bDoInsert ) ); } - // neue Einstellungen merken + // neue Einstellungen merken if ( bNewUrlName ) aFileName = aNewUrl; @@ -470,18 +470,18 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, } else { - // CanFitBlock FALSE -> Probleme mit zusammengefassten Zellen - // oder Tabellengrenze erreicht! - //! Zellschutz ??? + // CanFitBlock FALSE -> Probleme mit zusammengefassten Zellen + // oder Tabellengrenze erreicht! + //! Zellschutz ??? - //! Link-Dialog muss Default-Parent setzen - // "kann keine Zeilen einfuegen" + //! Link-Dialog muss Default-Parent setzen + // "kann keine Zeilen einfuegen" InfoBox aBox( Application::GetDefDialogParent(), ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_2 ) ); aBox.Execute(); } - // aufraeumen + // aufraeumen aRef->DoClose(); @@ -489,8 +489,8 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, if (bCanDo) { - // notify Uno objects (for XRefreshListener) - //! also notify Uno objects if file name was changed! + // notify Uno objects (for XRefreshListener) + //! also notify Uno objects if file name was changed! ScLinkRefreshedHint aHint; aHint.SetAreaLink( aDestPos ); pDoc->BroadcastUno( aHint ); diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 511d7695c471..8b275b231b28 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.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,10 +44,10 @@ struct ScAutoStyleInitData { - ScRange aRange; - String aStyle1; - ULONG nTimeout; - String aStyle2; + ScRange aRange; + String aStyle1; + ULONG nTimeout; + String aStyle2; ScAutoStyleInitData( const ScRange& rR, const String& rSt1, ULONG nT, const String& rSt2 ) : aRange(rR), aStyle1(rSt1), nTimeout(nT), aStyle2(rSt2) {} @@ -55,9 +55,9 @@ struct ScAutoStyleInitData struct ScAutoStyleData { - ULONG nTimeout; - ScRange aRange; - String aStyle; + ULONG nTimeout; + ScRange aRange; + String aStyle; ScAutoStyleData( ULONG nT, const ScRange& rR, const String& rT ) : nTimeout(nT), aRange(rR), aStyle(rT) {} @@ -65,7 +65,7 @@ struct ScAutoStyleData //================================================================== -inline ULONG TimeNow() // Sekunden +inline ULONG TimeNow() // Sekunden { return (ULONG) time(0); } @@ -93,7 +93,7 @@ ScAutoStyleList::~ScAutoStyleList() //================================================================== -// initial short delay (asynchronous call) +// initial short delay (asynchronous call) void ScAutoStyleList::AddInitial( const ScRange& rRange, const String& rStyle1, ULONG nTimeout, const String& rStyle2 ) @@ -111,10 +111,10 @@ IMPL_LINK( ScAutoStyleList, InitHdl, Timer*, EMPTYARG ) { ScAutoStyleInitData* pData = (ScAutoStyleInitData*) aInitials.GetObject(i); - // apply first style immediately + // apply first style immediately pDocSh->DoAutoStyle( pData->aRange, pData->aStyle1 ); - // add second style to list + // add second style to list if ( pData->nTimeout ) AddEntry( pData->nTimeout, pData->aRange, pData->aStyle2 ); @@ -132,7 +132,7 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str aTimer.Stop(); ULONG nNow = TimeNow(); - // alten Eintrag loeschen + // alten Eintrag loeschen ULONG nCount = aEntries.Count(); ULONG i; @@ -144,11 +144,11 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str delete pData; aEntries.Remove(i); --nCount; - break; // nicht weitersuchen - es kann nur einen geben + break; // nicht weitersuchen - es kann nur einen geben } } - // Timeouts von allen Eintraegen anpassen + // Timeouts von allen Eintraegen anpassen if (nCount && nNow != nTimerStart) { @@ -156,7 +156,7 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str AdjustEntries((nNow-nTimerStart)*1000); } - // Einfuege-Position suchen + // Einfuege-Position suchen ULONG nPos = LIST_APPEND; for (i=0; i<nCount && nPos == LIST_APPEND; i++) @@ -166,22 +166,22 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str ScAutoStyleData* pNew = new ScAutoStyleData( nTimeout, rRange, rStyle ); aEntries.Insert( pNew, nPos ); - // abgelaufene ausfuehren, Timer neu starten + // abgelaufene ausfuehren, Timer neu starten ExecuteEntries(); StartTimer(nNow); } -void ScAutoStyleList::AdjustEntries( ULONG nDiff ) // Millisekunden +void ScAutoStyleList::AdjustEntries( ULONG nDiff ) // Millisekunden { ULONG nCount = aEntries.Count(); for (ULONG i=0; i<nCount; i++) { ScAutoStyleData* pData = (ScAutoStyleData*) aEntries.GetObject(i); if ( pData->nTimeout <= nDiff ) - pData->nTimeout = 0; // abgelaufen + pData->nTimeout = 0; // abgelaufen else - pData->nTimeout -= nDiff; // weiterzaehlen + pData->nTimeout -= nDiff; // weiterzaehlen } } @@ -190,7 +190,7 @@ void ScAutoStyleList::ExecuteEntries() ScAutoStyleData* pData; while ((pData = (ScAutoStyleData*) aEntries.GetObject(0)) != NULL && pData->nTimeout == 0) { - pDocSh->DoAutoStyle( pData->aRange, pData->aStyle ); //! oder Request ??? + pDocSh->DoAutoStyle( pData->aRange, pData->aStyle ); //! oder Request ??? delete pData; aEntries.Remove((ULONG)0); @@ -206,14 +206,14 @@ void ScAutoStyleList::ExecuteAllNow() { ScAutoStyleData* pData = (ScAutoStyleData*) aEntries.GetObject(i); - pDocSh->DoAutoStyle( pData->aRange, pData->aStyle ); //! oder Request ??? + pDocSh->DoAutoStyle( pData->aRange, pData->aStyle ); //! oder Request ??? delete pData; } aEntries.Clear(); } -void ScAutoStyleList::StartTimer( ULONG nNow ) // Sekunden +void ScAutoStyleList::StartTimer( ULONG nNow ) // Sekunden { // ersten Eintrag mit Timeout != 0 suchen @@ -233,7 +233,7 @@ void ScAutoStyleList::StartTimer( ULONG nNow ) // Sekunden IMPL_LINK( ScAutoStyleList, TimerHdl, Timer*, EMPTYARG ) { ULONG nNow = TimeNow(); - AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit + AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit ExecuteEntries(); StartTimer(nNow); diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 4a5f68b3e658..032d3b1d4bbb 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.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,8 +51,8 @@ #include "rangenam.hxx" #include "olinetab.hxx" #include "dpobject.hxx" -#include "dociter.hxx" // for lcl_EmptyExcept -#include "cell.hxx" // for lcl_EmptyExcept +#include "dociter.hxx" // for lcl_EmptyExcept +#include "cell.hxx" // for lcl_EmptyExcept #include "editable.hxx" #include "attrib.hxx" #include "drwlayer.hxx" @@ -124,9 +124,9 @@ BOOL ScDBDocFunc::DeleteDBRange( const String& rName, BOOL /* bApi */ ) if (bUndo) pUndoColl = new ScDBCollection( *pDocColl ); - pDoc->CompileDBFormula( TRUE ); // CreateFormulaString + pDoc->CompileDBFormula( TRUE ); // CreateFormulaString pDocColl->AtFree( nPos ); - pDoc->CompileDBFormula( FALSE ); // CompileFormulaString + pDoc->CompileDBFormula( FALSE ); // CompileFormulaString if (bUndo) { @@ -163,17 +163,17 @@ BOOL ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew, BOOL /* ScDBCollection* pUndoColl = new ScDBCollection( *pDocColl ); - pDoc->CompileDBFormula( TRUE ); // CreateFormulaString + pDoc->CompileDBFormula( TRUE ); // CreateFormulaString pDocColl->AtFree( nPos ); BOOL bInserted = pDocColl->Insert( pNewData ); - if (!bInserted) // Fehler -> alten Zustand wiederherstellen + if (!bInserted) // Fehler -> alten Zustand wiederherstellen { delete pNewData; - pDoc->SetDBCollection( pUndoColl ); // gehoert dann dem Dokument + pDoc->SetDBCollection( pUndoColl ); // gehoert dann dem Dokument } - pDoc->CompileDBFormula( FALSE ); // CompileFormulaString + pDoc->CompileDBFormula( FALSE ); // CompileFormulaString - if (bInserted) // Einfuegen hat geklappt + if (bInserted) // Einfuegen hat geklappt { if (bUndo) { @@ -210,7 +210,7 @@ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /* bApi */ ) ScRange aOldRange, aNewRange; pData->GetArea(aOldRange); rNewData.GetArea(aNewRange); - BOOL bAreaChanged = ( aOldRange != aNewRange ); // dann muss neu compiliert werden + BOOL bAreaChanged = ( aOldRange != aNewRange ); // dann muss neu compiliert werden ScDBCollection* pUndoColl = NULL; if (bUndo) @@ -238,13 +238,13 @@ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /* bApi */ ) BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ) { - //! auch fuer ScDBFunc::RepeatDB benutzen! + //! auch fuer ScDBFunc::RepeatDB benutzen! BOOL bDone = FALSE; ScDocument* pDoc = rDocShell.GetDocument(); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; - ScDBCollection* pColl = pDoc->GetDBCollection(); + ScDBCollection* pColl = pDoc->GetDBCollection(); USHORT nIndex; if ( pColl && pColl->SearchName( rDBName, nIndex ) ) { @@ -285,7 +285,7 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ) SCROW nEndRow; pDBData->GetArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); - //! Undo nur benoetigte Daten ? + //! Undo nur benoetigte Daten ? ScDocument* pUndoDoc = NULL; ScOutlineTable* pUndoTab = NULL; @@ -318,13 +318,13 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ) else pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE ); - // Datenbereich sichern - incl. Filter-Ergebnis + // Datenbereich sichern - incl. Filter-Ergebnis pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc ); - // alle Formeln wegen Referenzen + // alle Formeln wegen Referenzen pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc ); - // DB- und andere Bereiche + // DB- und andere Bereiche ScRangeName* pDocRange = pDoc->GetRangeName(); if (pDocRange->GetCount()) pUndoRange = new ScRangeName( *pDocRange ); @@ -335,33 +335,33 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ) if (bSort && bSubTotal) { - // Sortieren ohne SubTotals + // Sortieren ohne SubTotals - aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt + aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi ); } if (bSort) { - pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben + pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben Sort( nTab, aSortParam, FALSE, FALSE, bApi ); } if (bQuery) { - pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben + pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben ScRange aAdvSource; if (pDBData->GetAdvancedQuerySource(aAdvSource)) Query( nTab, aQueryParam, &aAdvSource, FALSE, bApi ); else Query( nTab, aQueryParam, NULL, FALSE, bApi ); - // bei nicht-inplace kann die Tabelle umgestellt worden sein -// if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab ) -// SetTabNo( nTab ); + // bei nicht-inplace kann die Tabelle umgestellt worden sein +// if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab ) +// SetTabNo( nTab ); } if (bSubTotal) { - pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben + pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben aSubTotalParam.bRemoveOnly = FALSE; DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi ); } @@ -403,7 +403,7 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ) PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE ); bDone = TRUE; } - else if (!bApi) // "Keine Operationen auszufuehren" + else if (!bApi) // "Keine Operationen auszufuehren" rDocShell.ErrorMessage(STR_MSSG_REPEATDB_0); } @@ -469,18 +469,18 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, aLocalParam.nCol2, aLocalParam.nRow2, nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) ) { - // Merge-Attribute wuerden beim Sortieren durcheinanderkommen + // Merge-Attribute wuerden beim Sortieren durcheinanderkommen if (!bApi) rDocShell.ErrorMessage(STR_SORT_ERR_MERGED); return FALSE; } - // ausfuehren + // ausfuehren WaitObject aWait( rDocShell.GetActiveDialogParent() ); - BOOL bRepeatQuery = FALSE; // bestehenden Filter wiederholen? + BOOL bRepeatQuery = FALSE; // bestehenden Filter wiederholen? ScQueryParam aQueryParam; pDBData->GetQueryParam( aQueryParam ); if ( aQueryParam.GetEntry(0).bDoQuery ) @@ -491,7 +491,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, if ( aQueryParam.bInplace || aQueryParam.nDestCol != rSortParam.nDestCol || aQueryParam.nDestRow != rSortParam.nDestRow || - aQueryParam.nDestTab != rSortParam.nDestTab ) // Query auf selben Zielbereich? + aQueryParam.nDestTab != rSortParam.nDestTab ) // Query auf selben Zielbereich? bRepeatQuery = FALSE; } @@ -527,8 +527,8 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, pR = &aOldDest; } - // Zeilenhoehen immer (wegen automatischer Anpassung) - //! auf ScBlockUndo umstellen + // Zeilenhoehen immer (wegen automatischer Anpassung) + //! auf ScBlockUndo umstellen // if (bRepeatQuery) pDoc->CopyToDocument( 0, aLocalParam.nRow1, nTab, MAXCOL, aLocalParam.nRow2, nTab, IDF_NONE, FALSE, pUndoDoc ); @@ -549,7 +549,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, if ( bCopy ) { if (pDestData) - pDoc->DeleteAreaTab(aOldDest, IDF_CONTENTS); // Zielbereich vorher loeschen + pDoc->DeleteAreaTab(aOldDest, IDF_CONTENTS); // Zielbereich vorher loeschen ScRange aSource( rSortParam.nCol1,rSortParam.nRow1,nSrcTab, rSortParam.nCol2,rSortParam.nRow2,nSrcTab ); @@ -567,33 +567,33 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, { ScSortParam aOldSortParam; pDBData->GetSortParam( aOldSortParam ); - if ( aOldSortParam.bDoSort[0] && aOldSortParam.bInplace ) // Inplace-Sortierung gemerkt? + if ( aOldSortParam.bDoSort[0] && aOldSortParam.bInplace ) // Inplace-Sortierung gemerkt? { bSave = FALSE; aOldSortParam.nDestCol = rSortParam.nDestCol; aOldSortParam.nDestRow = rSortParam.nDestRow; aOldSortParam.nDestTab = rSortParam.nDestTab; - pDBData->SetSortParam( aOldSortParam ); // dann nur DestPos merken + pDBData->SetSortParam( aOldSortParam ); // dann nur DestPos merken } } - if (bSave) // Parameter merken + if (bSave) // Parameter merken { pDBData->SetSortParam( rSortParam ); - pDBData->SetHeader( rSortParam.bHasHeader ); //! ??? - pDBData->SetByRow( rSortParam.bByRow ); //! ??? + pDBData->SetHeader( rSortParam.bHasHeader ); //! ??? + pDBData->SetByRow( rSortParam.bByRow ); //! ??? } - if (bCopy) // neuen DB-Bereich merken + if (bCopy) // neuen DB-Bereich merken { - // Tabelle umschalten von aussen (View) - //! SetCursor ??!?! + // Tabelle umschalten von aussen (View) + //! SetCursor ??!?! ScRange aDestPos( aLocalParam.nCol1, aLocalParam.nRow1, nTab, aLocalParam.nCol2, aLocalParam.nRow2, nTab ); ScDBData* pNewData; if (pDestData) - pNewData = pDestData; // Bereich vorhanden -> anpassen - else // Bereich ab Cursor/Markierung wird angelegt + pNewData = pDestData; // Bereich vorhanden -> anpassen + else // Bereich ab Cursor/Markierung wird angelegt pNewData = rDocShell.GetDBData(aDestPos, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); if (pNewData) { @@ -601,7 +601,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, aLocalParam.nCol1,aLocalParam.nRow1, aLocalParam.nCol2,aLocalParam.nRow2 ); pNewData->SetSortParam( aLocalParam ); - pNewData->SetHeader( aLocalParam.bHasHeader ); //! ??? + pNewData->SetHeader( aLocalParam.bHasHeader ); //! ??? pNewData->SetByRow( aLocalParam.bByRow ); } else @@ -667,8 +667,8 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, return FALSE; } - // Wechsel von Inplace auf nicht-Inplace, dann erst Inplace aufheben: - // (nur, wenn im Dialog "Persistent" ausgewaehlt ist) + // Wechsel von Inplace auf nicht-Inplace, dann erst Inplace aufheben: + // (nur, wenn im Dialog "Persistent" ausgewaehlt ist) if ( !rQueryParam.bInplace && pDBData->HasQueryParam() && rQueryParam.bDestPers ) { @@ -676,7 +676,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, pDBData->GetQueryParam(aOldQuery); if (aOldQuery.bInplace) { - // alte Filterung aufheben + // alte Filterung aufheben SCSIZE nEC = aOldQuery.GetEntryCount(); for (SCSIZE i=0; i<nEC; i++) @@ -686,11 +686,11 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, } } - ScQueryParam aLocalParam( rQueryParam ); // fuer Paint / Zielbereich - BOOL bCopy = !rQueryParam.bInplace; // kopiert wird in Table::Query - ScDBData* pDestData = NULL; // Bereich, in den kopiert wird - BOOL bDoSize = FALSE; // Zielgroesse anpassen (einf./loeschen) - SCCOL nFormulaCols = 0; // nur bei bDoSize + ScQueryParam aLocalParam( rQueryParam ); // fuer Paint / Zielbereich + BOOL bCopy = !rQueryParam.bInplace; // kopiert wird in Table::Query + ScDBData* pDestData = NULL; // Bereich, in den kopiert wird + BOOL bDoSize = FALSE; // Zielgroesse anpassen (einf./loeschen) + SCCOL nFormulaCols = 0; // nur bei bDoSize BOOL bKeepFmt = FALSE; ScRange aOldDest; ScRange aDestTotal; @@ -731,10 +731,10 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, nDestTab ); bDoSize = pDestData->IsDoSize(); - // Test, ob Formeln aufgefuellt werden muessen (nFormulaCols): + // Test, ob Formeln aufgefuellt werden muessen (nFormulaCols): if ( bDoSize && aOldDest.aEnd.Col() == aDestTotal.aEnd.Col() ) { - SCCOL nTestCol = aOldDest.aEnd.Col() + 1; // neben dem Bereich + SCCOL nTestCol = aOldDest.aEnd.Col() + 1; // neben dem Bereich SCROW nTestRow = rQueryParam.nDestRow + ( aLocalParam.bHasHeader ? 1 : 0 ); while ( nTestCol <= MAXCOL && @@ -746,21 +746,21 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, if ( bDoSize && !pDoc->CanFitBlock( aOldDest, aDestTotal ) ) { if (!bApi) - rDocShell.ErrorMessage(STR_MSSG_DOSUBTOTALS_2); // kann keine Zeilen einfuegen + rDocShell.ErrorMessage(STR_MSSG_DOSUBTOTALS_2); // kann keine Zeilen einfuegen return FALSE; } } } - // ausfuehren + // ausfuehren WaitObject aWait( rDocShell.GetActiveDialogParent() ); - BOOL bKeepSub = FALSE; // bestehende Teilergebnisse wiederholen? + BOOL bKeepSub = FALSE; // bestehende Teilergebnisse wiederholen? ScSubTotalParam aSubTotalParam; - if (rQueryParam.GetEntry(0).bDoQuery) // nicht beim Aufheben + if (rQueryParam.GetEntry(0).bDoQuery) // nicht beim Aufheben { - pDBData->GetSubTotalParam( aSubTotalParam ); // Teilergebnisse vorhanden? + pDBData->GetSubTotalParam( aSubTotalParam ); // Teilergebnisse vorhanden? if ( aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly ) bKeepSub = TRUE; @@ -779,7 +779,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, pDoc->CopyToDocument( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab, aLocalParam.nCol2, aLocalParam.nRow2, nDestTab, IDF_ALL, FALSE, pUndoDoc ); - // Attribute sichern, falls beim Filtern mitkopiert + // Attribute sichern, falls beim Filtern mitkopiert if (pDestData) { @@ -803,18 +803,18 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, ScDocument* pAttribDoc = NULL; ScRange aAttribRange; - if (pDestData) // Zielbereich loeschen + if (pDestData) // Zielbereich loeschen { if ( bKeepFmt ) { - // kleinere der End-Spalten, Header+1 Zeile + // kleinere der End-Spalten, Header+1 Zeile aAttribRange = aOldDest; if ( aAttribRange.aEnd.Col() > aDestTotal.aEnd.Col() ) aAttribRange.aEnd.SetCol( aDestTotal.aEnd.Col() ); aAttribRange.aEnd.SetRow( aAttribRange.aStart.Row() + ( aLocalParam.bHasHeader ? 1 : 0 ) ); - // auch fuer aufgefuellte Formeln + // auch fuer aufgefuellte Formeln aAttribRange.aEnd.SetCol( aAttribRange.aEnd.Col() + nFormulaCols ); pAttribDoc = new ScDocument( SCDOCMODE_UNDO ); @@ -825,10 +825,10 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, if ( bDoSize ) pDoc->FitBlock( aOldDest, aDestTotal ); else - pDoc->DeleteAreaTab(aOldDest, IDF_ALL); // einfach loeschen + pDoc->DeleteAreaTab(aOldDest, IDF_ALL); // einfach loeschen } - // Filtern am Dokument ausfuehren + // Filtern am Dokument ausfuehren SCSIZE nCount = pDoc->Query( nTab, rQueryParam, bKeepSub ); if (bCopy) { @@ -838,17 +838,17 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, if ( bDoSize ) { - // auf wirklichen Ergebnis-Bereich anpassen - // (das hier ist immer eine Verkleinerung) + // auf wirklichen Ergebnis-Bereich anpassen + // (das hier ist immer eine Verkleinerung) ScRange aNewDest( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab, aLocalParam.nCol2, aLocalParam.nRow2, nDestTab ); - pDoc->FitBlock( aDestTotal, aNewDest, FALSE ); // FALSE - nicht loeschen + pDoc->FitBlock( aDestTotal, aNewDest, FALSE ); // FALSE - nicht loeschen if ( nFormulaCols > 0 ) { - // Formeln ausfuellen - //! Undo (Query und Repeat) !!! + // Formeln ausfuellen + //! Undo (Query und Repeat) !!! ScRange aNewForm( aLocalParam.nCol2+1, aLocalParam.nRow1, nDestTab, aLocalParam.nCol2+nFormulaCols, aLocalParam.nRow2, nDestTab ); @@ -866,9 +866,9 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, } } - if ( pAttribDoc ) // gemerkte Attribute zurueckkopieren + if ( pAttribDoc ) // gemerkte Attribute zurueckkopieren { - // Header + // Header if (aLocalParam.bHasHeader) { ScRange aHdrRange = aAttribRange; @@ -876,7 +876,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, pAttribDoc->CopyToDocument( aHdrRange, IDF_ATTRIB, FALSE, pDoc ); } - // Daten + // Daten SCCOL nAttrEndCol = aAttribRange.aEnd.Col(); SCROW nAttrRow = aAttribRange.aStart.Row() + ( aLocalParam.bHasHeader ? 1 : 0 ); for (SCCOL nCol = aAttribRange.aStart.Col(); nCol<=nAttrEndCol; nCol++) @@ -897,27 +897,27 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, } } - // speichern: Inplace immer, sonst je nach Einstellung - // alter Inplace-Filter ist ggf. schon aufgehoben + // speichern: Inplace immer, sonst je nach Einstellung + // alter Inplace-Filter ist ggf. schon aufgehoben BOOL bSave = rQueryParam.bInplace || rQueryParam.bDestPers; - if (bSave) // merken + if (bSave) // merken { pDBData->SetQueryParam( rQueryParam ); - pDBData->SetHeader( rQueryParam.bHasHeader ); //! ??? - pDBData->SetAdvancedQuerySource( pAdvSource ); // after SetQueryParam + pDBData->SetHeader( rQueryParam.bHasHeader ); //! ??? + pDBData->SetAdvancedQuerySource( pAdvSource ); // after SetQueryParam } - if (bCopy) // neuen DB-Bereich merken + if (bCopy) // neuen DB-Bereich merken { - // selektieren wird hinterher von aussen (dbfunc) - // momentan ueber DB-Bereich an der Zielposition, darum muss dort - // auf jeden Fall ein Bereich angelegt werden. + // selektieren wird hinterher von aussen (dbfunc) + // momentan ueber DB-Bereich an der Zielposition, darum muss dort + // auf jeden Fall ein Bereich angelegt werden. ScDBData* pNewData; if (pDestData) - pNewData = pDestData; // Bereich vorhanden -> anpassen (immer!) - else // Bereich anlegen + pNewData = pDestData; // Bereich vorhanden -> anpassen (immer!) + else // Bereich anlegen pNewData = rDocShell.GetDBData( ScRange( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab, aLocalParam.nCol2, aLocalParam.nRow2, nDestTab ), @@ -928,8 +928,8 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, pNewData->SetArea( nDestTab, aLocalParam.nCol1, aLocalParam.nRow1, aLocalParam.nCol2, aLocalParam.nRow2 ); - // Query-Param wird am Ziel nicht mehr eingestellt, fuehrt nur zu Verwirrung - // und Verwechslung mit dem Query-Param am Quellbereich (#37187#) + // Query-Param wird am Ziel nicht mehr eingestellt, fuehrt nur zu Verwirrung + // und Verwechslung mit dem Query-Param am Quellbereich (#37187#) } else { @@ -939,7 +939,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, if (!bCopy) { - pDoc->InvalidatePageBreaks(nTab); + pDoc->InvalidatePageBreaks(nTab); pDoc->UpdatePageBreaks( nTab ); } @@ -985,12 +985,12 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, const ScSortParam* pForceNewSort, BOOL bRecord, BOOL bApi ) { - //! auch fuer ScDBFunc::DoSubTotals benutzen! - // dann bleibt aussen: - // - neuen Bereich (aus DBData) markieren - // - SelectionChanged (?) + //! auch fuer ScDBFunc::DoSubTotals benutzen! + // dann bleibt aussen: + // - neuen Bereich (aus DBData) markieren + // - SelectionChanged (?) - BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen + BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen BOOL bRet = FALSE; ScDocument* pDoc = rDocShell.GetDocument(); @@ -1016,7 +1016,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, rParam.nCol2, rParam.nRow2, nTab, HASATTR_MERGED | HASATTR_OVERLAPPED )) { if (!bApi) - rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen + rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen return FALSE; } @@ -1038,14 +1038,14 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, WaitObject aWait( rDocShell.GetActiveDialogParent() ); ScDocShellModificator aModificator( rDocShell ); - ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert - ScDocument* pUndoDoc = NULL; - ScOutlineTable* pUndoTab = NULL; - ScRangeName* pUndoRange = NULL; + ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert + ScDocument* pUndoDoc = NULL; + ScOutlineTable* pUndoTab = NULL; + ScRangeName* pUndoRange = NULL; ScDBCollection* pUndoDB = NULL; - SCTAB nTabCount = 0; // fuer Referenz-Undo + SCTAB nTabCount = 0; // fuer Referenz-Undo - if (bRecord) // alte Daten sichern + if (bRecord) // alte Daten sichern { BOOL bOldFilter = bDo && rParam.bDoSort; @@ -1069,15 +1069,15 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, else pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter ); - // Datenbereich sichern - incl. Filter-Ergebnis + // Datenbereich sichern - incl. Filter-Ergebnis pDoc->CopyToDocument( 0,rParam.nRow1+1,nTab, MAXCOL,rParam.nRow2,nTab, IDF_ALL, FALSE, pUndoDoc ); - // alle Formeln wegen Referenzen + // alle Formeln wegen Referenzen pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc ); - // DB- und andere Bereiche + // DB- und andere Bereiche ScRangeName* pDocRange = pDoc->GetRangeName(); if (pDocRange->GetCount()) pUndoRange = new ScRangeName( *pDocRange ); @@ -1086,10 +1086,10 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, pUndoDB = new ScDBCollection( *pDocDB ); } -// pDoc->SetOutlineTable( nTab, NULL ); - ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab ); +// pDoc->SetOutlineTable( nTab, NULL ); + ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab ); if (pOut) - pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen + pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen if (rParam.bReplace) pDoc->RemoveSubTotals( nTab, aNewParam ); @@ -1101,8 +1101,8 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, { pDBData->SetArea( nTab, aNewParam.nCol1,aNewParam.nRow1, aNewParam.nCol2,aNewParam.nRow2 ); - // Teilergebnis-Felder vor die Sortierung setzen - // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden) + // Teilergebnis-Felder vor die Sortierung setzen + // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden) ScSortParam aOldSort; pDBData->GetSortParam( aOldSort ); @@ -1118,7 +1118,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, if (bRecord) { -// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL; +// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL; rDocShell.GetUndoManager()->AddUndoAction( new ScUndoSubTotals( &rDocShell, nTab, rParam, aNewParam.nRow2, @@ -1158,12 +1158,12 @@ BOOL lcl_EmptyExcept( ScDocument* pDoc, const ScRange& rRange, const ScRange& rE if ( !pCell->IsBlank() ) // real content? { if ( !rExcept.In( ScAddress( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() ) ) ) - return FALSE; // cell found + return FALSE; // cell found } pCell = aIter.GetNext(); } - return TRUE; // nothing found - empty + return TRUE; // nothing found - empty } BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj, @@ -1180,15 +1180,15 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb ScDocument* pNewUndoDoc = NULL; ScDPObject* pUndoDPObj = NULL; if ( bRecord && pOldObj ) - pUndoDPObj = new ScDPObject( *pOldObj ); // copy old settings for undo + pUndoDPObj = new ScDPObject( *pOldObj ); // copy old settings for undo ScDocument* pDoc = rDocShell.GetDocument(); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; if ( !rDocShell.IsEditable() || pDoc->GetChangeTrack() ) { - // not recorded -> disallow - //! different error messages? + // not recorded -> disallow + //! different error messages? nErrId = STR_PROTECTIONERR; } @@ -1201,9 +1201,9 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb } if ( pNewObj && !nErrId ) { - // at least one cell at the output position must be editable - // -> check in advance - // (start of output range in pNewObj is valid) + // at least one cell at the output position must be editable + // -> check in advance + // (start of output range in pNewObj is valid) ScRange aNewStart( pNewObj->GetOutRange().aStart ); ScEditableTester aTester( pDoc, aNewStart ); @@ -1216,7 +1216,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb { if ( pOldObj && !pNewObj ) { - // delete table + // delete table ScRange aRange = pOldObj->GetOutRange(); SCTAB nTab = aRange.aStart.Tab(); @@ -1237,7 +1237,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb pDoc->GetDPCollection()->FreeTable( pOldObj ); // object is deleted here - rDocShell.PostPaintGridAll(); //! only necessary parts + rDocShell.PostPaintGridAll(); //! only necessary parts rDocShell.PostPaint( aRange.aStart.Col(), aRange.aStart.Row(), nTab, aRange.aEnd.Col(), aRange.aEnd.Row(), nTab, PAINT_GRID ); @@ -1258,16 +1258,16 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb if ( pNewObj == pOldObj ) { - // refresh only - no settings modified + // refresh only - no settings modified } else { - pNewObj->WriteSourceDataTo( *pOldObj ); // copy source data + pNewObj->WriteSourceDataTo( *pOldObj ); // copy source data ScDPSaveData* pData = pNewObj->GetSaveData(); DBG_ASSERT( pData, "no SaveData from living DPObject" ); if ( pData ) - pOldObj->SetSaveData( *pData ); // copy SaveData + pOldObj->SetSaveData( *pData ); // copy SaveData } pDestObj = pOldObj; @@ -1275,7 +1275,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb } else { - // output range must be set at pNewObj + // output range must be set at pNewObj pDestObj = new ScDPObject( *pNewObj ); @@ -1300,18 +1300,18 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb if ( pNewObj == pOldObj && pDestObj->IsImportData() ) pDestObj->InvalidateSource(); - pDestObj->InvalidateData(); // before getting the new output area + pDestObj->InvalidateData(); // before getting the new output area - // make sure the table has a name (not set by dialog) + // make sure the table has a name (not set by dialog) if ( !pDestObj->GetName().Len() ) pDestObj->SetName( pDoc->GetDPCollection()->CreateNewName() ); BOOL bOverflow = FALSE; ScRange aNewOut = pDestObj->GetNewOutputRange( bOverflow ); - //! test for overlap with other data pilot tables + //! test for overlap with other data pilot tables if( pOldObj ) - { + { const ScSheetSourceDesc* pSheetDesc = pOldObj->GetSheetDesc(); if( pSheetDesc && pSheetDesc->aSourceRange.Intersects( aNewOut ) ) { @@ -1326,7 +1326,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb if ( bOverflow ) { - // like with STR_PROTECTIONERR, use undo to reverse everything + // like with STR_PROTECTIONERR, use undo to reverse everything DBG_ASSERT( bRecord, "DataPilotUpdate: can't undo" ); bUndoSelf = TRUE; nErrId = STR_PIVOT_ERROR; @@ -1336,22 +1336,22 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb ScEditableTester aTester( pDoc, aNewOut ); if ( !aTester.IsEditable() ) { - // destination area isn't editable - //! reverse everything done so far, don't proceed + // destination area isn't editable + //! reverse everything done so far, don't proceed - // quick solution: proceed to end, use undo action - // to reverse everything: + // quick solution: proceed to end, use undo action + // to reverse everything: DBG_ASSERT( bRecord, "DataPilotUpdate: can't undo" ); bUndoSelf = TRUE; nErrId = aTester.GetMessageId(); } } - // test if new output area is empty except for old area + // test if new output area is empty except for old area if ( !bApi ) { BOOL bEmpty; - if ( pOldObj ) // OutRange of pOldObj (pDestObj) is still old area + if ( pOldObj ) // OutRange of pOldObj (pDestObj) is still old area bEmpty = lcl_EmptyExcept( pDoc, aNewOut, pOldObj->GetOutRange() ); else bEmpty = pDoc->IsBlockEmpty( aNewOut.aStart.Tab(), @@ -1364,7 +1364,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb ScGlobal::GetRscString(STR_PIVOT_NOTEMPTY) ); if (aBox.Execute() == RET_NO) { - //! like above (not editable), use undo to reverse everything + //! like above (not editable), use undo to reverse everything DBG_ASSERT( bRecord, "DataPilotUpdate: can't undo" ); bUndoSelf = TRUE; } @@ -1381,7 +1381,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb pDestObj->Output( aNewOut.aStart ); - rDocShell.PostPaintGridAll(); //! only necessary parts + rDocShell.PostPaintGridAll(); //! only necessary parts bDone = TRUE; } } @@ -1393,13 +1393,13 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb SfxUndoAction* pAction = new ScUndoDataPilot( &rDocShell, pOldUndoDoc, pNewUndoDoc, pUndoDPObj, pDestObj, bAllowMove ); pOldUndoDoc = NULL; - pNewUndoDoc = NULL; // pointers are used in undo action + pNewUndoDoc = NULL; // pointers are used in undo action // pUndoDPObj is copied if (bUndoSelf) { - // use undo action to restore original state - //! prevent setting the document modified? (ScDocShellModificator) + // use undo action to restore original state + //! prevent setting the document modified? (ScDocShellModificator) pAction->Undo(); delete pAction; @@ -1409,7 +1409,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb rDocShell.GetUndoManager()->AddUndoAction( pAction ); } - delete pOldUndoDoc; // if not used for undo + delete pOldUndoDoc; // if not used for undo delete pNewUndoDoc; delete pUndoDPObj; @@ -1429,7 +1429,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb //================================================================== // -// Datenbank-Import... +// Datenbank-Import... void ScDBDocFunc::UpdateImport( const String& rTarget, const String& rDBName, const String& rTableName, const String& rStatement, BOOL bNative, @@ -1437,7 +1437,7 @@ void ScDBDocFunc::UpdateImport( const String& rTarget, const String& rDBName, ::com::sun::star::sdbc::XResultSet >& xResultSet, const SbaSelectionList* pSelection ) { - // Target ist jetzt einfach der Bereichsname + // Target ist jetzt einfach der Bereichsname ScDocument* pDoc = rDocShell.GetDocument(); ScDBCollection& rDBColl = *pDoc->GetDBCollection(); @@ -1467,31 +1467,31 @@ void ScDBDocFunc::UpdateImport( const String& rTarget, const String& rDBName, BOOL bSql = ( rStatement.Len() != 0 ); - aImportParam.aDBName = rDBName; - aImportParam.bSql = bSql; + aImportParam.aDBName = rDBName; + aImportParam.bSql = bSql; aImportParam.aStatement = bSql ? rStatement : rTableName; - aImportParam.bNative = bNative; - aImportParam.nType = nType; - aImportParam.bImport = TRUE; + aImportParam.bNative = bNative; + aImportParam.nType = nType; + aImportParam.bImport = TRUE; BOOL bContinue = DoImport( nTab, aImportParam, xResultSet, pSelection, TRUE ); - // DB-Operationen wiederholen + // DB-Operationen wiederholen ScTabViewShell* pViewSh = rDocShell.GetBestViewShell(); if (pViewSh) { ScRange aRange; pData->GetArea(aRange); - pViewSh->MarkRange(aRange); // selektieren + pViewSh->MarkRange(aRange); // selektieren - if ( bContinue ) // #41905# Fehler beim Import -> Abbruch + if ( bContinue ) // #41905# Fehler beim Import -> Abbruch { - // interne Operationen, wenn welche gespeichert + // interne Operationen, wenn welche gespeichert if ( pData->HasQueryParam() || pData->HasSortParam() || pData->HasSubTotalParam() ) pViewSh->RepeatDB(); - // Pivottabellen die den Bereich als Quelldaten haben + // Pivottabellen die den Bereich als Quelldaten haben rDocShell.RefreshPivotTables(aRange); } diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 8400f1ad8b6f..b992d595d0ea 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.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,20 +70,20 @@ using namespace com::sun::star; -#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" -#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" +#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" +#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" -//! move to a header file? -#define SC_DBPROP_DATASOURCENAME "DataSourceName" -#define SC_DBPROP_COMMAND "Command" -#define SC_DBPROP_COMMANDTYPE "CommandType" -#define SC_DBPROP_SELECTION "Selection" -#define SC_DBPROP_CURSOR "Cursor" +//! move to a header file? +#define SC_DBPROP_DATASOURCENAME "DataSourceName" +#define SC_DBPROP_COMMAND "Command" +#define SC_DBPROP_COMMANDTYPE "CommandType" +#define SC_DBPROP_SELECTION "Selection" +#define SC_DBPROP_CURSOR "Cursor" // static void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ) { - // called after opening the database beamer + // called after opening the database beamer if ( !pFrame || !rParam.bImport ) return; @@ -181,21 +181,21 @@ BOOL ScDBDocFunc::DoImportUno( const ScAddress& rPos, aList.Insert( (void*)nEntry, LIST_APPEND ); } - BOOL bAddrInsert = FALSE; //!??? + BOOL bAddrInsert = FALSE; //!??? if ( bAddrInsert ) { bDone = DoImport( rPos.Tab(), aImParam, xResSet, &aList, TRUE, bAddrInsert ); } else { - // create database range - //! merge this with SID_SBA_IMPORT execute in docsh4.cxx + // create database range + //! merge this with SID_SBA_IMPORT execute in docsh4.cxx ScDBData* pDBData = rDocShell.GetDBData( ScRange(rPos), SC_DB_IMPORT, SC_DBSEL_KEEP ); DBG_ASSERT(pDBData, "can't create DB data"); String sTarget = pDBData->GetName(); - //! change UpdateImport to use only one of rTableName, rStatement + //! change UpdateImport to use only one of rTableName, rStatement String aTableName, aStatement; if ( aImParam.bSql ) @@ -242,24 +242,24 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, ScDocShellModificator aModificator( rDocShell ); BOOL bSuccess = FALSE; - BOOL bApi = FALSE; //! pass as argument - BOOL bTruncated = FALSE; // for warning + BOOL bApi = FALSE; //! pass as argument + BOOL bTruncated = FALSE; // for warning USHORT nErrStringId = 0; String aErrorMessage; SCCOL nCol = rParam.nCol1; SCROW nRow = rParam.nRow1; - SCCOL nEndCol = nCol; // end of resulting database area + SCCOL nEndCol = nCol; // end of resulting database area SCROW nEndRow = nRow; long i; BOOL bDoSelection = FALSE; - BOOL bRealSelection = FALSE; // TRUE if not everything is selected + BOOL bRealSelection = FALSE; // TRUE if not everything is selected ULONG nListPos = 0; ULONG nRowsRead = 0; ULONG nListCount = 0; - // -1 is special + // -1 is special if ( pSelection && pSelection->Count() && (long)pSelection->GetObject(0) != -1L ) { bDoSelection = TRUE; @@ -272,13 +272,13 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, ScColumn::DoubleAllocSwitch aAllocSwitch(true); // - // get data from database into import document + // get data from database into import document // try { - // progress bar - // only text (title is still needed, for the cancel button) + // progress bar + // only text (title is still needed, for the cancel button) ScProgress aProgress( &rDocShell, ScGlobal::GetRscString(STR_UNDO_IMPORTDATA), 0 ); USHORT nInserted = 0; @@ -297,7 +297,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if ( xRowProp.is() ) { // - // set source parameters + // set source parameters // sal_Int32 nType = rParam.bSql ? sdb::CommandType::COMMAND : @@ -333,7 +333,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if ( xRowSet.is() ) { // - // get column descriptions + // get column descriptions // long nColCount = 0; @@ -342,12 +342,12 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if ( xMetaSupp.is() ) xMeta = xMetaSupp->getMetaData(); if ( xMeta.is() ) - nColCount = xMeta->getColumnCount(); // this is the number of real columns + nColCount = xMeta->getColumnCount(); // this is the number of real columns if ( rParam.nCol1 + nColCount - 1 > MAXCOL ) { nColCount = 0; - //! error message + //! error message } uno::Reference<sdbc::XRow> xRow( xRowSet, uno::UNO_QUERY ); @@ -355,8 +355,8 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, { nEndCol = (SCCOL)( rParam.nCol1 + nColCount - 1 ); - uno::Sequence<sal_Int32> aColTypes( nColCount ); // column types - uno::Sequence<sal_Bool> aColCurr( nColCount ); // currency flag is not in types + uno::Sequence<sal_Int32> aColTypes( nColCount ); // column types + uno::Sequence<sal_Bool> aColCurr( nColCount ); // currency flag is not in types sal_Int32* pTypeArr = aColTypes.getArray(); sal_Bool* pCurrArr = aColCurr.getArray(); for (i=0; i<nColCount; i++) @@ -365,7 +365,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, pCurrArr[i] = xMeta->isCurrency( i+1 ); } - if ( !bAddrInsert ) // read column names + if ( !bAddrInsert ) // read column names { nCol = rParam.nCol1; for (i=0; i<nColCount; i++) @@ -382,7 +382,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, xRowSet->beforeFirst(); while ( !bEnd ) { - // skip rows that are not selected + // skip rows that are not selected if ( !bDoSelection ) { if ( (bEnd = !xRowSet->next()) == FALSE ) @@ -419,7 +419,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nEndRow = nRow; ++nRow; - // progress bar + // progress bar ++nInserted; if (!(nInserted & 15)) @@ -429,7 +429,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, aText += String::CreateFromInt32( nInserted ); aText += aPict.GetToken(1,'#'); - if (!aProgress.SetStateText( 0, aText )) // stopped by user? + if (!aProgress.SetStateText( 0, aText )) // stopped by user? { bEnd = TRUE; bSuccess = FALSE; @@ -437,10 +437,10 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } } - else // past the end of the spreadsheet + else // past the end of the spreadsheet { - bEnd = TRUE; // don't continue - bTruncated = TRUE; // warning flag + bEnd = TRUE; // don't continue + bTruncated = TRUE; // warning flag } } } @@ -464,19 +464,19 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, pImportDoc->DoColResize( nTab, rParam.nCol1,nEndCol, 0 ); // - // test for cell protection + // test for cell protection // BOOL bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt(); BOOL bMoveCells = !bAddrInsert && pDBData->IsDoSize(); - SCCOL nFormulaCols = 0; // columns to be filled with formulas + SCCOL nFormulaCols = 0; // columns to be filled with formulas if (bMoveCells && nEndCol == rParam.nCol2) { - // if column count changes, formulas would become invalid anyway - // -> only set nFormulaCols for unchanged column count + // if column count changes, formulas would become invalid anyway + // -> only set nFormulaCols for unchanged column count - SCCOL nTestCol = rParam.nCol2 + 1; // right of the data - SCROW nTestRow = rParam.nRow1 + 1; // below the title row + SCCOL nTestCol = rParam.nCol2 + 1; // right of the data + SCROW nTestRow = rParam.nRow1 + 1; // below the title row while ( nTestCol <= MAXCOL && pDoc->GetCellType(ScAddress( nTestCol, nTestRow, nTab )) == CELLTYPE_FORMULA ) ++nTestCol, ++nFormulaCols; @@ -484,7 +484,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if (bSuccess) { - // old and new range editable? + // old and new range editable? ScEditableTester aTester; aTester.TestBlock( pDoc, nTab, rParam.nCol1,rParam.nRow1,rParam.nCol2,rParam.nRow2 ); aTester.TestBlock( pDoc, nTab, rParam.nCol1,rParam.nRow1,nEndCol,nEndRow ); @@ -506,23 +506,23 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nEndCol+nFormulaCols, nEndRow, nTab ); if (!pDoc->CanFitBlock( aOld, aNew )) { - nErrStringId = STR_MSSG_DOSUBTOTALS_2; // can't insert cells + nErrStringId = STR_MSSG_DOSUBTOTALS_2; // can't insert cells bSuccess = FALSE; } } // - // copy data from import doc into real document + // copy data from import doc into real document // if ( bSuccess ) { if (bKeepFormat) { - // keep formatting of title and first data row from the document - // CopyToDocument also copies styles, Apply... needs separate calls + // keep formatting of title and first data row from the document + // CopyToDocument also copies styles, Apply... needs separate calls - SCCOL nMinEndCol = Min( rParam.nCol2, nEndCol ); // not too much + SCCOL nMinEndCol = Min( rParam.nCol2, nEndCol ); // not too much nMinEndCol = sal::static_int_cast<SCCOL>( nMinEndCol + nFormulaCols ); // only if column count unchanged pImportDoc->DeleteAreaTab( 0,0, MAXCOL,MAXROW, nTab, IDF_ATTRIB ); pDoc->CopyToDocument( rParam.nCol1, rParam.nRow1, nTab, @@ -543,7 +543,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - // don't set cell protection attribute if table is protected + // don't set cell protection attribute if table is protected if (pDoc->IsTabProtected(nTab)) { ScPatternAttr aPattern(pImportDoc->GetPool()); @@ -552,10 +552,10 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } // - // copy old data for undo + // copy old data for undo // - SCCOL nUndoEndCol = Max( nEndCol, rParam.nCol2 ); // rParam = old end + SCCOL nUndoEndCol = Max( nEndCol, rParam.nCol2 ); // rParam = old end SCROW nUndoEndRow = Max( nEndRow, rParam.nRow2 ); ScDocument* pUndoDoc = NULL; @@ -577,7 +577,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, // do not touch notes (ScUndoImportData does not support drawing undo) sal_uInt16 nCopyFlags = IDF_ALL & ~IDF_NOTE; - // nFormulaCols is set only if column count is unchanged + // nFormulaCols is set only if column count is unchanged pDoc->CopyToDocument( rParam.nCol1, rParam.nRow1, nTab, nEndCol+nFormulaCols, nEndRow, nTab, nCopyFlags, FALSE, pUndoDoc ); @@ -592,13 +592,13 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } // - // move new data + // move new data // if (bMoveCells) { - // clear only the range without the formulas, - // so the formula title and first row are preserved + // clear only the range without the formulas, + // so the formula title and first row are preserved ScRange aDelRange( rParam.nCol1, rParam.nRow1, nTab, rParam.nCol2, rParam.nRow2, nTab ); @@ -608,18 +608,18 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, rParam.nCol2+nFormulaCols, rParam.nRow2, nTab ); ScRange aNew( rParam.nCol1, rParam.nRow1, nTab, nEndCol+nFormulaCols, nEndRow, nTab ); - pDoc->FitBlock( aOld, aNew, FALSE ); // Formeln nicht loeschen + pDoc->FitBlock( aOld, aNew, FALSE ); // Formeln nicht loeschen } - else if ( nEndCol < rParam.nCol2 ) // DeleteArea calls PutInOrder + else if ( nEndCol < rParam.nCol2 ) // DeleteArea calls PutInOrder pDoc->DeleteArea( nEndCol+1, rParam.nRow1, rParam.nCol2, rParam.nRow2, aNewMark, IDF_CONTENTS & ~IDF_NOTE ); - // CopyToDocument doesn't remove contents + // CopyToDocument doesn't remove contents pDoc->DeleteAreaTab( rParam.nCol1, rParam.nRow1, nEndCol, nEndRow, nTab, IDF_CONTENTS & ~IDF_NOTE ); - // #41216# remove each column from ImportDoc after copying to reduce memory usage + // #41216# remove each column from ImportDoc after copying to reduce memory usage BOOL bOldAutoCalc = pDoc->GetAutoCalc(); - pDoc->SetAutoCalc( FALSE ); // outside of the loop + pDoc->SetAutoCalc( FALSE ); // outside of the loop for (SCCOL nCopyCol = rParam.nCol1; nCopyCol <= nEndCol; nCopyCol++) { pImportDoc->CopyToDocument( nCopyCol, rParam.nRow1, nTab, nCopyCol, nEndRow, nTab, @@ -629,9 +629,9 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } pDoc->SetAutoCalc( bOldAutoCalc ); - if (nFormulaCols > 0) // copy formulas + if (nFormulaCols > 0) // copy formulas { - if (bKeepFormat) // formats for formulas + if (bKeepFormat) // formats for formulas pImportDoc->CopyToDocument( nEndCol+1, rParam.nRow1, nTab, nEndCol+nFormulaCols, nEndRow, nTab, IDF_ATTRIB, FALSE, pDoc ); @@ -642,9 +642,9 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, aMark, nEndRow-rParam.nRow1-1, FILL_TO_BOTTOM, FILL_SIMPLE ); } - // if new range is smaller, clear old contents + // if new range is smaller, clear old contents - if (!bMoveCells) // move has happened above + if (!bMoveCells) // move has happened above { if ( rParam.nCol2 > nEndCol ) pDoc->DeleteArea( nEndCol+1, rParam.nRow1, rParam.nCol2, rParam.nRow2, @@ -654,7 +654,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, aNewMark, IDF_CONTENTS ); } - if( !bAddrInsert ) // update database range + if( !bAddrInsert ) // update database range { pDBData->SetImportParam( rParam ); pDBData->SetHeader( TRUE ); @@ -669,7 +669,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, ScDocument* pRedoDoc = pImportDoc; pImportDoc = NULL; - if (nFormulaCols > 0) // include filled formulas for redo + if (nFormulaCols > 0) // include filled formulas for redo pDoc->CopyToDocument( rParam.nCol1, rParam.nRow1, nTab, nEndCol+nFormulaCols, nEndRow, nTab, IDF_ALL & ~IDF_NOTE, FALSE, pRedoDoc ); @@ -693,7 +693,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if (pWaitWin) pWaitWin->LeaveWait(); - if ( bTruncated && !bApi ) // show warning + if ( bTruncated && !bApi ) // show warning ErrorHandler::HandleError(SCWARN_IMPORT_RANGE_OVERFLOW); } else if ( !bApi ) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 5a6d55e8f60f..abe1c586d3bb 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.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 @@ -137,14 +137,14 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) //------------------------------------------------------------------------ -// Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight) +// Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight) void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange ) { SCROW nRow = rRange.aStart.Row(); if ( nRow > 0 ) { - SCTAB nTab = rRange.aStart.Tab(); //! alle? + SCTAB nTab = rRange.aStart.Tab(); //! alle? --nRow; rDocShell.PostPaint( ScRange(0,nRow,nTab, MAXCOL,nRow,nTab), PAINT_GRID ); } @@ -157,7 +157,7 @@ BOOL ScDocFunc::AdjustRowHeight( const ScRange& rRange, BOOL bPaint ) ScDocument* pDoc = rDocShell.GetDocument(); if ( pDoc->IsImportingXML() ) { - // for XML import, all row heights are updated together after importing + // for XML import, all row heights are updated together after importing return FALSE; } if ( !pDoc->IsAdjustHeightEnabled() ) @@ -481,13 +481,13 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic ) if (bUndo) pModel->BeginCalcUndo(); - // Loeschen auf allen Tabellen + // Loeschen auf allen Tabellen SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) - ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_ARROWS ); // don't remove circles + ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_ARROWS ); // don't remove circles - // Wiederholen + // Wiederholen USHORT nCount = pList->Count(); for (USHORT i=0; i<nCount; i++) @@ -528,7 +528,7 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic ) if (pUndo) { pUndo->SetComment( ScGlobal::GetRscString( STR_UNDO_DETREFRESH ) ); - // wenn automatisch, an letzte Aktion anhaengen + // wenn automatisch, an letzte Aktion anhaengen rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDraw( pUndo, &rDocShell ), bAutomatic ); @@ -608,7 +608,7 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags, BOOL bSimple = FALSE; ScMarkData aMultiMark = rMark; - aMultiMark.SetMarking(FALSE); // fuer MarkToMulti + aMultiMark.SetMarking(FALSE); // fuer MarkToMulti ScDocument* pUndoDoc = NULL; BOOL bMulti = !bSimple && aMultiMark.IsMultiMarked(); @@ -635,15 +635,15 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags, bObjects = FALSE; } - USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted + USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted if ( nFlags & IDF_ATTRIB ) rDocShell.UpdatePaintExt( nExtFlags, aMarkRange ); - // Reihenfolge: - // 1) BeginDrawUndo - // 2) Objekte loeschen (DrawUndo wird gefuellt) - // 3) Inhalte fuer Undo kopieren und Undo-Aktion anlegen - // 4) Inhalte loeschen + // Reihenfolge: + // 1) BeginDrawUndo + // 2) Objekte loeschen (DrawUndo wird gefuellt) + // 3) Inhalte fuer Undo kopieren und Undo-Aktion anlegen + // 4) Inhalte loeschen bool bDrawUndo = bObjects || (nFlags & IDF_NOTE); if (bRecord && bDrawUndo) @@ -664,21 +664,21 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags, pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); pUndoDoc->InitUndo( pDoc, aMarkRange.aStart.Tab(), aMarkRange.aEnd.Tab() ); - // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument - // nur mit IDF_HARDATTR zu langsam ist: + // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument + // nur mit IDF_HARDATTR zu langsam ist: USHORT nUndoDocFlags = nFlags; if (nFlags & IDF_ATTRIB) nUndoDocFlags |= IDF_ATTRIB; - if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute - nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert + if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute + nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert if (nFlags & IDF_NOTE) - nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes + nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes // note captions are handled in drawing undo nUndoDocFlags |= IDF_NOCAPTIONS; pDoc->CopyToDocument( aExtendedRange, nUndoDocFlags, bMulti, pUndoDoc, &aMultiMark ); } -//! HideAllCursors(); // falls Zusammenfassung aufgehoben wird +//! HideAllCursors(); // falls Zusammenfassung aufgehoben wird if (bSimple) pDoc->DeleteArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), @@ -698,12 +698,12 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags, if (!AdjustRowHeight( aExtendedRange )) rDocShell.PostPaint( aExtendedRange, PAINT_GRID, nExtFlags ); else if (nExtFlags & SC_PF_LINES) - lcl_PaintAbove( rDocShell, aExtendedRange ); // fuer Linien ueber dem Bereich + lcl_PaintAbove( rDocShell, aExtendedRange ); // fuer Linien ueber dem Bereich -// rDocShell.UpdateOle(GetViewData()); //! an der View? +// rDocShell.UpdateOle(GetViewData()); //! an der View? aModificator.SetDocumentModified(); -//! CellContentChanged(); -//! ShowAllCursors(); +//! CellContentChanged(); +//! ShowAllCursors(); return TRUE; } @@ -729,7 +729,7 @@ BOOL ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType, ScRange aMarkRange; ScMarkData aMultiMark = rMark; - aMultiMark.SetMarking(FALSE); // for MarkToMulti + aMultiMark.SetMarking(FALSE); // for MarkToMulti aMultiMark.MarkToMulti(); aMultiMark.GetMultiMarkArea( aMarkRange ); @@ -789,7 +789,7 @@ BOOL ScDocFunc::SetNormalString( const ScAddress& rPos, const String& rText, BOO { pTabs = new SCTAB[1]; pTabs[0] = rPos.Tab(); - ppOldCells = new ScBaseCell*[1]; + ppOldCells = new ScBaseCell*[1]; ppOldCells[0] = pDocCell ? pDocCell->CloneWithoutNote( *pDoc ) : 0; pHasFormat = new BOOL[1]; @@ -810,7 +810,7 @@ BOOL ScDocFunc::SetNormalString( const ScAddress& rPos, const String& rText, BOO if (bUndo) { - // wegen ChangeTracking darf UndoAction erst nach SetString angelegt werden + // wegen ChangeTracking darf UndoAction erst nach SetString angelegt werden rDocShell.GetUndoManager()->AddUndoAction(new ScUndoEnterData( &rDocShell, rPos.Col(),rPos.Row(),rPos.Tab(), 1,pTabs, ppOldCells, pHasFormat, pOldFormats, rText, NULL ) ); } @@ -859,7 +859,7 @@ BOOL ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi pDoc->PutCell( rPos, pNewCell ); - // wegen ChangeTracking darf UndoAction erst nach PutCell angelegt werden + // wegen ChangeTracking darf UndoAction erst nach PutCell angelegt werden if (bUndo) { rDocShell.GetUndoManager()->AddUndoAction( @@ -903,8 +903,8 @@ void ScDocFunc::NotifyInputHandler( const ScAddress& /* rPos */ ) struct ScMyRememberItem { - USHORT nIndex; - SfxItemSet aItemSet; + USHORT nIndex; + SfxItemSet aItemSet; ScMyRememberItem(const SfxItemSet& rItemSet, USHORT nTempIndex) : nIndex(nTempIndex), aItemSet(rItemSet) {} @@ -914,7 +914,7 @@ void ScDocFunc::NotifyInputHandler( const ScAddress& /* rPos */ ) BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, BOOL bInterpret, BOOL bApi ) { - // PutData ruft PutCell oder SetNormalString + // PutData ruft PutCell oder SetNormalString BOOL bRet = FALSE; ScDocument* pDoc = rDocShell.GetDocument(); @@ -934,10 +934,10 @@ BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, ScMyRememberItemList aRememberItems; ScMyRememberItem* pRememberItem = NULL; - // All paragraph attributes must be removed before calling CreateTextObject, - // not only alignment, so the object doesn't contain the cell attributes as - // paragraph attributes. Before remove the attributes store they in a list to - // set they back to the EditEngine. + // All paragraph attributes must be removed before calling CreateTextObject, + // not only alignment, so the object doesn't contain the cell attributes as + // paragraph attributes. Before remove the attributes store they in a list to + // set they back to the EditEngine. USHORT nCount = rEngine.GetParagraphCount(); for (USHORT i=0; i<nCount; i++) { @@ -992,7 +992,7 @@ BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, ScPatternAttr aPattern( pDoc->GetPool() ); aPattern.GetFromEditItemSet( &rEditAttr ); aPattern.DeleteUnchanged( pDoc->GetPattern( rPos.Col(), rPos.Row(), rPos.Tab() ) ); - aPattern.GetItemSet().ClearItem( ATTR_HOR_JUSTIFY ); // wasn't removed above if no edit object + aPattern.GetItemSet().ClearItem( ATTR_HOR_JUSTIFY ); // wasn't removed above if no edit object if ( aPattern.GetItemSet().Count() > 0 ) { ScMarkData aMark; @@ -1026,7 +1026,7 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos, { ScTokenArray* pCode; if ( pDoc->IsImportingXML() ) - { // temporary formula string as string tokens + { // temporary formula string as string tokens pCode = lcl_ScDocFunc_CreateTokenArrayXML( rText, rFormulaNmsp, eGrammar ); pDoc->IncXMLImportedFormulaCount( rText.Len() ); } @@ -1037,15 +1037,15 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos, pCode = aComp.CompileString( rText ); } pNewCell = new ScFormulaCell( pDoc, rPos, pCode, eGrammar, MM_NONE ); - delete pCode; // Zell-ctor hat das TokenArray kopiert + delete pCode; // Zell-ctor hat das TokenArray kopiert } else if ( rText.Len() > 1 && rText.GetChar(0) == '\'' ) { - // for bEnglish, "'" at the beginning is always interpreted as text - // marker and stripped + // for bEnglish, "'" at the beginning is always interpreted as text + // marker and stripped pNewCell = ScBaseCell::CreateTextCell( rText.Copy( 1 ), pDoc ); } - else // (nur) auf englisches Zahlformat testen + else // (nur) auf englisches Zahlformat testen { SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); sal_uInt32 nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US); @@ -1055,8 +1055,8 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos, else if ( rText.Len() ) pNewCell = ScBaseCell::CreateTextCell( rText, pDoc ); - // das (englische) Zahlformat wird nicht gesetzt - //! passendes lokales Format suchen und setzen??? + // das (englische) Zahlformat wird nicht gesetzt + //! passendes lokales Format suchen und setzen??? } return pNewCell; @@ -1067,7 +1067,7 @@ BOOL ScDocFunc::SetCellText( const ScAddress& rPos, const String& rText, BOOL bInterpret, BOOL bEnglish, BOOL bApi, const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) { - // SetCellText ruft PutCell oder SetNormalString + // SetCellText ruft PutCell oder SetNormalString ScDocument* pDoc = rDocShell.GetDocument(); ScBaseCell* pNewCell = NULL; @@ -1079,8 +1079,8 @@ BOOL ScDocFunc::SetCellText( const ScAddress& rPos, const String& rText, if (bApi) pExtRefGuard.reset(new ScExternalRefManager::ApiGuard(pDoc)); - // code moved to own method InterpretEnglishString because it is also used in - // ScCellRangeObj::setFormulaArray + // code moved to own method InterpretEnglishString because it is also used in + // ScCellRangeObj::setFormulaArray pNewCell = InterpretEnglishString( rPos, rText, rFormulaNmsp, eGrammar ); } @@ -1089,7 +1089,7 @@ BOOL ScDocFunc::SetCellText( const ScAddress& rPos, const String& rText, else if ( rText.Len() ) { OSL_ENSURE( rFormulaNmsp.Len() == 0, "ScDocFunc::SetCellText - formula namespace, but do not interpret?" ); - pNewCell = ScBaseCell::CreateTextCell( rText, pDoc ); // immer Text + pNewCell = ScBaseCell::CreateTextCell( rText, pDoc ); // immer Text } if (pNewCell) @@ -1135,12 +1135,12 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, BOOL bA } String aNewText = rText; - aNewText.ConvertLineEnd(); //! ist das noetig ??? + aNewText.ConvertLineEnd(); //! ist das noetig ??? if( ScPostIt* pNote = (aNewText.Len() > 0) ? pDoc->GetOrCreateNote( rPos ) : pDoc->GetNote( rPos ) ) pNote->SetText( rPos, aNewText ); - //! Undo !!! + //! Undo !!! if (pDoc->IsStreamValid(rPos.Tab())) pDoc->SetStreamValid(rPos.Tab(), FALSE); @@ -1236,7 +1236,7 @@ BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& r ScDocShellModificator aModificator( rDocShell ); - //! Umrandung + //! Umrandung ScRange aMultiRange; BOOL bMulti = rMark.IsMultiMarked(); @@ -1262,15 +1262,15 @@ BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& r // While loading XML it is not neccessary to ask HasAttrib. It needs too much time. USHORT nExtFlags = 0; if ( !bImportingXML ) - rDocShell.UpdatePaintExt( nExtFlags, aMultiRange ); // content before the change + rDocShell.UpdatePaintExt( nExtFlags, aMultiRange ); // content before the change pDoc->ApplySelectionPattern( rPattern, rMark ); if ( !bImportingXML ) - rDocShell.UpdatePaintExt( nExtFlags, aMultiRange ); // content after the change + rDocShell.UpdatePaintExt( nExtFlags, aMultiRange ); // content after the change if (!AdjustRowHeight( aMultiRange )) rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags ); else if (nExtFlags & SC_PF_LINES) - lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich + lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich aModificator.SetDocumentModified(); @@ -1332,19 +1332,19 @@ BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName, } -// BOOL bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT ); -// pDoc->ApplySelectionPattern( rPattern, rMark ); +// BOOL bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT ); +// pDoc->ApplySelectionPattern( rPattern, rMark ); pDoc->ApplySelectionStyle( (ScStyleSheet&)*pStyleSheet, rMark ); -// if (!bPaintExt) -// bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT ); -// USHORT nExtFlags = bPaintExt ? SC_PF_LINES : 0; +// if (!bPaintExt) +// bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT ); +// USHORT nExtFlags = bPaintExt ? SC_PF_LINES : 0; USHORT nExtFlags = 0; if (!AdjustRowHeight( aMultiRange )) rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags ); else if (nExtFlags & SC_PF_LINES) - lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich + lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich aModificator.SetDocumentModified(); @@ -1423,7 +1423,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, SCTAB nSelCount = aMark.GetSelectCount(); - // zugehoerige Szenarien auch anpassen + // zugehoerige Szenarien auch anpassen // Test zusammengefasste SCCOL nMergeTestStartX = nStartCol; @@ -1470,7 +1470,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, return FALSE; } - WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pRefUndoDoc = NULL; ScRefUndoData* pUndoData = NULL; @@ -1742,7 +1742,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, AdjustRowHeight(ScRange(0, nPaintStartY, i, MAXCOL, nPaintEndY, i+nScenarioCount )); if (bAdjusted) { - // paint only what is not done by AdjustRowHeight + // paint only what is not done by AdjustRowHeight if (nPaintFlags & PAINT_TOP) rDocShell.PostPaint( nPaintStartX, nPaintStartY, i, nPaintEndX, nPaintEndY, i+nScenarioCount, PAINT_TOP ); } @@ -1780,7 +1780,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, delete pRefUndoDoc; delete pUndoData; if (!bApi) - rDocShell.ErrorMessage(STR_INSERT_FULL); // Spalte/Zeile voll + rDocShell.ErrorMessage(STR_INSERT_FULL); // Spalte/Zeile voll } aModificator.SetDocumentModified(); @@ -2039,10 +2039,10 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, } // - // ausfuehren + // ausfuehren // - WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; @@ -2113,7 +2113,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, break; } - //! Test, ob Outline in Groesse geaendert + //! Test, ob Outline in Groesse geaendert if ( bRecord ) { @@ -2121,10 +2121,10 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, if( aFullMark.GetTableSelect( i ) ) pRefUndoDoc->DeleteAreaTab(nUndoStartX,nUndoStartY,nUndoEndX,nUndoEndY, i, IDF_ALL); - // alle Tabellen anlegen, damit Formeln kopiert werden koennen: + // alle Tabellen anlegen, damit Formeln kopiert werden koennen: pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE ); - // kopieren mit bColRowFlags=FALSE (#54194#) + // kopieren mit bColRowFlags=FALSE (#54194#) pRefUndoDoc->CopyToDocument(0,0,0,MAXCOL,MAXROW,MAXTAB,IDF_FORMULA,FALSE,pUndoDoc,NULL,FALSE); delete pRefUndoDoc; @@ -2252,12 +2252,12 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, for( SCTAB j = i+1; j<nTabCount && pDoc->IsScenario(j); j++ ) nScenarioCount ++; - // ganze Zeilen loeschen: nichts anpassen + // ganze Zeilen loeschen: nichts anpassen if ( eCmd == DEL_DELROWS || !AdjustRowHeight(ScRange( 0, nPaintStartY, i, MAXCOL, nPaintEndY, i+nScenarioCount )) ) rDocShell.PostPaint( nPaintStartX, nPaintStartY, i, nPaintEndX, nPaintEndY, i+nScenarioCount, nPaintFlags, nExtFlags ); else { - // paint only what is not done by AdjustRowHeight + // paint only what is not done by AdjustRowHeight if (nExtFlags & SC_PF_LINES) lcl_PaintAbove( rDocShell, ScRange( nPaintStartX, nPaintStartY, i, nPaintEndX, nPaintEndY, i+nScenarioCount) ); if (nPaintFlags & PAINT_TOP) @@ -2293,7 +2293,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, return FALSE; } - // zugehoerige Szenarien auch anpassen - nur wenn innerhalb einer Tabelle verschoben wird! + // zugehoerige Szenarien auch anpassen - nur wenn innerhalb einer Tabelle verschoben wird! BOOL bScenariosAdded = FALSE; ScDocument* pDoc = rDocShell.GetDocument(); if (bRecord && !pDoc->IsUndoEnabled()) @@ -2315,13 +2315,13 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, ScMarkData aSourceMark; for (nTab=nStartTab; nTab<=nEndTab; nTab++) - aSourceMark.SelectTable( nTab, TRUE ); // Source selektieren + aSourceMark.SelectTable( nTab, TRUE ); // Source selektieren aSourceMark.SetMarkArea( rSource ); ScDocShellRef aDragShellRef; if ( pDoc->HasOLEObjectsInArea( rSource ) ) { - aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately + aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately aDragShellRef->DoInitNew(NULL); } ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); @@ -2347,13 +2347,13 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, SCCOL nDestEndCol = nDestCol + ( nOldEndCol-nStartCol ); SCROW nDestEndRow = nDestRow + ( nOldEndRow-nStartRow ); - SCCOL nUndoEndCol = nDestCol + ( nEndCol-nStartCol ); // erweitert im Zielblock + SCCOL nUndoEndCol = nDestCol + ( nEndCol-nStartCol ); // erweitert im Zielblock SCROW nUndoEndRow = nDestRow + ( nEndRow-nStartRow ); BOOL bIncludeFiltered = bCut; if ( !bIncludeFiltered ) { - // adjust sizes to include only non-filtered rows + // adjust sizes to include only non-filtered rows SCCOL nClipX; SCROW nClipY; @@ -2371,7 +2371,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, return FALSE; } - // Test auf Zellschutz + // Test auf Zellschutz ScEditableTester aTester; for (nTab=nDestTab; nTab<=nDestEndTab; nTab++) @@ -2388,19 +2388,19 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, return FALSE; } - // Test auf zusammengefasste - beim Verschieben erst nach dem Loeschen + // Test auf zusammengefasste - beim Verschieben erst nach dem Loeschen if (bClipOver && !bCut) if (pDoc->HasAttrib( nDestCol,nDestRow,nDestTab, nUndoEndCol,nUndoEndRow,nDestEndTab, HASATTR_MERGED | HASATTR_OVERLAPPED )) - { // "Zusammenfassen nicht verschachteln !" + { // "Zusammenfassen nicht verschachteln !" if (!bApi) rDocShell.ErrorMessage(STR_MSSG_MOVEBLOCKTO_0); delete pClipDoc; return FALSE; } - // Are there borders in the cells? (for painting) + // Are there borders in the cells? (for painting) USHORT nSourceExt = 0; rDocShell.UpdatePaintExt( nSourceExt, nStartCol,nStartRow,nStartTab, nEndCol,nEndRow,nEndTab ); @@ -2408,7 +2408,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, rDocShell.UpdatePaintExt( nDestExt, nDestCol,nDestRow,nDestTab, nDestEndCol,nDestEndRow,nDestEndTab ); // - // ausfuehren + // ausfuehren // ScDocument* pUndoDoc = NULL; @@ -2442,10 +2442,10 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, pDoc->BeginDrawUndo(); } - BOOL bSourceHeight = FALSE; // Hoehen angepasst? + BOOL bSourceHeight = FALSE; // Hoehen angepasst? if (bCut) { - ScMarkData aDelMark; // only for tables + ScMarkData aDelMark; // only for tables for (nTab=nStartTab; nTab<=nEndTab; nTab++) { pDoc->DeleteAreaTab( nStartCol,nStartRow, nOldEndCol,nOldEndRow, nTab, IDF_ALL ); @@ -2453,7 +2453,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, } pDoc->DeleteObjectsInArea( nStartCol,nStartRow, nOldEndCol,nOldEndRow, aDelMark ); - // Test auf zusammengefasste + // Test auf zusammengefasste if (bClipOver) if (pDoc->HasAttrib( nDestCol,nDestRow,nDestTab, @@ -2468,8 +2468,8 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, pDoc->ExtendMerge( nStartCol, nStartRow, nTmpEndCol, nTmpEndRow, nTab, TRUE ); } - // Fehlermeldung erst nach dem Wiederherstellen des Inhalts - if (!bApi) // "Zusammenfassen nicht verschachteln !" + // Fehlermeldung erst nach dem Wiederherstellen des Inhalts + if (!bApi) // "Zusammenfassen nicht verschachteln !" rDocShell.ErrorMessage(STR_MSSG_MOVEBLOCKTO_0); delete pUndoDoc; @@ -2486,7 +2486,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, ScMarkData aDestMark; for (nTab=nDestTab; nTab<=nDestEndTab; nTab++) - aDestMark.SelectTable( nTab, TRUE ); // Destination selektieren + aDestMark.SelectTable( nTab, TRUE ); // Destination selektieren aDestMark.SetMarkArea( aPasteDest ); /* Do not copy cell notes and drawing objects here. While pasting, the @@ -2521,11 +2521,11 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, { if (pRefUndoDoc) { - // alle Tabellen anlegen, damit Formeln kopiert werden koennen: + // alle Tabellen anlegen, damit Formeln kopiert werden koennen: pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE ); pRefUndoDoc->DeleteArea( nDestCol, nDestRow, nDestEndCol, nDestEndRow, aSourceMark, IDF_ALL ); - // kopieren mit bColRowFlags=FALSE (#54194#) + // kopieren mit bColRowFlags=FALSE (#54194#) pRefUndoDoc->CopyToDocument( 0, 0, 0, MAXCOL, MAXROW, MAXTAB, IDF_FORMULA, FALSE, pUndoDoc, NULL, FALSE ); delete pRefUndoDoc; @@ -2556,7 +2556,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, if (bPaint) { - // Zielbereich: + // Zielbereich: SCCOL nPaintStartX = nDestCol; SCROW nPaintStartY = nDestRow; @@ -2564,7 +2564,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, SCROW nPaintEndY = nDestPaintEndRow; USHORT nFlags = PAINT_GRID; - if ( nStartRow==0 && nEndRow==MAXROW ) // Breiten mitkopiert? + if ( nStartRow==0 && nEndRow==MAXROW ) // Breiten mitkopiert? { nPaintEndX = MAXCOL; nPaintStartY = 0; @@ -2591,7 +2591,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, if ( bCut ) { - // Quellbereich: + // Quellbereich: nPaintStartX = nStartCol; nPaintStartY = nStartRow; @@ -2635,8 +2635,8 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, St uno::Reference< uno::XInterface > xDocModuleApiObject; if ( xSF.is() ) { - xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY ); - xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY ); + xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY ); + xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY ); } return xDocModuleApiObject; @@ -2671,7 +2671,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String // if the Module with codename exists then find a new name sal_Int32 nNum = 0; String genModuleName; - if ( sModuleName.Len() ) + if ( sModuleName.Len() ) sModuleName = sModuleName; else { @@ -2680,7 +2680,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String } while( xLib->hasByName( genModuleName ) ) genModuleName = rtl::OUString::createFromAscii( "Sheet" ) + rtl::OUString::valueOf( ++nNum ); - + uno::Any aSourceAny; rtl::OUString sTmpSource = sSource; if ( sTmpSource.getLength() == 0 ) @@ -2739,7 +2739,7 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL // Strange loop, also basic is loaded too early ( InsertTable ) - // is called via the xml import for sheets in described in odf + // is called via the xml import for sheets in described in odf BOOL bInsertDocModule = false; if( !rDocShell.GetDocument()->IsImportingXML() ) @@ -2750,12 +2750,12 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bRecord = FALSE; if (bRecord) - pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage + pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage SCTAB nTabCount = pDoc->GetTableCount(); BOOL bAppend = ( nTab >= nTabCount ); if ( bAppend ) - nTab = nTabCount; // wichtig fuer Undo + nTab = nTabCount; // wichtig fuer Undo if (pDoc->InsertTab( nTab, rName )) { @@ -2763,7 +2763,7 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL if (bRecord) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoInsertTab( &rDocShell, nTab, bAppend, rName)); - // Views updaten: + // Views updaten: // Only insert vba modules if vba mode ( and not currently importing XML ) if( bInsertDocModule ) { @@ -2804,8 +2804,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ ) pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); SCTAB nCount = pDoc->GetTableCount(); - pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE ); // nur nTab mit Flags - pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen + pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE ); // nur nTab mit Flags + pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pUndoDoc ); String aOldName; @@ -2832,8 +2832,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ ) pUndoDoc->SetTabBgColor( nTab, pDoc->GetTabBgColor(nTab) ); pUndoDoc->SetSheetEvents( nTab, pDoc->GetSheetEvents( nTab ) ); - // Drawing-Layer muss sein Undo selbst in der Hand behalten !!! - pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage + // Drawing-Layer muss sein Undo selbst in der Hand behalten !!! + pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage pUndoData = new ScRefUndoData( pDoc ); } @@ -2849,7 +2849,7 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ ) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDeleteTab( &rDocShell, theTabs, pUndoDoc, pUndoData )); } - // Views updaten: + // Views updaten: if( bVbaEnabled ) { if( bHasCodeName ) @@ -2861,7 +2861,7 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ ) if (bWasLinked) { - rDocShell.UpdateLinks(); // Link-Manager updaten + rDocShell.UpdateLinks(); // Link-Manager updaten SfxBindings* pBindings = rDocShell.GetViewBindings(); if (pBindings) pBindings->Invalidate(SID_LINKS); @@ -2890,7 +2890,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi ) ScDocument* pDoc = rDocShell.GetDocument(); BOOL bUndo(pDoc->IsUndoEnabled()); if ( pDoc->IsVisible( nTab ) == bVisible ) - return TRUE; // nichts zu tun - ok + return TRUE; // nichts zu tun - ok if ( !pDoc->IsDocEditable() ) { @@ -2903,7 +2903,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi ) if ( !bVisible && !pDoc->IsImportingXML() ) // #i57869# allow hiding in any order for loading { - // nicht alle Tabellen ausblenden + // nicht alle Tabellen ausblenden USHORT nVisCount = 0; SCTAB nCount = pDoc->GetTableCount(); @@ -2914,7 +2914,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi ) if (nVisCount <= 1) { if (!bApi) - rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung? + rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung? return FALSE; } } @@ -2923,7 +2923,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi ) if (bUndo) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoShowHideTab( &rDocShell, nTab, bVisible ) ); - // Views updaten: + // Views updaten: if (!bVisible) rDocShell.Broadcast( ScTablesHint( SC_TAB_HIDDEN, nTab ) ); @@ -2939,9 +2939,9 @@ BOOL ScDocFunc::SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL /* bApi */ ) ScDocument* pDoc = rDocShell.GetDocument(); BOOL bUndo(pDoc->IsUndoEnabled()); if ( pDoc->IsLayoutRTL( nTab ) == bRTL ) - return TRUE; // nothing to do - ok + return TRUE; // nothing to do - ok - //! protection (sheet or document?) + //! protection (sheet or document?) ScDocShellModificator aModificator( rDocShell ); @@ -3098,17 +3098,17 @@ bool ScDocFunc::SetTabBgColor( //------------------------------------------------------------------------ -//! SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!! -//! Probleme: -//! - Optimale Hoehe fuer Edit-Zellen ist unterschiedlich zwischen Drucker und Bildschirm -//! - Optimale Breite braucht Selektion, um evtl. nur selektierte Zellen zu beruecksichtigen +//! SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!! +//! Probleme: +//! - Optimale Hoehe fuer Edit-Zellen ist unterschiedlich zwischen Drucker und Bildschirm +//! - Optimale Breite braucht Selektion, um evtl. nur selektierte Zellen zu beruecksichtigen USHORT lcl_GetOptimalColWidth( ScDocShell& rDocShell, SCCOL nCol, SCTAB nTab, BOOL bFormula ) { USHORT nTwips = 0; ScSizeDeviceProvider aProv(&rDocShell); - OutputDevice* pDev = aProv.GetDevice(); // has pixel MapMode + OutputDevice* pDev = aProv.GetDevice(); // has pixel MapMode double nPPTX = aProv.GetPPTX(); double nPPTY = aProv.GetPPTY(); @@ -3135,7 +3135,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa if ( !pDoc->IsChangeReadOnlyEnabled() && !rDocShell.IsEditable() ) { if (!bApi) - rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung? + rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung? return FALSE; } @@ -3146,16 +3146,16 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa BOOL bFormula = FALSE; if ( eMode == SC_SIZE_OPTIMAL ) { - //! Option "Formeln anzeigen" - woher nehmen? + //! Option "Formeln anzeigen" - woher nehmen? } - ScDocument* pUndoDoc = NULL; + ScDocument* pUndoDoc = NULL; ScOutlineTable* pUndoTab = NULL; - SCCOLROW* pUndoRanges = NULL; + SCCOLROW* pUndoRanges = NULL; if ( bRecord ) { - pDoc->BeginDrawUndo(); // Drawing Updates + pDoc->BeginDrawUndo(); // Drawing Updates pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); if (bWidth) @@ -3180,21 +3180,21 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa BOOL bShow = nSizeTwips > 0 || eMode != SC_SIZE_DIRECT; BOOL bOutline = FALSE; - pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln + pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln for (SCCOLROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++) { SCCOLROW nStartNo = *(pRanges++); SCCOLROW nEndNo = *(pRanges++); - if ( !bWidth ) // Hoehen immer blockweise + if ( !bWidth ) // Hoehen immer blockweise { if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT ) { BOOL bAll = ( eMode==SC_SIZE_OPTIMAL ); if (!bAll) { - // fuer alle eingeblendeten CR_MANUALSIZE loeschen, - // dann SetOptimalHeight mit bShrink = FALSE + // fuer alle eingeblendeten CR_MANUALSIZE loeschen, + // dann SetOptimalHeight mit bShrink = FALSE for (SCROW nRow=nStartNo; nRow<=nEndNo; nRow++) { BYTE nOld = pDoc->GetRowFlags(nRow,nTab); @@ -3213,15 +3213,15 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa if (bAll) pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE ); - // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt - // (an bei Extra-Height, sonst aus). + // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt + // (an bei Extra-Height, sonst aus). } else if ( eMode==SC_SIZE_DIRECT || eMode==SC_SIZE_ORIGINAL ) { if (nSizeTwips) { pDoc->SetRowHeightRange( nStartNo, nEndNo, nTab, nSizeTwips ); - pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually + pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually } if ( eMode != SC_SIZE_ORIGINAL ) pDoc->ShowRows( nStartNo, nEndNo, nTab, nSizeTwips != 0 ); @@ -3231,7 +3231,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE ); } } - else // Spaltenbreiten + else // Spaltenbreiten { for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++) { @@ -3252,7 +3252,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa } } - // adjust outlines + // adjust outlines if ( eMode != SC_SIZE_ORIGINAL ) { @@ -3266,7 +3266,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa static_cast<SCROW>(nEndNo), nTab, bShow ); } } - pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln + pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln if (!bOutline) DELETEZ(pUndoTab); @@ -3304,10 +3304,10 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos, SCCOLROW nPos = bColumn ? static_cast<SCCOLROW>(rPos.Col()) : static_cast<SCCOLROW>(rPos.Row()); if (nPos == 0) - return FALSE; // erste Spalte / Zeile + return FALSE; // erste Spalte / Zeile - ScBreakType nBreak = bColumn ? - pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab) : + ScBreakType nBreak = bColumn ? + pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab) : pDoc->HasRowBreak(static_cast<SCROW>(nPos), nTab); if (nBreak & BREAK_MANUAL) return true; @@ -3588,17 +3588,17 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL return FALSE; } - // #i12940# ClearItems is called (from setPropertyToDefault) directly with uno object's cached - // MarkData (GetMarkData), so rMark must be changed to multi selection for ClearSelectionItems - // here. + // #i12940# ClearItems is called (from setPropertyToDefault) directly with uno object's cached + // MarkData (GetMarkData), so rMark must be changed to multi selection for ClearSelectionItems + // here. ScRange aMarkRange; ScMarkData aMultiMark = rMark; - aMultiMark.SetMarking(FALSE); // for MarkToMulti + aMultiMark.SetMarking(FALSE); // for MarkToMulti aMultiMark.MarkToMulti(); aMultiMark.GetMultiMarkArea( aMarkRange ); -// if (bRecord) +// if (bRecord) if (bUndo) { SCTAB nStartTab = aMarkRange.aStart.Tab(); @@ -3617,7 +3617,7 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL rDocShell.PostPaint( aMarkRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE ); aModificator.SetDocumentModified(); - //! Bindings-Invalidate etc.? + //! Bindings-Invalidate etc.? return TRUE; } @@ -3639,7 +3639,7 @@ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bAp ScRange aMarkRange; rMark.GetMultiMarkArea( aMarkRange ); -// if (bRecord) +// if (bRecord) if (bUndo) { SCTAB nStartTab = aMarkRange.aStart.Tab(); @@ -3668,7 +3668,7 @@ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bAp SfxBindings* pBindings = rDocShell.GetViewBindings(); if (pBindings) { - pBindings->Invalidate( SID_ALIGNLEFT ); // ChangeIndent setzt auf links + pBindings->Invalidate( SID_ALIGNLEFT ); // ChangeIndent setzt auf links pBindings->Invalidate( SID_ALIGNRIGHT ); pBindings->Invalidate( SID_ALIGNBLOCK ); pBindings->Invalidate( SID_ALIGNCENTERHOR ); @@ -3744,7 +3744,7 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark, if (bSize) { -/* SCCOL nCols[2]; +/* SCCOL nCols[2]; nCols[0] = nStartCol; nCols[1] = nEndCol; SCROW nRows[2]; @@ -3779,7 +3779,7 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark, } } - if ( bRecord ) // Draw-Undo erst jetzt verfuegbar + if ( bRecord ) // Draw-Undo erst jetzt verfuegbar { rDocShell.GetUndoManager()->AddUndoAction( new ScUndoAutoFormat( &rDocShell, rRange, pUndoDoc, aMark, bSize, nFormatNo ) ); @@ -3827,10 +3827,10 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, WaitObject aWait( rDocShell.GetActiveDialogParent() ); ScDocument* pUndoDoc = NULL; -// if (bRecord) // immer +// if (bRecord) // immer if (bUndo) { - //! auch bei Undo selektierte Tabellen beruecksichtigen + //! auch bei Undo selektierte Tabellen beruecksichtigen pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab ); pDoc->CopyToDocument( rRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc ); @@ -3863,15 +3863,15 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, pDoc->InsertMatrixFormula( nStartCol, nStartRow, nEndCol, nEndRow, aMark, rString, NULL, eGrammar); -// if (bRecord) // immer +// if (bRecord) // immer if (bUndo) { - //! auch bei Undo selektierte Tabellen beruecksichtigen + //! auch bei Undo selektierte Tabellen beruecksichtigen rDocShell.GetUndoManager()->AddUndoAction( new ScUndoEnterMatrix( &rDocShell, rRange, pUndoDoc, rString ) ); } - // Err522 beim Paint von DDE-Formeln werden jetzt beim Interpretieren abgefangen + // Err522 beim Paint von DDE-Formeln werden jetzt beim Interpretieren abgefangen rDocShell.PostPaint( nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab, PAINT_GRID ); aModificator.SetDocumentModified(); @@ -3918,7 +3918,7 @@ BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, pDoc->SetDirty( rRange ); if ( bRecord ) { - //! auch bei Undo selektierte Tabellen beruecksichtigen + //! auch bei Undo selektierte Tabellen beruecksichtigen ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab ); pDoc->CopyToDocument( rRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc ); @@ -4036,7 +4036,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark, nCount, eDir, FILL_SIMPLE ); AdjustRowHeight(rRange); - if ( bRecord ) // Draw-Undo erst jetzt verfuegbar + if ( bRecord ) // Draw-Undo erst jetzt verfuegbar { rDocShell.GetUndoManager()->AddUndoAction( new ScUndoAutoFill( &rDocShell, aDestArea, aSourceArea, pUndoDoc, aMark, @@ -4045,7 +4045,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark, } rDocShell.PostPaintGridAll(); -// rDocShell.PostPaintDataChanged(); +// rDocShell.PostPaintDataChanged(); aModificator.SetDocumentModified(); bSuccess = TRUE; @@ -4057,7 +4057,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark, } BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, - FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, + FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, double fStart, double fStep, double fMax, BOOL bRecord, BOOL bApi ) { @@ -4097,7 +4097,7 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, aSourceArea.aEnd.Col(), aSourceArea.aEnd.Row(), aSourceArea.aEnd.Tab(), DirFromFillDir(eDir) ); - // #27665# mindestens eine Zeile/Spalte als Quellbereich behalten: + // #27665# mindestens eine Zeile/Spalte als Quellbereich behalten: SCSIZE nTotLines = ( eDir == FILL_TO_BOTTOM || eDir == FILL_TO_TOP ) ? static_cast<SCSIZE>( aSourceArea.aEnd.Row() - aSourceArea.aStart.Row() + 1 ) : static_cast<SCSIZE>( aSourceArea.aEnd.Col() - aSourceArea.aStart.Col() + 1 ); @@ -4154,11 +4154,11 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, AdjustRowHeight(rRange); rDocShell.PostPaintGridAll(); -// rDocShell.PostPaintDataChanged(); +// rDocShell.PostPaintDataChanged(); aModificator.SetDocumentModified(); } - if ( bRecord ) // Draw-Undo erst jetzt verfuegbar + if ( bRecord ) // Draw-Undo erst jetzt verfuegbar { rDocShell.GetUndoManager()->AddUndoAction( new ScUndoAutoFill( &rDocShell, aDestArea, aSourceArea, pUndoDoc, aMark, @@ -4177,12 +4177,12 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi ) { - double fStep = 1.0; - double fMax = MAXDOUBLE; + double fStep = 1.0; + double fMax = MAXDOUBLE; return FillAuto( rRange, pTabMark, eDir, FILL_AUTO, FILL_DAY, nCount, fStep, fMax, bRecord, bApi ); } -BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, ULONG nCount, double fStep, double fMax, BOOL bRecord, BOOL bApi ) +BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, ULONG nCount, double fStep, double fMax, BOOL bRecord, BOOL bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -4239,9 +4239,9 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e break; } - // Zellschutz testen - //! Quellbereich darf geschuetzt sein !!! - //! aber kein Matrixfragment enthalten !!! + // Zellschutz testen + //! Quellbereich darf geschuetzt sein !!! + //! aber kein Matrixfragment enthalten !!! ScEditableTester aTester( pDoc, aDestArea ); if ( !aTester.IsEditable() ) @@ -4286,7 +4286,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e AdjustRowHeight(aDestArea); - if ( bRecord ) // Draw-Undo erst jetzt verfuegbar + if ( bRecord ) // Draw-Undo erst jetzt verfuegbar { rDocShell.GetUndoManager()->AddUndoAction( new ScUndoAutoFill( &rDocShell, aDestArea, aSourceArea, pUndoDoc, aMark, @@ -4295,10 +4295,10 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e } rDocShell.PostPaintGridAll(); -// rDocShell.PostPaintDataChanged(); +// rDocShell.PostPaintDataChanged(); aModificator.SetDocumentModified(); - rRange = aDestArea; // Zielbereich zurueckgeben (zum Markieren) + rRange = aDestArea; // Zielbereich zurueckgeben (zum Markieren) return TRUE; } @@ -4532,10 +4532,10 @@ bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc ) BOOL bCompile = ( !pDoc->IsImportingXML() && pDoc->GetNamedRangesLockCount() == 0 ); if ( bCompile ) - pDoc->CompileNameFormula( TRUE ); // CreateFormulaString + pDoc->CompileNameFormula( TRUE ); // CreateFormulaString pDoc->SetRangeName( pNewRanges ); // takes ownership if ( bCompile ) - pDoc->CompileNameFormula( FALSE ); // CompileFormulaString + pDoc->CompileNameFormula( FALSE ); // CompileFormulaString if (bModifyDoc) { @@ -4569,7 +4569,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList, BOOL bInsert = FALSE; USHORT nOldPos; - if (rList.SearchName( aName, nOldPos )) // vorhanden ? + if (rList.SearchName( aName, nOldPos )) // vorhanden ? { ScRangeData* pOld = rList[nOldPos]; String aOldStr; @@ -4577,7 +4577,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList, if (aOldStr != aContent) { if (bApi) - bInsert = TRUE; // per API nicht nachfragen + bInsert = TRUE; // per API nicht nachfragen else { String aTemplate = ScGlobal::GetRscString( STR_CREATENAME_REPLACE ); @@ -4619,7 +4619,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList, BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi ) { if (!nFlags) - return FALSE; // war nix + return FALSE; // war nix ScDocShellModificator aModificator( rDocShell ); @@ -4644,7 +4644,7 @@ BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi ) ScDocument* pDoc = rDocShell.GetDocument(); ScRangeName* pNames = pDoc->GetRangeName(); if (!pNames) - return FALSE; // soll nicht sein + return FALSE; // soll nicht sein ScRangeName aNewRanges( *pNames ); BOOL bTop = ( ( nFlags & NAME_TOP ) != 0 ); @@ -4742,7 +4742,7 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi ) pDoc->CopyToDocument( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc ); - pDoc->BeginDrawUndo(); // wegen Hoehenanpassung + pDoc->BeginDrawUndo(); // wegen Hoehenanpassung } ScRangeData** ppSortArray = new ScRangeData* [ nValidCount ]; @@ -4794,7 +4794,7 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi ) if (!AdjustRowHeight(ScRange(0,nStartRow,nTab,MAXCOL,nEndRow,nTab))) rDocShell.PostPaint( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, PAINT_GRID ); -//! rDocShell.UpdateOle(GetViewData()); +//! rDocShell.UpdateOle(GetViewData()); aModificator.SetDocumentModified(); bDone = TRUE; } @@ -4839,7 +4839,7 @@ BOOL ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd bRet = EnterMatrix( aNewRange, &aMark, NULL, aFormula, bApi, FALSE, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 ); if (!bRet) { - // versuchen, alten Zustand wiederherzustellen + // versuchen, alten Zustand wiederherzustellen EnterMatrix( rOldRange, &aMark, NULL, aFormula, bApi, FALSE, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 ); } } @@ -4858,7 +4858,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, const ScRange& rDestRange, ULONG nRefresh, BOOL bFitBlock, BOOL bApi ) { - //! auch fuer ScViewFunc::InsertAreaLink benutzen! + //! auch fuer ScViewFunc::InsertAreaLink benutzen! ScDocument* pDoc = rDocShell.GetDocument(); BOOL bUndo (pDoc->IsUndoEnabled()); @@ -4906,15 +4906,15 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, if (!aFilterName.Len()) ScDocumentLoader::GetFilterName( rFile, aFilterName, aNewOptions, TRUE, !bApi ); - // remove application prefix from filter name here, so the filter options - // aren't reset when the filter name is changed in ScAreaLink::DataChanged + // remove application prefix from filter name here, so the filter options + // aren't reset when the filter name is changed in ScAreaLink::DataChanged ScDocumentLoader::RemoveAppPrefix( aFilterName ); ScAreaLink* pLink = new ScAreaLink( &rDocShell, rFile, aFilterName, aNewOptions, rSource, rDestRange, nRefresh ); pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, rFile, &aFilterName, &rSource ); - // Undo fuer den leeren Link + // Undo fuer den leeren Link if (bUndo) { @@ -4925,17 +4925,17 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, rDocShell.GetUndoManager()->LeaveListAction(); // undo for link update is still separate } - // Update hat sein eigenes Undo + // Update hat sein eigenes Undo - pLink->SetDoInsert(bFitBlock); // beim ersten Update ggf. nichts einfuegen - pLink->Update(); // kein SetInCreate -> Update ausfuehren - pLink->SetDoInsert(TRUE); // Default = TRUE + pLink->SetDoInsert(bFitBlock); // beim ersten Update ggf. nichts einfuegen + pLink->Update(); // kein SetInCreate -> Update ausfuehren + pLink->SetDoInsert(TRUE); // Default = TRUE SfxBindings* pBindings = rDocShell.GetViewBindings(); if (pBindings) pBindings->Invalidate( SID_LINKS ); - SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator return TRUE; } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index a777de7888e2..671b261ac644 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.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 @@ -104,7 +104,7 @@ #include "attrib.hxx" #include "asciiopt.hxx" #include "waitoff.hxx" -#include "docpool.hxx" // LoadCompleted +#include "docpool.hxx" // LoadCompleted #include "progress.hxx" #include "pntlock.hxx" #include "collect.hxx" @@ -153,38 +153,38 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- -// Stream-Namen im Storage +// Stream-Namen im Storage -const sal_Char __FAR_DATA ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; // "StarCalcDocument" +const sal_Char __FAR_DATA ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; // "StarCalcDocument" const sal_Char __FAR_DATA ScDocShell::pStyleName[] = "SfxStyleSheets"; -// Filter-Namen (wie in sclib.cxx) - -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 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 pFilterHtmlWebQ[] = "calc_HTML_WebQuery"; -static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)"; +// Filter-Namen (wie in sclib.cxx) + +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 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 pFilterHtmlWebQ[] = "calc_HTML_WebQuery"; +static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)"; //---------------------------------------------------------------------- @@ -197,10 +197,10 @@ SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell, ScResId(SCSTR_DOCSHELL)) SFX_CHILDWINDOW_REGISTRATION( SID_HYPERLINK_INSERT ); } -// GlobalName der aktuellen Version: +// GlobalName der aktuellen Version: SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), SFXOBJECTSHELL_STD_NORMAL, "scalc" ) -TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: kein Type-Info ? +TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: kein Type-Info ? //------------------------------------------------------------------ @@ -214,17 +214,17 @@ void __EXPORT ScDocShell::FillClass( SvGlobalName* pClassName, { if ( nFileFormat == SOFFICE_FILEFORMAT_60 ) { - *pClassName = SvGlobalName( SO3_SC_CLASSID_60 ); - *pFormat = SOT_FORMATSTR_ID_STARCALC_60; - *pFullTypeName = String( ScResId( SCSTR_LONG_SCDOC_NAME ) ); - *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) ); + *pClassName = SvGlobalName( SO3_SC_CLASSID_60 ); + *pFormat = SOT_FORMATSTR_ID_STARCALC_60; + *pFullTypeName = String( ScResId( SCSTR_LONG_SCDOC_NAME ) ); + *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) ); } else if ( nFileFormat == SOFFICE_FILEFORMAT_8 ) { - *pClassName = SvGlobalName( SO3_SC_CLASSID_60 ); - *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE : SOT_FORMATSTR_ID_STARCALC_8; - *pFullTypeName = String( RTL_CONSTASCII_USTRINGPARAM("calc8") ); - *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) ); + *pClassName = SvGlobalName( SO3_SC_CLASSID_60 ); + *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE : SOT_FORMATSTR_ID_STARCALC_8; + *pFullTypeName = String( RTL_CONSTASCII_USTRINGPARAM("calc8") ); + *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) ); } else { @@ -251,7 +251,7 @@ SCTAB ScDocShell::GetSaveTab() if (pSh) { const ScMarkData& rMark = pSh->GetViewData()->GetMarkData(); - for ( nTab = 0; nTab <= MAXTAB; nTab++ ) // erste markierte Tabelle + for ( nTab = 0; nTab <= MAXTAB; nTab++ ) // erste markierte Tabelle if ( rMark.GetTableSelect( nTab ) ) break; } @@ -340,14 +340,14 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) ScGlobal::UnicodeStrChr( pNameBuffer, SC_COMPILER_FILE_TAB_SEP ) ) { rtl::OUStringBuffer aDocURLBuffer; - BOOL bQuote = TRUE; // Dokumentenname ist immer quoted + BOOL bQuote = TRUE; // Dokumentenname ist immer quoted ++pNameBuffer; while ( bQuote && *pNameBuffer ) { if ( *pNameBuffer == '\'' && *(pNameBuffer-1) != '\\' ) bQuote = FALSE; else if( !(*pNameBuffer == '\\' && *(pNameBuffer+1) == '\'') ) - aDocURLBuffer.append(*pNameBuffer); // falls escaped Quote: nur Quote in den Namen + aDocURLBuffer.append(*pNameBuffer); // falls escaped Quote: nur Quote in den Namen ++pNameBuffer; } @@ -356,7 +356,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) { xub_StrLen nIndex = nNameLength - nLinkTabNameLength; INetURLObject aINetURLObject(aDocURLBuffer.makeStringAndClear()); - if( aName.Equals(aLinkTabName, nIndex, nLinkTabNameLength) && + if( aName.Equals(aLinkTabName, nIndex, nLinkTabNameLength) && (aName.GetChar(nIndex - 1) == '#') && // before the table name should be the # char !aINetURLObject.HasError()) // the docname should be a valid URL { @@ -391,7 +391,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) } else aDocument.SetInsertingFromOtherDoc( FALSE ); - + aDocument.SetImportingXML( FALSE ); aDocument.EnableExecuteLink( true ); aDocument.EnableUndo( TRUE ); @@ -435,7 +435,7 @@ BOOL ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R { LoadMediumGuard aLoadGuard(&aDocument); - // MacroCallMode is no longer needed, state is kept in SfxObjectShell now + // MacroCallMode is no longer needed, state is kept in SfxObjectShell now // no Seek(0) here - always loading from storage, GetInStream must not be called @@ -461,7 +461,7 @@ BOOL ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R aDocument.SetXMLFromWrapper( FALSE ); AfterXMLLoading(bRet); - //! row heights... + //! row heights... return bRet; } @@ -490,8 +490,8 @@ BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium ) LoadMediumGuard aLoadGuard(&aDocument); ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() ); - // only the latin script language is loaded - // -> initialize the others from options (before loading) + // only the latin script language is loaded + // -> initialize the others from options (before loading) InitOptions(true); GetUndoManager()->Clear(); @@ -506,8 +506,8 @@ BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium ) } { - // prepare a valid document for XML filter - // (for ConvertFrom, InitNew is called before) + // prepare a valid document for XML filter + // (for ConvertFrom, InitNew is called before) aDocument.MakeTable(0); aDocument.GetStyleSheetPool()->CreateStandardStyles(); aDocument.UpdStlShtPtrsFrmNms(); @@ -598,27 +598,27 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { } - if (rHint.ISA(SfxSimpleHint)) // ohne Parameter + if (rHint.ISA(SfxSimpleHint)) // ohne Parameter { ULONG nSlot = ((const SfxSimpleHint&)rHint).GetId(); switch ( nSlot ) { case SFX_HINT_TITLECHANGED: aDocument.SetName( SfxShell::GetName() ); - // RegisterNewTargetNames gibts nicht mehr - SFX_APP()->Broadcast(SfxSimpleHint( SC_HINT_DOCNAME_CHANGED )); // Navigator + // RegisterNewTargetNames gibts nicht mehr + SFX_APP()->Broadcast(SfxSimpleHint( SC_HINT_DOCNAME_CHANGED )); // Navigator break; } } - else if (rHint.ISA(SfxStyleSheetHint)) // Vorlagen geaendert + else if (rHint.ISA(SfxStyleSheetHint)) // Vorlagen geaendert NotifyStyle((const SfxStyleSheetHint&) rHint); else if (rHint.ISA(ScAutoStyleHint)) { - //! direct call for AutoStyles + //! direct call for AutoStyles - // this is called synchronously from ScInterpreter::ScStyle, - // modifying the document must be asynchronous - // (handled by AddInitial) + // this is called synchronously from ScInterpreter::ScStyle, + // modifying the document must be asynchronous + // (handled by AddInitial) ScAutoStyleHint& rStlHint = (ScAutoStyleHint&)rHint; ScRange aRange = rStlHint.GetRange(); @@ -661,7 +661,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( aDocument.IsInVBAMode() ) try { uno::Reference< frame::XModel > xModel( GetModel(), uno::UNO_SET_THROW ); - + // create VBAGlobals object if not yet done (this also creates the "ThisExcelDoc" symbol) uno::Reference< lang::XMultiServiceFactory > xFactory( xModel, uno::UNO_QUERY_THROW ); xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) ); @@ -1028,7 +1028,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) LoadMediumGuard aLoadGuard(&aDocument); - BOOL bRet = FALSE; // FALSE heisst Benutzerabbruch !! + BOOL bRet = FALSE; // FALSE heisst Benutzerabbruch !! // bei Fehler: Fehler am Stream setzen!! ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() ); @@ -1047,10 +1047,10 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) aConvFilterName.Erase(); //@ #BugId 54198 - // Alle Filter brauchen die komplette Datei am Stueck (nicht asynchron), - // darum vorher per CreateFileStream dafuer sorgen, dass die komplette - // Datei uebertragen wird. - rMedium.GetPhysicalName(); //! CreateFileStream direkt rufen, wenn verfuegbar + // Alle Filter brauchen die komplette Datei am Stueck (nicht asynchron), + // darum vorher per CreateFileStream dafuer sorgen, dass die komplette + // Datei uebertragen wird. + rMedium.GetPhysicalName(); //! CreateFileStream direkt rufen, wenn verfuegbar SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False); nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; @@ -1087,7 +1087,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) else if (aFltName.EqualsAscii(pFilterLotus)) { String sItStr; - SfxItemSet* pSet = rMedium.GetItemSet(); + SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) ) @@ -1097,8 +1097,8 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (sItStr.Len() == 0) { - // default for lotus import (from API without options): - // IBM_437 encoding + // default for lotus import (from API without options): + // IBM_437 encoding sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_IBM_437 ); } @@ -1133,14 +1133,14 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) else if ( aFltName.EqualsAscii(pFilterExcel97) || aFltName.EqualsAscii(pFilterEx97Temp) ) eFormat = EIF_BIFF8; - MakeDrawLayer(); //! im Filter + MakeDrawLayer(); //! im Filter CalcOutputFactor(); // #93255# prepare update of row height ScColumn::bDoubleAlloc = TRUE; FltError eError = ScFormatFilter::Get().ScImportExcel( rMedium, &aDocument, eFormat ); ScColumn::bDoubleAlloc = FALSE; aDocument.UpdateFontCharSet(); if ( aDocument.IsChartListenerCollectionNeedsUpdate() ) - aDocument.UpdateChartListenerCollection(); //! fuer alle Importe? + aDocument.UpdateChartListenerCollection(); //! fuer alle Importe? // #75299# all graphics objects must have names aDocument.EnsureGraphicNames(); @@ -1164,7 +1164,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) } else if (aFltName.EqualsAscii(pFilterAscii)) { - SfxItemSet* pSet = rMedium.GetItemSet(); + SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; ScAsciiOptions aOptions; BOOL bOptInit = FALSE; @@ -1178,8 +1178,8 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) if ( !bOptInit ) { - // default for ascii import (from API without options): - // ISO8859-1/MS_1252 encoding, comma, double quotes + // default for ascii import (from API without options): + // ISO8859-1/MS_1252 encoding, comma, double quotes aOptions.SetCharSet( RTL_TEXTENCODING_MS_1252 ); aOptions.SetFieldSeps( (sal_Unicode) ',' ); @@ -1191,7 +1191,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) if( ! rMedium.IsStorage() ) { - ScImportExport aImpEx( &aDocument ); + ScImportExport aImpEx( &aDocument ); aImpEx.SetExtOptions( aOptions ); SvStream* pInStream = rMedium.GetInStream(); @@ -1227,7 +1227,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) else if (aFltName.EqualsAscii(pFilterDBase)) { String sItStr; - SfxItemSet* pSet = rMedium.GetItemSet(); + SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) ) @@ -1237,8 +1237,8 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (sItStr.Len() == 0) { - // default for dBase import (from API without options): - // IBM_850 encoding + // default for dBase import (from API without options): + // IBM_850 encoding sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_IBM_850 ); } @@ -1257,7 +1257,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) else bRet = TRUE; - aColWidthRange.aStart.SetRow( 1 ); // Spaltenheader nicht + aColWidthRange.aStart.SetRow( 1 ); // Spaltenheader nicht bSetColWidths = TRUE; bSetSimpleTextColWidths = TRUE; } @@ -1268,7 +1268,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) { FltError eError; String sItStr; - SfxItemSet* pSet = rMedium.GetItemSet(); + SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) ) @@ -1278,8 +1278,8 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (sItStr.Len() == 0) { - // default for DIF import (from API without options): - // ISO8859-1/MS_1252 encoding + // default for DIF import (from API without options): + // ISO8859-1/MS_1252 encoding sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_MS_1252 ); } @@ -1395,7 +1395,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) { LanguageType eLang = LANGUAGE_SYSTEM; bool bDateConvert = false; - SfxItemSet* pSet = rMedium.GetItemSet(); + SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) ) @@ -1450,13 +1450,13 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) InitItems(); CalcOutputFactor(); if ( bRet && (bSetColWidths || bSetRowHeights) ) - { // Spaltenbreiten/Zeilenhoehen anpassen, Basis 100% Zoom + { // Spaltenbreiten/Zeilenhoehen anpassen, Basis 100% Zoom Fraction aZoom( 1, 1 ); double nPPTX = ScGlobal::nScreenPPTX * (double) aZoom - / GetOutputFactor(); // Faktor ist Drucker zu Bildschirm + / GetOutputFactor(); // Faktor ist Drucker zu Bildschirm double nPPTY = ScGlobal::nScreenPPTY * (double) aZoom; VirtualDevice aVirtDev; - // all sheets (for Excel import) + // all sheets (for Excel import) SCTAB nTabCount = aDocument.GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) { @@ -1483,12 +1483,12 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) nWidth + (USHORT)ScGlobal::nLastColWidthExtra ); } } -// if ( bSetRowHeights ) -// { -// // nExtra must be 0 -// aDocument.SetOptimalHeight( 0, nEndRow, nTab, 0, &aVirtDev, -// nPPTX, nPPTY, aZoom, aZoom, FALSE ); -// } +// if ( bSetRowHeights ) +// { +// // nExtra must be 0 +// aDocument.SetOptimalHeight( 0, nEndRow, nTab, 0, &aVirtDev, +// nPPTX, nPPTY, aZoom, aZoom, FALSE ); +// } } if (bSetRowHeights) @@ -1565,7 +1565,7 @@ BOOL __EXPORT ScDocShell::Save() PrepareSaveGuard aPrepareGuard( *this); - // wait cursor is handled with progress bar + // wait cursor is handled with progress bar BOOL bRet = SfxObjectShell::Save(); if( bRet ) bRet = SaveXML( GetMedium(), NULL ); @@ -1596,7 +1596,7 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium ) PrepareSaveGuard aPrepareGuard( *this); - // wait cursor is handled with progress bar + // wait cursor is handled with progress bar BOOL bRet = SfxObjectShell::SaveAs( rMedium ); if( bRet ) bRet = SaveXML( &rMedium, NULL ); @@ -1610,7 +1610,7 @@ BOOL __EXPORT ScDocShell::IsInformationLost() /* const SfxFilter *pFilt = GetMedium()->GetFilter(); BOOL bRet = pFilt && pFilt->IsAlienFormat() && bNoInformLost; - if (bNoInformLost) // nur einmal!! + if (bNoInformLost) // nur einmal!! bNoInformLost = FALSE; return bRet; */ @@ -1624,7 +1624,7 @@ BOOL __EXPORT ScDocShell::IsInformationLost() xub_StrLen lcl_ScDocShell_GetColWidthInChars( USHORT nWidth ) { // double fColScale = 1.0; - double f = nWidth; + double f = nWidth; f *= 1328.0 / 25.0; f += 90.0; f *= 1.0 / 23.0; @@ -1732,7 +1732,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt String aString; - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); + ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); const ScViewOptions& rOpt = (pViewSh) ? pViewSh->GetViewData()->GetOptions() : aDocument.GetViewOptions(); @@ -1752,7 +1752,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt ScBaseCell* pCell; while ( ( pCell = aIter.GetNext( nCol, nRow ) ) != NULL ) { - BOOL bProgress = FALSE; // only upon line change + BOOL bProgress = FALSE; // only upon line change if ( nNextRow < nRow ) { // empty rows or/and empty columns up to end of row bProgress = TRUE; @@ -1817,7 +1817,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt if ( pProtAttr->GetHideCell() || ( eType == CELLTYPE_FORMULA && bShowFormulas && pProtAttr->GetHideFormula() ) ) - eType = CELLTYPE_NONE; // hide + eType = CELLTYPE_NONE; // hide } BOOL bString; switch ( eType ) @@ -2030,7 +2030,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt if ( nNextRow <= nEndRow ) { for ( nEmptyCol = nNextCol; nEmptyCol < nEndCol; nEmptyCol++ ) - { // remaining empty columns of last row + { // remaining empty columns of last row if ( bFixedWidth ) lcl_ScDocShell_WriteEmptyFixedWidthString( rStream, aDocument, nTab, nEmptyCol ); @@ -2041,7 +2041,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt nNextRow++; } for ( nEmptyRow = nNextRow; nEmptyRow <= nEndRow; nEmptyRow++ ) - { // entire empty rows + { // entire empty rows for ( nEmptyCol = nStartCol; nEmptyCol < nEndCol; nEmptyCol++ ) { if ( bFixedWidth ) @@ -2067,7 +2067,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) // it's already in ExecuteSave (as for Save and SaveAs) if (pAutoStyleList) - pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren + pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren if (GetCreateMode()== SFX_CREATE_MODE_STANDARD) SfxObjectShell::SetVisArea( Rectangle() ); // normal bearbeitet -> keine VisArea @@ -2159,7 +2159,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) if (pStream) { String sItStr; - SfxItemSet* pSet = rMed.GetItemSet(); + SfxItemSet* pSet = rMed.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) ) @@ -2169,8 +2169,8 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) if ( sItStr.Len() == 0 ) { - // default for ascii export (from API without options): - // ISO8859-1/MS_1252 encoding, comma, double quotes + // default for ascii export (from API without options): + // ISO8859-1/MS_1252 encoding, comma, double quotes ScImportOptions aDefOptions( ',', '"', RTL_TEXTENCODING_MS_1252 ); sItStr = aDefOptions.BuildString(); @@ -2189,7 +2189,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) else if (aFltName.EqualsAscii(pFilterDBase)) { String sCharSet; - SfxItemSet* pSet = rMed.GetItemSet(); + SfxItemSet* pSet = rMed.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) ) @@ -2199,8 +2199,8 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) if (sCharSet.Len() == 0) { - // default for dBase export (from API without options): - // IBM_850 encoding + // default for dBase export (from API without options): + // IBM_850 encoding sCharSet = ScGlobal::GetCharsetString( RTL_TEXTENCODING_IBM_850 ); } @@ -2215,12 +2215,12 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) if ( eError != eERR_OK && (eError & ERRCODE_WARNING_MASK) ) { -//! if ( !rMed.GetError() ) -//! rMed.SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); +//! if ( !rMed.GetError() ) +//! rMed.SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); eError = eERR_OK; } -//! else if ( aDocument.GetTableCount() > 1 && !rMed.GetError() ) -//! rMed.SetError( SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); +//! else if ( aDocument.GetTableCount() > 1 && !rMed.GetError() ) +//! rMed.SetError( SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); INetURLObject aTmpFile( rMed.GetPhysicalName(), INET_PROT_FILE ); if ( bHasMemo ) @@ -2260,7 +2260,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) if (pStream) { String sItStr; - SfxItemSet* pSet = rMed.GetItemSet(); + SfxItemSet* pSet = rMed.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) ) @@ -2270,8 +2270,8 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) if (sItStr.Len() == 0) { - // default for DIF export (from API without options): - // ISO8859-1/MS_1252 encoding + // default for DIF export (from API without options): + // ISO8859-1/MS_1252 encoding sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_MS_1252 ); } @@ -2338,7 +2338,7 @@ BOOL __EXPORT ScDocShell::DoSaveCompleted( SfxMedium * pNewStor ) { BOOL bRet = SfxObjectShell::DoSaveCompleted( pNewStor ); - // SC_HINT_DOC_SAVED fuer Wechsel ReadOnly -> Read/Write + // SC_HINT_DOC_SAVED fuer Wechsel ReadOnly -> Read/Write Broadcast( SfxSimpleHint( SC_HINT_DOC_SAVED ) ); return bRet; } @@ -2347,7 +2347,7 @@ BOOL __EXPORT ScDocShell::DoSaveCompleted( SfxMedium * pNewStor ) sal_Bool ScDocShell::QuerySlotExecutable( USHORT nSlotId ) { // #i112634# ask VBA event handlers whether to save or print the document - + using namespace ::com::sun::star::script::vba; sal_Int32 nVbaEventId = VBAEventId::NO_EVENT; @@ -2430,27 +2430,27 @@ USHORT __EXPORT ScDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) // end handler code USHORT nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing ); - if (nRet == TRUE) // TRUE = schliessen - aDocument.DisableIdle(TRUE); // nicht mehr drin rumpfuschen !!! + if (nRet == TRUE) // TRUE = schliessen + aDocument.DisableIdle(TRUE); // nicht mehr drin rumpfuschen !!! return nRet; } void ScDocShell::PrepareReload() { - SfxObjectShell::PrepareReload(); // tut nichts? + SfxObjectShell::PrepareReload(); // tut nichts? - // Das Disconnect von DDE-Links kann Reschedule ausloesen. - // Wenn die DDE-Links erst im Dokument-dtor geloescht werden, kann beim Reload - // aus diesem Reschedule das DDE-Link-Update fuer das neue Dokument ausgeloest - // werden. Dabei verklemmt sicht dann irgendwas. - // -> Beim Reload die DDE-Links des alten Dokuments vorher disconnecten + // Das Disconnect von DDE-Links kann Reschedule ausloesen. + // Wenn die DDE-Links erst im Dokument-dtor geloescht werden, kann beim Reload + // aus diesem Reschedule das DDE-Link-Update fuer das neue Dokument ausgeloest + // werden. Dabei verklemmt sicht dann irgendwas. + // -> Beim Reload die DDE-Links des alten Dokuments vorher disconnecten aDocument.DisconnectDdeLinks(); } -String ScDocShell::GetOwnFilterName() // static +String ScDocShell::GetOwnFilterName() // static { return String::CreateFromAscii(pFilterSc50); } @@ -2460,35 +2460,35 @@ String ScDocShell::GetHtmlFilterName() return String::CreateFromAscii(pFilterHtml); } -String ScDocShell::GetWebQueryFilterName() // static +String ScDocShell::GetWebQueryFilterName() // static { return String::CreateFromAscii(pFilterHtmlWebQ); } -String ScDocShell::GetAsciiFilterName() // static +String ScDocShell::GetAsciiFilterName() // static { return String::CreateFromAscii(pFilterAscii); } -String ScDocShell::GetLotusFilterName() // static +String ScDocShell::GetLotusFilterName() // static { return String::CreateFromAscii(pFilterLotus); } -String ScDocShell::GetDBaseFilterName() // static +String ScDocShell::GetDBaseFilterName() // static { return String::CreateFromAscii(pFilterDBase); } -String ScDocShell::GetDifFilterName() // static +String ScDocShell::GetDifFilterName() // static { return String::CreateFromAscii(pFilterDif); } -BOOL ScDocShell::HasAutomaticTableName( const String& rFilter ) // static +BOOL ScDocShell::HasAutomaticTableName( const String& rFilter ) // static { - // TRUE for those filters that keep the default table name - // (which is language specific) + // TRUE for those filters that keep the default table name + // (which is language specific) return rFilter.EqualsAscii( pFilterAscii ) || rFilter.EqualsAscii( pFilterLotus ) @@ -2504,24 +2504,24 @@ BOOL ScDocShell::HasAutomaticTableName( const String& rFilter ) // static //================================================================== #define __SCDOCSHELL_INIT \ - aDocument ( SCDOCMODE_DOCUMENT, this ), \ + aDocument ( SCDOCMODE_DOCUMENT, this ), \ aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TEXT"))), \ nPrtToScreenFactor( 1.0 ), \ pImpl ( new DocShell_Impl ), \ - bHeaderOn ( TRUE ), \ - bFooterOn ( TRUE ), \ + bHeaderOn ( TRUE ), \ + bFooterOn ( TRUE ), \ bNoInformLost ( TRUE ), \ - bIsEmpty ( TRUE ), \ - bIsInUndo ( FALSE ), \ + bIsEmpty ( TRUE ), \ + bIsInUndo ( FALSE ), \ bDocumentModifiedPending( FALSE ), \ - nDocumentLock ( 0 ), \ + nDocumentLock ( 0 ), \ nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), \ bUpdateEnabled ( TRUE ), \ pOldAutoDBRange ( NULL ), \ - pDocHelper ( NULL ), \ - pAutoStyleList ( NULL ), \ - pPaintLockData ( NULL ), \ - pOldJobSetup ( NULL ), \ + pDocHelper ( NULL ), \ + pAutoStyleList ( NULL ), \ + pPaintLockData ( NULL ), \ + pOldJobSetup ( NULL ), \ pSolverSaveData ( NULL ), \ pSheetSaveData ( NULL ), \ pModificator ( NULL ) @@ -2543,7 +2543,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) pDocFunc = new ScDocFunc(*this); - // SetBaseModel needs exception handling + // SetBaseModel needs exception handling ScModelObj::CreateAndSet( this ); StartListening(*this); @@ -2554,13 +2554,13 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) GetPageOnFromPageStyleSet( NULL, 0, bHeaderOn, bFooterOn ); SetHelpId( HID_SCSHELL_DOCSH ); - // InitItems und CalcOutputFactor werden jetzt nach bei Load/ConvertFrom/InitNew gerufen + // InitItems und CalcOutputFactor werden jetzt nach bei Load/ConvertFrom/InitNew gerufen } //------------------------------------------------------------------ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) - : SfxObjectShell( i_nSfxCreationFlags ) + : SfxObjectShell( i_nSfxCreationFlags ) , __SCDOCSHELL_INIT { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" ); @@ -2568,11 +2568,11 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) SetPool( &SC_MOD()->GetPool() ); bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED); - // wird zurueckgesetzt, wenn nicht inplace + // wird zurueckgesetzt, wenn nicht inplace pDocFunc = new ScDocFunc(*this); - // SetBaseModel needs exception handling + // SetBaseModel needs exception handling ScModelObj::CreateAndSet( this ); StartListening(*this); @@ -2584,14 +2584,14 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) aDocument.GetDBCollection()->SetRefreshHandler( LINK( this, ScDocShell, RefreshDBDataHdl ) ); - // InitItems und CalcOutputFactor werden jetzt nach bei Load/ConvertFrom/InitNew gerufen + // InitItems und CalcOutputFactor werden jetzt nach bei Load/ConvertFrom/InitNew gerufen } //------------------------------------------------------------------ __EXPORT ScDocShell::~ScDocShell() { - ResetDrawObjectShell(); // #55570# falls der Drawing-Layer noch versucht, darauf zuzugreifen + ResetDrawObjectShell(); // #55570# falls der Drawing-Layer noch versucht, darauf zuzugreifen SfxStyleSheetPool* pStlPool = aDocument.GetStyleSheetPool(); if (pStlPool) @@ -2601,7 +2601,7 @@ __EXPORT ScDocShell::~ScDocShell() delete pAutoStyleList; SfxApplication *pSfxApp = SFX_APP(); - if ( pSfxApp->GetDdeService() ) // DDE vor Dokument loeschen + if ( pSfxApp->GetDdeService() ) // DDE vor Dokument loeschen pSfxApp->RemoveDdeTopic( this ); delete pDocFunc; @@ -2611,7 +2611,7 @@ __EXPORT ScDocShell::~ScDocShell() delete pPaintLockData; - delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob() + delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob() delete pSolverSaveData; delete pSheetSaveData; @@ -2643,16 +2643,16 @@ void ScDocShell::SetModified( BOOL bModified ) void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ ) { - // BroadcastUno muss auch mit pPaintLockData sofort passieren - //! auch bei SetDrawModified, wenn Drawing angebunden ist - //! dann eigener Hint??? + // BroadcastUno muss auch mit pPaintLockData sofort passieren + //! auch bei SetDrawModified, wenn Drawing angebunden ist + //! dann eigener Hint??? if ( pPaintLockData && bIsModified ) { //! BCA_BRDCST_ALWAYS etc. also needed here? aDocument.BroadcastUno( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); - pPaintLockData->SetModified(); // spaeter... + pPaintLockData->SetModified(); // spaeter... return; } @@ -2673,18 +2673,18 @@ void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ ) aDocument.CalcFormulaTree( TRUE ); PostDataChanged(); - // Detective AutoUpdate: - // Update if formulas were modified (DetectiveDirty) or the list contains - // "Trace Error" entries (#75362# - Trace Error can look completely different - // after changes to non-formula cells). + // Detective AutoUpdate: + // Update if formulas were modified (DetectiveDirty) or the list contains + // "Trace Error" entries (#75362# - Trace Error can look completely different + // after changes to non-formula cells). ScDetOpList* pList = aDocument.GetDetOpList(); if ( pList && ( aDocument.IsDetectiveDirty() || pList->HasAddError() ) && pList->Count() && !IsInUndo() && SC_MOD()->GetAppOptions().GetDetectiveAuto() ) { - GetDocFunc().DetectiveRefresh(TRUE); // TRUE = caused by automatic update + GetDocFunc().DetectiveRefresh(TRUE); // TRUE = caused by automatic update } - aDocument.SetDetectiveDirty(FALSE); // always reset, also if not refreshed + aDocument.SetDetectiveDirty(FALSE); // always reset, also if not refreshed } // #b6697848# notify UNO objects after BCA_BRDCST_ALWAYS etc. @@ -2692,9 +2692,9 @@ void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ ) } } -// SetDrawModified - ohne Formel-Update -// (Drawing muss auch beim normalen SetDocumentModified upgedated werden, -// z.B. bei Tabelle loeschen etc.) +// SetDrawModified - ohne Formel-Update +// (Drawing muss auch beim normalen SetDocumentModified upgedated werden, +// z.B. bei Tabelle loeschen etc.) void ScDocShell::SetDrawModified( BOOL bIsModified /* = TRUE */ ) { @@ -2727,7 +2727,7 @@ void ScDocShell::SetDrawModified( BOOL bIsModified /* = TRUE */ ) if ( aDocument.IsChartListenerCollectionNeedsUpdate() ) { aDocument.UpdateChartListenerCollection(); - SFX_APP()->Broadcast(SfxSimpleHint( SC_HINT_DRAW_CHANGED )); // Navigator + SFX_APP()->Broadcast(SfxSimpleHint( SC_HINT_DRAW_CHANGED )); // Navigator } SC_MOD()->AnythingChanged(); } @@ -2757,7 +2757,7 @@ SfxDocumentInfoDialog* __EXPORT ScDocShell::CreateDocumentInfoDialog( Window *pParent, const SfxItemSet &rSet ) { SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog( pParent, rSet ); - ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current()); + ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current()); //nur mit Statistik, wenn dieses Doc auch angezeigt wird, nicht //aus dem Doc-Manager @@ -2766,7 +2766,7 @@ SfxDocumentInfoDialog* __EXPORT ScDocShell::CreateDocumentInfoDialog( { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); - ::CreateTabPage ScDocStatPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_STAT ); + ::CreateTabPage ScDocStatPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_STAT ); DBG_ASSERT(ScDocStatPageCreate, "Tabpage create fail!"); pDlg->AddTabPage( 42, ScGlobal::GetRscString( STR_DOC_STAT ), @@ -2778,7 +2778,7 @@ SfxDocumentInfoDialog* __EXPORT ScDocShell::CreateDocumentInfoDialog( Window* ScDocShell::GetActiveDialogParent() { - ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); + ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if ( pViewSh ) return pViewSh->GetDialogParent(); else @@ -2947,7 +2947,7 @@ ScDocShellModificator::~ScDocShellModificator() ScDocument* pDoc = rDocShell.GetDocument(); pDoc->SetAutoCalcShellDisabled( bAutoCalcShellDisabled ); if ( !bAutoCalcShellDisabled && rDocShell.IsDocumentModifiedPending() ) - rDocShell.SetDocumentModified(); // last one shuts off the lights + rDocShell.SetDocumentModified(); // last one shuts off the lights pDoc->DisableIdle( bIdleDisabled ); } @@ -2991,7 +2991,7 @@ bool ScDocShell::IsChangeRecording() const return pChangeTrack != NULL; } - + bool ScDocShell::HasChangeRecordProtection() const { bool bRes = false; @@ -3001,7 +3001,7 @@ bool ScDocShell::HasChangeRecordProtection() const return bRes; } - + void ScDocShell::SetChangeRecording( bool bActivate ) { bool bOldChangeRecording = IsChangeRecording(); @@ -3027,9 +3027,9 @@ void ScDocShell::SetChangeRecording( bool bActivate ) if (pBindings) pBindings->InvalidateAll(FALSE); } -} - +} + bool ScDocShell::SetProtectionPassword( const String &rNewPassword ) { bool bRes = false; @@ -3042,7 +3042,7 @@ bool ScDocShell::SetProtectionPassword( const String &rNewPassword ) { // when password protection is applied change tracking must always be active SetChangeRecording( true ); - + ::com::sun::star::uno::Sequence< sal_Int8 > aProtectionHash; SvPasswordHelper::GetHashPassword( aProtectionHash, rNewPassword ); pChangeTrack->SetProtection( aProtectionHash ); @@ -3061,9 +3061,9 @@ bool ScDocShell::SetProtectionPassword( const String &rNewPassword ) } return bRes; -} - +} + bool ScDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) { bool bRes = false; @@ -3074,8 +3074,8 @@ bool ScDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal bRes = true; } return bRes; -} - +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index ab567f7d23df..8686cc787c14 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.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 @@ -80,12 +80,12 @@ BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xSt BOOL bRet = SfxObjectShell::InitNew( xStor ); aDocument.MakeTable(0); - // zusaetzliche Tabellen werden von der ersten View angelegt, - // wenn bIsEmpty dann noch TRUE ist + // zusaetzliche Tabellen werden von der ersten View angelegt, + // wenn bIsEmpty dann noch TRUE ist if( bRet ) { - Size aSize( (long) ( STD_COL_WIDTH * HMM_PER_TWIPS * OLE_STD_CELLS_X ), + Size aSize( (long) ( STD_COL_WIDTH * HMM_PER_TWIPS * OLE_STD_CELLS_X ), (long) ( ScGlobal::nStdRowHeight * HMM_PER_TWIPS * OLE_STD_CELLS_Y ) ); // hier muss auch der Start angepasst werden SetVisAreaOrSize( Rectangle( Point(), aSize ), TRUE ); @@ -99,7 +99,7 @@ BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xSt aDocument.GetStyleSheetPool()->CreateStandardStyles(); aDocument.UpdStlShtPtrsFrmNms(); - // SetDocumentModified ist in Load/InitNew nicht mehr erlaubt! + // SetDocumentModified ist in Load/InitNew nicht mehr erlaubt! InitItems(); CalcOutputFactor(); @@ -109,14 +109,14 @@ BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xSt aArgs[ 0 ] <<= GetModel(); aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs ); GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs ); - // Fake ThisComponent being setup by Activate ( which is a view - // related thing ), + // Fake ThisComponent being setup by Activate ( which is a view + // related thing ), // a) if another document is opened then in theory ThisComponent - // will be reset as before, + // will be reset as before, // b) when this document is 'really' Activated then ThisComponent // again will be set as before // The only wrinkle seems if this document is loaded 'InVisible' - // but.. I don't see that this is possible from the vba API + // but.. I don't see that this is possible from the vba API // I could be wrong though // There may be implications setting the current component // too early :-/ so I will just manually set the Basic Variables @@ -150,7 +150,7 @@ void ScDocShell::InitItems() // if ( pImpl->pFontList ) // delete pImpl->pFontList; - // Druck-Optionen werden beim Drucken und evtl. in GetPrinter gesetzt + // Druck-Optionen werden beim Drucken und evtl. in GetPrinter gesetzt // pImpl->pFontList = new FontList( GetPrinter(), Application::GetDefaultDevice() ); //PutItem( SvxFontListItem( pImpl->pFontList, SID_ATTR_CHAR_FONTLIST ) ); @@ -166,23 +166,23 @@ void ScDocShell::InitItems() PutItem( SvxDashListItem ( pDrawLayer->GetDashList(), SID_DASH_LIST ) ); PutItem( SvxLineEndListItem ( pDrawLayer->GetLineEndList(), SID_LINEEND_LIST ) ); - // andere Anpassungen nach dem Anlegen des DrawLayers + // andere Anpassungen nach dem Anlegen des DrawLayers pDrawLayer->SetNotifyUndoActionHdl( LINK( pDocFunc, ScDocFunc, NotifyDrawUndo ) ); //if (SfxObjectShell::HasSbxObject()) - pDrawLayer->UpdateBasic(); // DocShell-Basic in DrawPages setzen + pDrawLayer->UpdateBasic(); // DocShell-Basic in DrawPages setzen } else { - // always use global color table instead of local copy + // always use global color table instead of local copy PutItem( SvxColorTableItem( XColorTable::GetStdColorTable(), SID_COLOR_TABLE ) ); } if ( !aDocument.GetForbiddenCharacters().is() || !aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning() ) { - // get settings from SvxAsianConfig + // get settings from SvxAsianConfig SvxAsianConfig aAsian( sal_False ); if ( !aDocument.GetForbiddenCharacters().is() ) @@ -218,7 +218,7 @@ void ScDocShell::InitItems() if ( !aDocument.IsValidAsianKerning() ) { // set asian punctuation kerning from configuration if not already set (e.g. XML import) - aDocument.SetAsianKerning( !aAsian.IsKerningWesternTextOnly() ); // reversed + aDocument.SetAsianKerning( !aAsian.IsKerningWesternTextOnly() ); // reversed } } } @@ -255,7 +255,7 @@ ScDrawLayer* ScDocShell::MakeDrawLayer() aDocument.InitDrawLayer(this); pDrawLayer = aDocument.GetDrawLayer(); - InitItems(); // incl. Undo und Basic + InitItems(); // incl. Undo und Basic Broadcast( SfxSimpleHint( SC_HINT_DRWLAYER_NEW ) ); if (nDocumentLock) pDrawLayer->setLock(TRUE); diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 8e0719ad328b..9af5d7771385 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.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 @@ -88,15 +88,15 @@ //------------------------------------------------------------------ // -// Redraw - Benachrichtigungen +// Redraw - Benachrichtigungen // void ScDocShell::PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ) { -// Broadcast( ScEditViewHint( pEditEngine, rCursorPos ) ); +// Broadcast( ScEditViewHint( pEditEngine, rCursorPos ) ); - // Test: nur aktive ViewShell + // Test: nur aktive ViewShell ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if (pViewSh && pViewSh->GetViewData()->GetDocShell() == this) @@ -111,8 +111,8 @@ void ScDocShell::PostDataChanged() Broadcast( SfxSimpleHint( FID_DATACHANGED ) ); aDocument.ResetChanged( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB) ); - SFX_APP()->Broadcast(SfxSimpleHint( FID_ANYDATACHANGED )); // Navigator - //! Navigator direkt benachrichtigen! + SFX_APP()->Broadcast(SfxSimpleHint( FID_ANYDATACHANGED )); // Navigator + //! Navigator direkt benachrichtigen! } void ScDocShell::PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, @@ -157,10 +157,10 @@ void ScDocShell::PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, if ( nStartCol != 0 || nEndCol != MAXCOL ) { - // Extend to whole rows if SC_PF_WHOLEROWS is set, or rotated or non-left - // aligned cells are contained (see UpdatePaintExt). - // Special handling for RTL text (#i9731#) is unnecessary now with full - // support of right-aligned text. + // Extend to whole rows if SC_PF_WHOLEROWS is set, or rotated or non-left + // aligned cells are contained (see UpdatePaintExt). + // Special handling for RTL text (#i9731#) is unnecessary now with full + // support of right-aligned text. if ( ( nExtFlags & SC_PF_WHOLEROWS ) || aDocument.HasAttrib( nStartCol,nStartRow,nStartTab, @@ -209,8 +209,8 @@ void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange ) { if ( ( rExtFlags & SC_PF_LINES ) == 0 && aDocument.HasAttrib( rRange, HASATTR_PAINTEXT ) ) { - // If the range contains lines, shadow or conditional formats, - // set SC_PF_LINES to include one extra cell in all directions. + // If the range contains lines, shadow or conditional formats, + // set SC_PF_LINES to include one extra cell in all directions. rExtFlags |= SC_PF_LINES; } @@ -219,11 +219,11 @@ void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange ) ( rRange.aStart.Col() != 0 || rRange.aEnd.Col() != MAXCOL ) && aDocument.HasAttrib( rRange, HASATTR_ROTATE | HASATTR_RIGHTORCENTER ) ) { - // If the range contains (logically) right- or center-aligned cells, - // or rotated cells, set SC_PF_WHOLEROWS to paint the whole rows. - // This test isn't needed after the cell changes, because it's also - // tested in PostPaint. UpdatePaintExt may later be changed to do this - // only if called before the changes. + // If the range contains (logically) right- or center-aligned cells, + // or rotated cells, set SC_PF_WHOLEROWS to paint the whole rows. + // This test isn't needed after the cell changes, because it's also + // tested in PostPaint. UpdatePaintExt may later be changed to do this + // only if called before the changes. rExtFlags |= SC_PF_WHOLEROWS; } @@ -240,7 +240,7 @@ void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStar void ScDocShell::LockPaint_Impl(BOOL bDoc) { if ( !pPaintLockData ) - pPaintLockData = new ScPaintLockData(0); //! Modus... + pPaintLockData = new ScPaintLockData(0); //! Modus... pPaintLockData->IncLevel(bDoc); } @@ -252,10 +252,10 @@ void ScDocShell::UnlockPaint_Impl(BOOL bDoc) pPaintLockData->DecLevel(bDoc); if (!pPaintLockData->GetLevel(!bDoc) && !pPaintLockData->GetLevel(bDoc)) { - // Paint jetzt ausfuehren + // Paint jetzt ausfuehren ScPaintLockData* pPaint = pPaintLockData; - pPaintLockData = NULL; // nicht weitersammeln + pPaintLockData = NULL; // nicht weitersammeln ScRangeListRef xRangeList = pPaint->GetRangeList(); if (xRangeList) @@ -264,7 +264,7 @@ void ScDocShell::UnlockPaint_Impl(BOOL bDoc) ULONG nCount = xRangeList->Count(); for ( ULONG i=0; i<nCount; i++ ) { - //! nExtFlags ??? + //! nExtFlags ??? ScRange aRange = *xRangeList->GetObject(i); PostPaint( aRange.aStart.Col(), aRange.aStart.Row(), aRange.aStart.Tab(), aRange.aEnd.Col(), aRange.aEnd.Row(), aRange.aEnd.Tab(), @@ -313,17 +313,17 @@ USHORT ScDocShell::GetLockCount() const void ScDocShell::SetLockCount(USHORT nNew) { - if (nNew) // setzen + if (nNew) // setzen { if ( !pPaintLockData ) - pPaintLockData = new ScPaintLockData(0); //! Modus... + pPaintLockData = new ScPaintLockData(0); //! Modus... pPaintLockData->SetLevel(nNew-1, TRUE); LockDocument_Impl(nNew); } - else if (pPaintLockData) // loeschen + else if (pPaintLockData) // loeschen { - pPaintLockData->SetLevel(0, TRUE); // bei Unlock sofort ausfuehren - UnlockPaint_Impl(TRUE); // jetzt + pPaintLockData->SetLevel(0, TRUE); // bei Unlock sofort ausfuehren + UnlockPaint_Impl(TRUE); // jetzt UnlockDocument_Impl(0); } } @@ -372,7 +372,7 @@ void ScDocShell::CalcOutputFactor() { if (bIsInplace) { - nPrtToScreenFactor = 1.0; // passt sonst nicht zur inaktiven Darstellung + nPrtToScreenFactor = 1.0; // passt sonst nicht zur inaktiven Darstellung return; } @@ -393,10 +393,10 @@ void ScDocShell::CalcOutputFactor() Font aDefFont; OutputDevice* pRefDev = GetRefDevice(); MapMode aOldMode = pRefDev->GetMapMode(); - Font aOldFont = pRefDev->GetFont(); + Font aOldFont = pRefDev->GetFont(); pRefDev->SetMapMode(MAP_PIXEL); - pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, pRefDev); // font color doesn't matter here + pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, pRefDev); // font color doesn't matter here pRefDev->SetFont(aDefFont); nPrinterWidth = pRefDev->PixelToLogic( Size( pRefDev->GetTextWidth(aTestString), 0 ), MAP_100TH_MM ).Width(); pRefDev->SetFont(aOldFont); @@ -404,7 +404,7 @@ void ScDocShell::CalcOutputFactor() VirtualDevice aVirtWindow( *Application::GetDefaultDevice() ); aVirtWindow.SetMapMode(MAP_PIXEL); - pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow); // font color doesn't matter here + pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow); // font color doesn't matter here aVirtWindow.SetFont(aDefFont); nWindowWidth = aVirtWindow.GetTextWidth(aTestString); nWindowWidth = (long) ( nWindowWidth / ScGlobal::nScreenPPTX * HMM_PER_TWIPS ); @@ -427,7 +427,7 @@ double ScDocShell::GetOutputFactor() const void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and Load { - // Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions + // Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions USHORT nDefLang, nCjkLang, nCtlLang; BOOL bAutoSpell; @@ -452,14 +452,14 @@ void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and L aDocument.SetDocOptions( aDocOpt ); aDocument.SetViewOptions( aViewOpt ); - // Druck-Optionen werden jetzt direkt vor dem Drucken gesetzt + // Druck-Optionen werden jetzt direkt vor dem Drucken gesetzt aDocument.SetLanguage( (LanguageType) nDefLang, (LanguageType) nCjkLang, (LanguageType) nCtlLang ); } //--------------------------------------------------------------------- -Printer* ScDocShell::GetDocumentPrinter() // fuer OLE +Printer* ScDocShell::GetDocumentPrinter() // fuer OLE { return aDocument.GetPrinter(); } @@ -517,7 +517,7 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags ) SfxViewShell* pSh = pFrame->GetViewShell(); if (pSh && pSh->ISA(ScTabViewShell)) { - ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; + ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; ScInputHandler* pInputHdl = pScMod->GetInputHdl(pViewSh); if (pInputHdl) pInputHdl->UpdateRefDevice(); @@ -533,17 +533,17 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags ) { pOldPrinter->SetJobSetup( pNewPrinter->GetJobSetup() ); - // #i6706# Call SetPrinter with the old printer again, so the drawing layer - // RefDevice is set (calling ReformatAllTextObjects and rebuilding charts), - // because the JobSetup (printer device settings) may affect text layout. + // #i6706# Call SetPrinter with the old printer again, so the drawing layer + // RefDevice is set (calling ReformatAllTextObjects and rebuilding charts), + // because the JobSetup (printer device settings) may affect text layout. aDocument.SetPrinter( pOldPrinter ); - CalcOutputFactor(); // also with the new settings + CalcOutputFactor(); // also with the new settings } } if (nDiffFlags & SFX_PRINTER_OPTIONS) { - aDocument.SetPrintOptions(); //! aus neuem Printer ??? + aDocument.SetPrintOptions(); //! aus neuem Printer ??? } if (nDiffFlags & (SFX_PRINTER_CHG_ORIENTATION | SFX_PRINTER_CHG_SIZE)) @@ -566,7 +566,7 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags ) aNewItem.SetLandscape( bNewLand ); rSet.Put( aNewItem ); - // Groesse umdrehen + // Groesse umdrehen Size aOldSize = ((const SvxSizeItem&)rSet.Get(ATTR_PAGE_SIZE)).GetSize(); Size aNewSize(aOldSize.Height(),aOldSize.Width()); SvxSizeItem aNewSItem(ATTR_PAGE_SIZE,aNewSize); @@ -575,7 +575,7 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags ) } if (nDiffFlags & SFX_PRINTER_CHG_SIZE) { - SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetPaperSize(pNewPrinter) ); + SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetPaperSize(pNewPrinter) ); rSet.Put( aPaperSizeItem ); } } @@ -604,7 +604,7 @@ ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos ) while (pAction) { ScChangeActionType eType = pAction->GetType(); - //! ScViewUtil::IsActionShown( *pAction, *pSettings, *pDoc )... + //! ScViewUtil::IsActionShown( *pAction, *pSettings, *pDoc )... if ( pAction->IsVisible() && eType != SC_CAT_DELETE_TABS ) { const ScBigRange& rBig = pAction->GetBigRange(); @@ -619,7 +619,7 @@ ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos ) if ( aRange.In( rPos ) ) { - pFound = pAction; // der letzte gewinnt + pFound = pAction; // der letzte gewinnt switch ( pAction->GetType() ) { case SC_CAT_CONTENT : @@ -659,10 +659,10 @@ void ScDocShell::SetChangeComment( ScChangeAction* pAction, const String& rComme if (pAction) { pAction->SetComment( rComment ); - //! Undo ??? + //! Undo ??? SetDocumentModified(); - // Dialog-Notify + // Dialog-Notify ScChangeTrack* pTrack = GetDocument()->GetChangeTrack(); if (pTrack) { @@ -674,7 +674,7 @@ void ScDocShell::SetChangeComment( ScChangeAction* pAction, const String& rComme void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext) { - if (!pAction) return; // ohne Aktion ist nichts.. + if (!pAction) return; // ohne Aktion ist nichts.. String aComment = pAction->GetComment(); String aAuthor = pAction->GetUser(); @@ -708,7 +708,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) ScChangeTrack* pTrack = aDocument.GetChangeTrack(); if ( pTrack && pTrack->GetFirst() ) { - //! Changes vorhanden -> Nachfrage ob geloescht werden soll + //! Changes vorhanden -> Nachfrage ob geloescht werden soll } aDocument.EndChangeTracking(); @@ -720,7 +720,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) { aOldUser = pTrack->GetUser(); - // check if comparing to same document + // check if comparing to same document String aThisFile; const SfxMedium* pThisMed = GetMedium(); @@ -737,9 +737,9 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) BOOL bSameDoc = ( aThisFile == aOtherFile && aThisFile.Len() ); if ( !bSameDoc ) { - // create change actions from comparing with the name of the user - // who last saved the document - // (only if comparing different documents) + // create change actions from comparing with the name of the user + // who last saved the document + // (only if comparing different documents) using namespace ::com::sun::star; uno::Reference<document::XDocumentPropertiesSupplier> xDPS( @@ -766,7 +766,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) //--------------------------------------------------------------------- // -// Merge (Aenderungen zusammenfuehren) +// Merge (Aenderungen zusammenfuehren) // //--------------------------------------------------------------------- @@ -774,12 +774,12 @@ inline BOOL lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, BOOL { return pA && pB && pA->GetActionNumber() == pB->GetActionNumber() && - pA->GetType() == pB->GetType() && - pA->GetUser() == pB->GetUser() && + pA->GetType() == pB->GetType() && + pA->GetUser() == pB->GetUser() && (bIgnore100Sec ? pA->GetDateTimeUTC().IsEqualIgnore100Sec( pB->GetDateTimeUTC() ) : pA->GetDateTimeUTC() == pB->GetDateTimeUTC()); - // State nicht vergleichen, falls eine alte Aenderung akzeptiert wurde + // State nicht vergleichen, falls eine alte Aenderung akzeptiert wurde } bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScDocument* pSearchDoc, const ScChangeAction* pFirstSearchAction, const ScChangeAction* pLastSearchAction, BOOL bIgnore100Sec ) @@ -824,11 +824,11 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck ScChangeTrack* pSourceTrack = rOtherDoc.GetChangeTrack(); if (!pSourceTrack) - return; //! nichts zu tun - Fehlermeldung? + return; //! nichts zu tun - Fehlermeldung? ScChangeTrack* pThisTrack = aDocument.GetChangeTrack(); if ( !pThisTrack ) - { // anschalten + { // anschalten aDocument.StartChangeTracking(); pThisTrack = aDocument.GetChangeTrack(); DBG_ASSERT(pThisTrack,"ChangeTracking nicht angeschaltet?"); @@ -845,7 +845,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck BOOL bIgnore100Sec = !pSourceTrack->IsTime100thSeconds() || !pThisTrack->IsTime100thSeconds(); - // gemeinsame Ausgangsposition suchen + // gemeinsame Ausgangsposition suchen ULONG nFirstNewNumber = 0; const ScChangeAction* pSourceAction = pSourceTrack->GetFirst(); const ScChangeAction* pThisAction = pThisTrack->GetFirst(); @@ -856,10 +856,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck pSourceAction = pSourceAction->GetNext(); pThisAction = pThisAction->GetNext(); } - // pSourceAction und pThisAction zeigen jetzt auf die ersten "eigenen" Aktionen - // Die gemeinsamen Aktionen davor interessieren ueberhaupt nicht + // pSourceAction und pThisAction zeigen jetzt auf die ersten "eigenen" Aktionen + // Die gemeinsamen Aktionen davor interessieren ueberhaupt nicht - //! Abfrage, ob die Dokumente vor dem Change-Tracking gleich waren !!! + //! Abfrage, ob die Dokumente vor dem Change-Tracking gleich waren !!! const ScChangeAction* pFirstMergeAction = pSourceAction; @@ -868,7 +868,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck // #i94841# [Collaboration] When deleting rows is rejected, the content is sometimes wrong const ScChangeAction* pLastSearchAction = pThisTrack->GetLast(); - // MergeChangeData aus den folgenden Aktionen erzeugen + // MergeChangeData aus den folgenden Aktionen erzeugen ULONG nNewActionCount = 0; const ScChangeAction* pCount = pSourceAction; while ( pCount ) @@ -878,8 +878,8 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck pCount = pCount->GetNext(); } if (!nNewActionCount) - return; //! nichts zu tun - Fehlermeldung? - // ab hier kein return mehr + return; //! nichts zu tun - Fehlermeldung? + // ab hier kein return mehr ScProgress aProgress( this, String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("...")), @@ -889,8 +889,8 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck // UpdateReference-Undo, gueltige Referenzen fuer den letzten gemeinsamen Zustand pSourceTrack->MergePrepare( (ScChangeAction*) pFirstMergeAction, bShared ); - // MergeChangeData an alle noch folgenden Aktionen in diesem Dokument anpassen - // -> Referenzen gueltig fuer dieses Dokument + // MergeChangeData an alle noch folgenden Aktionen in diesem Dokument anpassen + // -> Referenzen gueltig fuer dieses Dokument while ( pThisAction ) { // #i87049# [Collaboration] Conflict between delete row and insert content is not merged correctly @@ -910,7 +910,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck { const ScChangeActionDel* pDel = (const ScChangeActionDel*) pThisAction; if ( pDel->IsTopDelete() && !pDel->IsTabDeleteCol() ) - { // deleted Table enthaelt deleted Cols, die nicht + { // deleted Table enthaelt deleted Cols, die nicht ULONG nStart, nEnd; pSourceTrack->AppendDeleteRange( pDel->GetOverAllRange().MakeRange(), NULL, nStart, nEnd ); @@ -935,7 +935,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck LockPaint(); // #i73877# no repainting after each action - // MergeChangeData in das aktuelle Dokument uebernehmen + // MergeChangeData in das aktuelle Dokument uebernehmen BOOL bHasRejected = FALSE; String aOldUser = pThisTrack->GetUser(); pThisTrack->SetUseFixDateTime( TRUE ); @@ -968,10 +968,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck //! muss hier noch festgestellt werden, ob wirklich in //! _diesem_ Dokument geloescht? - // liegt in einem Bereich, der in diesem Dokument geloescht wurde - // -> wird weggelassen - //! ??? Loesch-Aktion rueckgaengig machen ??? - //! ??? Aktion irgendwo anders speichern ??? + // liegt in einem Bereich, der in diesem Dokument geloescht wurde + // -> wird weggelassen + //! ??? Loesch-Aktion rueckgaengig machen ??? + //! ??? Aktion irgendwo anders speichern ??? #ifdef DBG_UTIL String aValue; if ( eSourceType == SC_CAT_CONTENT ) @@ -983,7 +983,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck } else { - //! Datum/Autor/Kommentar der Source-Aktion uebernehmen! + //! Datum/Autor/Kommentar der Source-Aktion uebernehmen! pThisTrack->SetUser( pSourceAction->GetUser() ); pThisTrack->SetFixDateTimeUTC( pSourceAction->GetDateTimeUTC() ); @@ -1009,16 +1009,16 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck } else { - // alte Aktion (aus den gemeinsamen) ablehnen + // alte Aktion (aus den gemeinsamen) ablehnen ScChangeAction* pOldAction = pThisTrack->GetAction( nReject ); if (pOldAction && pOldAction->GetState() == SC_CAS_VIRGIN) { - //! was passiert bei Aktionen, die in diesem Dokument accepted worden sind??? - //! Fehlermeldung oder was??? - //! oder Reject-Aenderung normal ausfuehren + //! was passiert bei Aktionen, die in diesem Dokument accepted worden sind??? + //! Fehlermeldung oder was??? + //! oder Reject-Aenderung normal ausfuehren pThisTrack->Reject(pOldAction); - bHasRejected = TRUE; // fuer Paint + bHasRejected = TRUE; // fuer Paint } bExecute = false; } @@ -1026,15 +1026,15 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck if ( bExecute ) { - // normal ausfuehren + // normal ausfuehren ScRange aSourceRange = pSourceAction->GetBigRange().MakeRange(); rMarkData.SelectOneTable( aSourceRange.aStart.Tab() ); switch ( eSourceType ) { case SC_CAT_CONTENT: { - //! Test, ob es ganz unten im Dokument war, dann automatisches - //! Zeilen-Einfuegen ??? + //! Test, ob es ganz unten im Dokument war, dann automatisches + //! Zeilen-Einfuegen ??? DBG_ASSERT( aSourceRange.aStart == aSourceRange.aEnd, "huch?" ); ScAddress aPos = aSourceRange.aStart; @@ -1063,7 +1063,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck EMPTY_STRING, formula::FormulaGrammar::GRAM_DEFAULT ); } break; - case MM_REFERENCE : // do nothing + case MM_REFERENCE : // do nothing break; case MM_FAKE : DBG_WARNING( "MergeDocument: MatrixFlag MM_FAKE" ); @@ -1114,7 +1114,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck { const ScChangeActionDel* pDel = (const ScChangeActionDel*) pSourceAction; if ( pDel->IsTopDelete() && !pDel->IsTabDeleteCol() ) - { // deleted Table enthaelt deleted Cols, die nicht + { // deleted Table enthaelt deleted Cols, die nicht aSourceRange = pDel->GetOverAllRange().MakeRange(); GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELCOLS, TRUE, FALSE ); } @@ -1192,10 +1192,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck pThisTrack->SetUser(aOldUser); pThisTrack->SetUseFixDateTime( FALSE ); - pSourceTrack->Clear(); //! der ist jetzt verhunzt + pSourceTrack->Clear(); //! der ist jetzt verhunzt if (bHasRejected) - PostPaintGridAll(); // Reject() paintet nicht selber + PostPaintGridAll(); // Reject() paintet nicht selber UnlockPaint(); } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 6abc194aa105..353fff9043d4 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.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 @@ using namespace ::com::sun::star; // INCLUDE --------------------------------------------------------------- #if STLPORT_VERSION>=321 -#include <math.h> // prevent conflict between exception and std::exception +#include <math.h> // prevent conflict between exception and std::exception #endif #include "scitems.hxx" @@ -107,7 +107,7 @@ using namespace ::com::sun::star; #include "reffact.hxx" #include "chartlis.hxx" #include "waitoff.hxx" -#include "tablink.hxx" // ScDocumentLoader statics +#include "tablink.hxx" // ScDocumentLoader statics #include "drwlayer.hxx" #include "docoptio.hxx" #include "undostyl.hxx" @@ -137,17 +137,17 @@ using namespace ::com::sun::star; #define IS_AVAILABLE(WhichId,ppItem) \ (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET) -#define SC_PREVIEW_SIZE_X 10000 -#define SC_PREVIEW_SIZE_Y 12400 +#define SC_PREVIEW_SIZE_X 10000 +#define SC_PREVIEW_SIZE_Y 12400 //------------------------------------------------------------------ void ScDocShell::Execute( SfxRequest& rReq ) { - // SID_SC_RANGE (Range), - // SID_SC_CELLTEXT (CellText), - // SID_SC_CELLS (Cells) - removed (old Basic) + // SID_SC_RANGE (Range), + // SID_SC_CELLTEXT (CellText), + // SID_SC_CELLS (Cells) - removed (old Basic) const SfxItemSet* pReqArgs = rReq.GetArgs(); SfxBindings* pBindings = GetViewBindings(); @@ -167,7 +167,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) IS_AVAILABLE( FN_PARAM_3, &pTabItem ) && IS_AVAILABLE( SID_SC_SETTEXT, &pTextItem ) ) { - // Parameter sind 1-based !!! + // Parameter sind 1-based !!! SCCOL nCol = ((SfxInt16Item*)pColItem)->GetValue() - 1; SCROW nRow = ((SfxInt32Item*)pRowItem)->GetValue() - 1; SCTAB nTab = ((SfxInt16Item*)pTabItem)->GetValue() - 1; @@ -186,9 +186,9 @@ void ScDocShell::Execute( SfxRequest& rReq ) rReq.Done(); break; } - else // geschuetzte Zelle + else // geschuetzte Zelle { - SbxBase::SetError( SbxERR_BAD_PARAMETER ); //! welchen Fehler ? + SbxBase::SetError( SbxERR_BAD_PARAMETER ); //! welchen Fehler ? break; } } @@ -198,13 +198,13 @@ void ScDocShell::Execute( SfxRequest& rReq ) break; - // SID_SBA_QRY_CHANGETARGET gibts nicht mehr - auch in idl raus + // SID_SBA_QRY_CHANGETARGET gibts nicht mehr - auch in idl raus case SID_SBA_IMPORT: { if (pReqArgs) { - const sal_Unicode cSbaSep = 11; // Trennzeichen + const sal_Unicode cSbaSep = 11; // Trennzeichen const SfxPoolItem* pItem; String sSbaData, sTarget; @@ -213,7 +213,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET ) sTarget = ((const SfxStringItem*)pItem)->GetValue(); - BOOL bIsNewArea = TRUE; // Default TRUE (keine Nachfrage) + BOOL bIsNewArea = TRUE; // Default TRUE (keine Nachfrage) if ( pReqArgs->GetItemState( FN_PARAM_2, TRUE, &pItem ) == SFX_ITEM_SET ) bIsNewArea = ((const SfxBoolItem*)pItem)->GetValue(); @@ -222,13 +222,13 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( pReqArgs->GetItemState( FN_PARAM_3, FALSE, &pItem ) == SFX_ITEM_SET && pItem ) xResultSet.set(((const SfxUsrAnyItem*)pItem)->GetValue(),::com::sun::star::uno::UNO_QUERY); - String sDBName = sSbaData.GetToken(0,cSbaSep); // Datenbankname - String sDBTable = sSbaData.GetToken(1,cSbaSep); // Tabellen- oder Query-Name + String sDBName = sSbaData.GetToken(0,cSbaSep); // Datenbankname + String sDBTable = sSbaData.GetToken(1,cSbaSep); // Tabellen- oder Query-Name String sTabFlag = sSbaData.GetToken(2,cSbaSep); - String sDBSql = sSbaData.GetToken(3,cSbaSep); // SQL im Klartext + String sDBSql = sSbaData.GetToken(3,cSbaSep); // SQL im Klartext - BYTE nType = ScDbTable; // "0" oder "1" - if ( sTabFlag.EqualsAscii("0") ) // "0" = Query, "1" = Table (Default) + BYTE nType = ScDbTable; // "0" oder "1" + if ( sTabFlag.EqualsAscii("0") ) // "0" = Query, "1" = Table (Default) nType = ScDbQuery; SbaSelectionListRef pSelectionList = new SbaSelectionList; @@ -289,7 +289,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) pSelectionList ); rReq.Done(); - // UpdateImport aktualisiert auch die internen Operationen + // UpdateImport aktualisiert auch die internen Operationen } else rReq.Ignore(); @@ -310,12 +310,12 @@ void ScDocShell::Execute( SfxRequest& rReq ) { ScDocument* pDoc = GetDocument(); // BOOL bUndo (pDoc->IsUndoEnabled()); - const SfxPoolItem* pItem; - String aChartName, aRangeName; + const SfxPoolItem* pItem; + String aChartName, aRangeName; - ScRange aSingleRange; - ScRangeListRef aRangeListRef; - BOOL bMultiRange = FALSE; + ScRange aSingleRange; + ScRangeListRef aRangeListRef; + BOOL bMultiRange = FALSE; BOOL bColHeaders = TRUE; BOOL bRowHeaders = TRUE; @@ -349,17 +349,17 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( aRangeListRef->Count() ) { bMultiRange = TRUE; - aSingleRange = *aRangeListRef->GetObject(0); // fuer Header + aSingleRange = *aRangeListRef->GetObject(0); // fuer Header bValid = TRUE; } else aRangeListRef.Clear(); } - ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); + ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if (pViewSh && bValid && aChartName.Len() != 0 ) { - Window* pParent = pViewSh->GetDialogParent(); + Window* pParent = pViewSh->GetDialogParent(); SCCOL nCol1 = aSingleRange.aStart.Col(); SCROW nRow1 = aSingleRange.aStart.Row(); @@ -367,7 +367,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) SCROW nRow2 = aSingleRange.aEnd.Row(); SCTAB nTab = aSingleRange.aStart.Tab(); - //! immer oder gar nicht begrenzen ??? + //! immer oder gar nicht begrenzen ??? if (!bMultiRange) aDocument.LimitChartArea( nTab, nCol1,nRow1, nCol2,nRow2 ); @@ -407,7 +407,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) delete pDlg; } - if (bOk) // ausfuehren + if (bOk) // ausfuehren { if (bMultiRange) { @@ -453,13 +453,13 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, TRUE, &pItem ) ) bNewVal = ((const SfxBoolItem*)pItem)->GetValue(); else - bNewVal = !aDocument.GetAutoCalc(); // Toggle fuer Menue + bNewVal = !aDocument.GetAutoCalc(); // Toggle fuer Menue aDocument.SetAutoCalc( bNewVal ); SetDocumentModified(); if (pBindings) { pBindings->Invalidate( FID_AUTO_CALC ); -// pBindings->Invalidate( FID_RECALC ); // jetzt immer enabled +// pBindings->Invalidate( FID_RECALC ); // jetzt immer enabled } rReq.AppendItem( SfxBoolItem( FID_AUTO_CALC, bNewVal ) ); rReq.Done(); @@ -519,8 +519,8 @@ void ScDocShell::Execute( SfxRequest& rReq ) case SID_REIMPORT_AFTER_LOAD: { - // wird nach dem Laden aufgerufen, wenn DB-Bereiche mit - // weggelassenen Daten enthalten sind + // wird nach dem Laden aufgerufen, wenn DB-Bereiche mit + // weggelassenen Daten enthalten sind BOOL bDone = FALSE; ScDBCollection* pDBColl = aDocument.GetDBCollection(); @@ -546,27 +546,27 @@ void ScDocShell::Execute( SfxRequest& rReq ) pDBData->GetArea(aRange); pViewSh->MarkRange(aRange); - // Import und interne Operationen wie SID_REFRESH_DBAREA - // (Abfrage auf Import hier nicht noetig) + // Import und interne Operationen wie SID_REFRESH_DBAREA + // (Abfrage auf Import hier nicht noetig) ScImportParam aImportParam; pDBData->GetImportParam( aImportParam ); BOOL bContinue = pViewSh->ImportData( aImportParam ); pDBData->SetImportParam( aImportParam ); - // markieren (Groesse kann sich geaendert haben) + // markieren (Groesse kann sich geaendert haben) pDBData->GetArea(aRange); pViewSh->MarkRange(aRange); - if ( bContinue ) // #41905# Fehler beim Import -> Abbruch + if ( bContinue ) // #41905# Fehler beim Import -> Abbruch { - // interne Operationen, wenn welche gespeichert + // interne Operationen, wenn welche gespeichert if ( pDBData->HasQueryParam() || pDBData->HasSortParam() || pDBData->HasSubTotalParam() ) pViewSh->RepeatDB(); - // Pivottabellen die den Bereich als Quelldaten haben + // Pivottabellen die den Bereich als Quelldaten haben RefreshPivotTables(aRange); } @@ -579,10 +579,10 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( !bDone && pDBColl ) { - // wenn nicht, dann aber die abhaengigen Formeln updaten + // wenn nicht, dann aber die abhaengigen Formeln updaten //! auch fuer einzelne Bereiche, die nicht aktualisiert werden koennen - aDocument.CalcAll(); //! nur die abhaengigen + aDocument.CalcAll(); //! nur die abhaengigen PostDataChanged(); } @@ -600,7 +600,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) case SID_GET_COLORTABLE: { - // passende ColorTable ist per PutItem gesetzt worden + // passende ColorTable ist per PutItem gesetzt worden SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE); XColorTable* pTable = pColItem->GetColorTable(); rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable)); @@ -745,12 +745,12 @@ void ScDocShell::Execute( SfxRequest& rReq ) nVersion = ((const SfxInt16Item*)pItem)->GetValue(); } - // kein Filter angegeben -> Detection + // kein Filter angegeben -> Detection if ( !aFilterName.Len() ) ScDocumentLoader::GetFilterName( aFileName, aFilterName, aOptions, TRUE, FALSE ); - // filter name from dialog contains application prefix, - // GetFilter needs name without the prefix. + // filter name from dialog contains application prefix, + // GetFilter needs name without the prefix. ScDocumentLoader::RemoveAppPrefix( aFilterName ); const SfxFilter* pFilter = ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName( aFilterName ); @@ -774,7 +774,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) return ; } - if ( pMed ) // nun wirklich ausfuehren... + if ( pMed ) // nun wirklich ausfuehren... { SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, pMed->GetName() ); @@ -783,9 +783,9 @@ void ScDocShell::Execute( SfxRequest& rReq ) pOtherDocSh->DoLoad( pMed ); ULONG nErr = pOtherDocSh->GetErrorCode(); if (nErr) - ErrorHandler::HandleError( nErr ); // auch Warnings + ErrorHandler::HandleError( nErr ); // auch Warnings - if ( !pOtherDocSh->GetError() ) // nur Errors + if ( !pOtherDocSh->GetError() ) // nur Errors { BOOL bHadTrack = ( aDocument.GetChangeTrack() != NULL ); ULONG nStart = 0; @@ -799,7 +799,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) else MergeDocument( *pOtherDocSh->GetDocument() ); - // show "accept changes" dialog + // show "accept changes" dialog //! get view for this document! if ( !IsDocShared() ) { @@ -814,10 +814,10 @@ void ScDocShell::Execute( SfxRequest& rReq ) } } - rReq.SetReturnValue( SfxInt32Item( nSlot, 0 ) ); //! ??????? + rReq.SetReturnValue( SfxInt32Item( nSlot, 0 ) ); //! ??????? rReq.Done(); - if (!bHadTrack) // neu eingeschaltet -> auch anzeigen + if (!bHadTrack) // neu eingeschaltet -> auch anzeigen { ScChangeViewSettings* pOldSet = aDocument.GetChangeViewSettings(); if ( !pOldSet || !pOldSet->ShowChanges() ) @@ -846,7 +846,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) } } } - pOtherDocSh->DoClose(); // delete passiert mit der Ref + pOtherDocSh->DoClose(); // delete passiert mit der Ref } } break; @@ -863,12 +863,12 @@ void ScDocShell::Execute( SfxRequest& rReq ) SCTAB nTab; if (aDocument.GetTable( aName, nTab )) { - // DeleteTable von viewfunc nach docfunc verschieben! + // DeleteTable von viewfunc nach docfunc verschieben! ScTabViewShell* pSh = GetBestViewShell(); if ( pSh ) { - //! SetTabNo in DeleteTable weglassen? + //! SetTabNo in DeleteTable weglassen? SCTAB nDispTab = pSh->GetViewData()->GetTabNo(); pSh->DeleteTable( nTab ); pSh->SetTabNo(nDispTab); @@ -1238,16 +1238,16 @@ void ScDocShell::DoRecalc( BOOL bApi ) ScInputHandler* pHdl = SC_MOD()->GetInputHdl(pSh); if ( pHdl && pHdl->IsInputMode() && pHdl->IsFormulaMode() && !bApi ) { - pHdl->FormulaPreview(); // Teilergebnis als QuickHelp + pHdl->FormulaPreview(); // Teilergebnis als QuickHelp bDone = TRUE; } else { - pSh->UpdateInputLine(); // InputEnterHandler + pSh->UpdateInputLine(); // InputEnterHandler pSh->UpdateInputHandler(); } } - if (!bDone) // sonst Dokument neu berechnen + if (!bDone) // sonst Dokument neu berechnen { WaitObject aWaitObj( GetActiveDialogParent() ); aDocument.CalcFormulaTree(); @@ -1256,9 +1256,9 @@ void ScDocShell::DoRecalc( BOOL bApi ) aDocument.BroadcastUno( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); - // #47939# Wenn es Charts gibt, dann alles painten, damit nicht - // PostDataChanged und die Charts nacheinander kommen und Teile - // doppelt gepainted werden. + // #47939# Wenn es Charts gibt, dann alles painten, damit nicht + // PostDataChanged und die Charts nacheinander kommen und Teile + // doppelt gepainted werden. ScChartListenerCollection* pCharts = aDocument.GetChartListenerCollection(); if ( pCharts && pCharts->GetCount() ) @@ -1274,11 +1274,11 @@ void ScDocShell::DoHardRecalc( BOOL /* bApi */ ) ScTabViewShell* pSh = GetBestViewShell(); if ( pSh ) { - pSh->UpdateInputLine(); // InputEnterHandler + pSh->UpdateInputLine(); // InputEnterHandler pSh->UpdateInputHandler(); } aDocument.CalcAll(); - GetDocFunc().DetectiveRefresh(); // erzeugt eigenes Undo + GetDocFunc().DetectiveRefresh(); // erzeugt eigenes Undo if ( pSh ) pSh->UpdateCharts(TRUE); @@ -1346,7 +1346,7 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) String aNewName = pStyle->GetName(); String aOldName = aNewName; - BOOL bExtended = rHint.ISA(SfxStyleSheetHintExtended); // Name geaendert? + BOOL bExtended = rHint.ISA(SfxStyleSheetHintExtended); // Name geaendert? if (bExtended) aOldName = ((SfxStyleSheetHintExtended&)rHint).GetOldName(); @@ -1355,7 +1355,7 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) SCTAB nTabCount = aDocument.GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) - if (aDocument.GetPageStyle(nTab) == aNewName) // schon auf neu angepasst + if (aDocument.GetPageStyle(nTab) == aNewName) // schon auf neu angepasst { aDocument.PageStyleModified( nTab, aNewName ); ScPrintFunc aPrintFunc( this, GetPrinter(), nTab ); @@ -1393,14 +1393,14 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) if (pList) pList->RenameCellStyle( aOldName,aNewName ); } - } + } } - // alles andere geht ueber Slots... + // alles andere geht ueber Slots... } -// wie in printfun.cxx -#define ZOOM_MIN 10 +// wie in printfun.cxx +#define ZOOM_MIN 10 void ScDocShell::SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages ) { @@ -1453,7 +1453,7 @@ BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange ) const ScRange* pRepeatCol = aDocument.GetRepeatColRange( nTab ); const ScRange* pRepeatRow = aDocument.GetRepeatRowRange( nTab ); - // benoetigte Skalierung fuer Selektion ausrechnen + // benoetigte Skalierung fuer Selektion ausrechnen USHORT nNewScale = nOldScale; @@ -1495,7 +1495,7 @@ BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange ) aOldPrFunc.GetScaleData( aPhysPage, nHdr, nFtr ); nBlkTwipsY += nHdr + nFtr; - if ( nBlkTwipsX == 0 ) // #100639# hidden columns/rows may lead to 0 + if ( nBlkTwipsX == 0 ) // #100639# hidden columns/rows may lead to 0 nBlkTwipsX = 1; if ( nBlkTwipsY == 0 ) nBlkTwipsY = 1; @@ -1503,7 +1503,7 @@ BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange ) long nNeeded = Min( aPhysPage.Width() * 100 / nBlkTwipsX, aPhysPage.Height() * 100 / nBlkTwipsY ); if ( nNeeded < ZOOM_MIN ) - nNeeded = ZOOM_MIN; // Begrenzung + nNeeded = ZOOM_MIN; // Begrenzung if ( nNeeded < (long) nNewScale ) nNewScale = (USHORT) nNeeded; @@ -1528,10 +1528,10 @@ void ScDocShell::PageStyleModified( const String& rStyleName, BOOL bApi ) nUseTab = nTab; // bei bApi nur, wenn Umbrueche schon angezeigt - if (ValidTab(nUseTab)) // nicht verwendet -> nichts zu tun + if (ValidTab(nUseTab)) // nicht verwendet -> nichts zu tun { - ScPrintFunc aPrintFunc( this, GetPrinter(), nUseTab ); //! ohne CountPages auskommen - if (!aPrintFunc.UpdatePages()) // setzt Umbrueche auf allen Tabs + ScPrintFunc aPrintFunc( this, GetPrinter(), nUseTab ); //! ohne CountPages auskommen + if (!aPrintFunc.UpdatePages()) // setzt Umbrueche auf allen Tabs bWarn = TRUE; if (bWarn && !bApi) @@ -1556,13 +1556,13 @@ void ScDocShell::PageStyleModified( const String& rStyleName, BOOL bApi ) void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, SfxRequest& rReq, - SCTAB nCurTab ) + SCTAB nCurTab ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); switch ( rReq.GetSlot() ) { - case SID_STATUS_PAGESTYLE: // Click auf StatusBar-Control + case SID_STATUS_PAGESTYLE: // Click auf StatusBar-Control case SID_FORMATPAGE: { if ( pReqArgs != NULL ) @@ -1584,7 +1584,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, if (bUndo) aOldData.InitFromStyle( pStyleSheet ); - SfxItemSet& rStyleSet = pStyleSheet->GetItemSet(); + SfxItemSet& rStyleSet = pStyleSheet->GetItemSet(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); @@ -1682,7 +1682,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, } else { - // #69193a# respect "shared" setting + // #69193a# respect "shared" setting if ( !bHeaderOn && bFooterOn ) nResId = bShareFooter ? RID_SCDLG_HFEDIT_RIGHTFOOTER : @@ -1772,8 +1772,8 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, } void ScDocShell::GetStatePageStyle( SfxViewShell& /* rCaller */, - SfxItemSet& rSet, - SCTAB nCurTab ) + SfxItemSet& rSet, + SCTAB nCurTab ) { SfxWhichIter aIter(rSet); USHORT nWhich = aIter.FirstWhich(); @@ -1787,9 +1787,9 @@ void ScDocShell::GetStatePageStyle( SfxViewShell& /* rCaller */, case SID_HFEDIT: { - String aStr = aDocument.GetPageStyle( nCurTab ); - ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aStr, SFX_STYLE_FAMILY_PAGE ); + String aStr = aDocument.GetPageStyle( nCurTab ); + ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aStr, SFX_STYLE_FAMILY_PAGE ); DBG_ASSERT( pStyleSheet, "PageStyle not found! :-/" ); @@ -1940,12 +1940,12 @@ void ScDocShell::PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData return; } - delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob() - pOldJobSetup = new ScJobSetup( pPrinter ); // Einstellungen merken + delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob() + pOldJobSetup = new ScJobSetup( pPrinter ); // Einstellungen merken - // Einstellungen fuer die erste gedruckte Seite muessen hier (vor StartJob) gesetzt werden - //! Selection etc. mit Print() zusammenfassen !!! - //! Seiten nur einmal zaehlen + // Einstellungen fuer die erste gedruckte Seite muessen hier (vor StartJob) gesetzt werden + //! Selection etc. mit Print() zusammenfassen !!! + //! Seiten nur einmal zaehlen bool bHasOptions = false; ScPrintOptions aOptions; @@ -1959,7 +1959,7 @@ void ScDocShell::PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData pMarkData, bHasOptions, aOptions, bAllTabs, nTotalPages, aPageArr, aPageRanges, &pMarkedRange ); - BOOL bFound = FALSE; // erste Seite gefunden + BOOL bFound = FALSE; // erste Seite gefunden long nTabStart = 0; SCTAB nTabCount = aDocument.GetTableCount(); for ( SCTAB nTab=0; nTab<nTabCount && !bFound; nTab++ ) @@ -1968,15 +1968,15 @@ void ScDocShell::PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData { long nNext = nTabStart + aPageArr[nTab]; BOOL bSelected = FALSE; - for (long nP=nTabStart+1; nP<=nNext; nP++) // 1-basiert - if (aPageRanges.IsSelected( nP )) // eine Seite von dieser Tabelle selektiert? + for (long nP=nTabStart+1; nP<=nNext; nP++) // 1-basiert + if (aPageRanges.IsSelected( nP )) // eine Seite von dieser Tabelle selektiert? bSelected = TRUE; if (bSelected) { ScPrintFunc aPrintFunc( this, pPrinter, nTab ); - aPrintFunc.ApplyPrintSettings(); // dann Settings fuer diese Tabelle + aPrintFunc.ApplyPrintSettings(); // dann Settings fuer diese Tabelle bFound = TRUE; } nTabStart = nNext; @@ -2050,7 +2050,7 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, if ( pPrintDialog && pPrintDialog->IsCollateEnabled() && pPrintDialog->IsCollateChecked() ) nCollateCopies = pPrintDialog->GetCopyCount(); - // test if printed range contains transparent objects + // test if printed range contains transparent objects BOOL bHasTransp = FALSE; BOOL bAnyPrintRanges = aDocument.HasPrintRange(); @@ -2104,7 +2104,7 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, Rectangle aFull( 0, 0, LONG_MAX, LONG_MAX ); // #114135# - ScDrawLayer* pModel = aDocument.GetDrawLayer(); // ist nicht NULL + ScDrawLayer* pModel = aDocument.GetDrawLayer(); // ist nicht NULL if(pModel) { @@ -2122,7 +2122,7 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, nDisplayStart = 0; else nDisplayStart += aPageArr[nTab]; - nAttrPage = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage + nAttrPage = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage delete pDrawView; } @@ -2137,7 +2137,7 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, // an odd number of pages, print an empty page between copies, so the first page of // the second copy isn't printed on the back of the last page of the first copy. // (same as in Writer ViewShell::Prt) - + // FIXME: needs to be adapted to XRenderable interface pPrinter->StartPage(); pPrinter->EndPage(); @@ -2151,8 +2151,8 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, if (pOldJobSetup) { pPrinter->SetOrientation( pOldJobSetup->eOrientation ); - pPrinter->SetPaperBin ( pOldJobSetup->nPaperBin ); - pPrinter->SetPaper ( pOldJobSetup->ePaper ); + pPrinter->SetPaperBin ( pOldJobSetup->nPaperBin ); + pPrinter->SetPaper ( pOldJobSetup->ePaper ); if ( PAPER_USER == pOldJobSetup->ePaper ) { @@ -2166,15 +2166,15 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, if ( bHasOptions ) { - // remove PrintOptions from printer ItemSet, - // so next time the options from the configuration are used + // remove PrintOptions from printer ItemSet, + // so next time the options from the configuration are used SfxItemSet aSet( pPrinter->GetOptions() ); aSet.ClearItem( SID_SCPRINTOPTIONS ); pPrinter->SetOptions( aSet ); } - PostPaintGridAll(); //! nur wenn geaendert + PostPaintGridAll(); //! nur wenn geaendert } void ScDocShell::GetState( SfxItemSet &rSet ) @@ -2220,13 +2220,13 @@ void ScDocShell::GetState( SfxItemSet &rSet ) } break; - // Wenn eine Formel editiert wird, muss FID_RECALC auf jeden Fall enabled sein. - // Recalc fuer das Doc war mal wegen #29898# disabled, wenn AutoCalc an war, - // ist jetzt wegen #41540# aber auch immer enabled. -// case FID_RECALC: -// if ( aDocument.GetAutoCalc() ) -// rSet.DisableItem( nWhich ); -// break; + // Wenn eine Formel editiert wird, muss FID_RECALC auf jeden Fall enabled sein. + // Recalc fuer das Doc war mal wegen #29898# disabled, wenn AutoCalc an war, + // ist jetzt wegen #41540# aber auch immer enabled. +// case FID_RECALC: +// if ( aDocument.GetAutoCalc() ) +// rSet.DisableItem( nWhich ); +// break; case SID_TABLES_COUNT: rSet.Put( SfxInt16Item( nWhich, aDocument.GetTableCount() ) ); @@ -2258,25 +2258,25 @@ void ScDocShell::GetState( SfxItemSet &rSet ) void ScDocShell::GetSbxState( SfxItemSet &rSet ) { - // SID_SC_SELECTION (Selection), - // SID_SC_ACTIVECELL (ActiveCell), - // SID_SC_ACTIVETAB (ActiveTable), - // SID_TABLES_GET (Tables), - // SID_PIVOT_GET (DataPilotTables) - removed (old Basic) + // SID_SC_SELECTION (Selection), + // SID_SC_ACTIVECELL (ActiveCell), + // SID_SC_ACTIVETAB (ActiveTable), + // SID_TABLES_GET (Tables), + // SID_PIVOT_GET (DataPilotTables) - removed (old Basic) // - // Wenn hier Slots von der View-Shell executed werden, muss auch der - // GetState weitergeleitet werden! + // Wenn hier Slots von der View-Shell executed werden, muss auch der + // GetState weitergeleitet werden! // - ScTabViewShell* pVisibleSh = GetBestViewShell(); // sichtbare View + ScTabViewShell* pVisibleSh = GetBestViewShell(); // sichtbare View if ( pVisibleSh ) pVisibleSh->GetState( rSet ); } void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup */, USHORT nAspect ) { -// bIsOle = TRUE; // jetzt ueber den CreateMode +// bIsOle = TRUE; // jetzt ueber den CreateMode SCTAB nVisTab = aDocument.GetVisibleTab(); if (!aDocument.HasTable(nVisTab)) @@ -2312,14 +2312,14 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const SfxObjectCreateMode eShellMode = GetCreateMode(); if ( eShellMode == SFX_CREATE_MODE_ORGANIZER ) { - // ohne Inhalte wissen wir auch nicht, wie gross die Inhalte sind - // leeres Rechteck zurueckgeben, das wird dann nach dem Laden berechnet + // ohne Inhalte wissen wir auch nicht, wie gross die Inhalte sind + // leeres Rechteck zurueckgeben, das wird dann nach dem Laden berechnet return Rectangle(); } if( nAspect == ASPECT_THUMBNAIL ) { -// Rectangle aArea( 0,0, 3175,3175 ); // 120x120 Pixel in 1:1 +// Rectangle aArea( 0,0, 3175,3175 ); // 120x120 Pixel in 1:1 Rectangle aArea( 0,0, SC_PREVIEW_SIZE_X,SC_PREVIEW_SIZE_Y ); BOOL bNegativePage = aDocument.IsNegativePage( aDocument.GetVisibleTab() ); if ( bNegativePage ) @@ -2329,7 +2329,7 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const } else if( nAspect == ASPECT_CONTENT && eShellMode != SFX_CREATE_MODE_EMBEDDED ) { - // Visarea holen wie nach Load + // Visarea holen wie nach Load SCTAB nVisTab = aDocument.GetVisibleTab(); if (!aDocument.HasTable(nVisTab)) @@ -2358,9 +2358,9 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const } void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, - SCTAB nCurTab, - BOOL& rbHeader, - BOOL& rbFooter ) + SCTAB nCurTab, + BOOL& rbHeader, + BOOL& rbFooter ) { if ( !pStyleSet ) { @@ -2381,8 +2381,8 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, //-------------------------------------------------------------------- - const SvxSetItem* pSetItem = NULL; - const SfxItemSet* pSet = NULL; + const SvxSetItem* pSetItem = NULL; + const SfxItemSet* pSet = NULL; pSetItem = (const SvxSetItem*) &pStyleSet->Get( ATTR_PAGE_HEADERSET ); pSet = &pSetItem->GetItemSet(); @@ -2409,7 +2409,7 @@ long __EXPORT ScDocShell::DdeGetData( const String& rItem, } ScImportExport aObj( &aDocument, rItem ); if ( !aObj.IsRef() ) - return 0; // ungueltiger Bereich + return 0; // ungueltiger Bereich if( aDdeTextFmt.GetChar(0) == 'F' ) aObj.SetFormulas( TRUE ); @@ -2483,7 +2483,7 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem, ::sfx2::SvLinkSource* __EXPORT ScDocShell::DdeCreateLinkSource( const String& rItem ) { - // only check for valid item string - range is parsed again in ScServerObject ctor + // only check for valid item string - range is parsed again in ScServerObject ctor // named range? String aPos = rItem; @@ -2497,11 +2497,11 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem, if( pData->HasType( RT_REFAREA ) || pData->HasType( RT_ABSAREA ) || pData->HasType( RT_ABSPOS ) ) - pData->GetSymbol( aPos ); // continue with the name's contents + pData->GetSymbol( aPos ); // continue with the name's contents } } - // Address in DDE function must be always parsed as CONV_OOO so that it + // Address in DDE function must be always parsed as CONV_OOO so that it // would always work regardless of current address convension. We do this // because the address item in a DDE entry is *not* normalized when saved // into ODF. @@ -2509,11 +2509,11 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem, bool bValid = ( (aRange.Parse(aPos, &aDocument, formula::FormulaGrammar::CONV_OOO ) & SCA_VALID) || (aRange.aStart.Parse(aPos, &aDocument, formula::FormulaGrammar::CONV_OOO) & SCA_VALID) ); - ScServerObject* pObj = NULL; // NULL = error + ScServerObject* pObj = NULL; // NULL = error if ( bValid ) pObj = new ScServerObject( this, rItem ); - // GetLinkManager()->InsertServer() is in the ScServerObject ctor + // GetLinkManager()->InsertServer() is in the ScServerObject ctor return pObj; } @@ -2531,7 +2531,7 @@ ScViewData* ScDocShell::GetViewData() SCTAB ScDocShell::GetCurTab() { - //! this must be made non-static and use a ViewShell from this document! + //! this must be made non-static and use a ViewShell from this document! ScViewData* pViewData = GetViewData(); @@ -2559,7 +2559,7 @@ ScTabViewShell* ScDocShell::GetBestViewShell( BOOL bOnlyVisible ) SfxBindings* ScDocShell::GetViewBindings() { - // used to invalidate slots after changes to this document + // used to invalidate slots after changes to this document SfxViewShell* pViewSh = GetBestViewShell(); if (pViewSh) @@ -2570,10 +2570,10 @@ SfxBindings* ScDocShell::GetViewBindings() //------------------------------------------------------------------ -ScDocShell* ScDocShell::GetShellByNum( USHORT nDocNo ) // static +ScDocShell* ScDocShell::GetShellByNum( USHORT nDocNo ) // static { ScDocShell* pFound = NULL; - SfxObjectShell* pShell = SfxObjectShell::GetFirst(); + SfxObjectShell* pShell = SfxObjectShell::GetFirst(); USHORT nShellCnt = 0; while ( pShell && !pFound ) diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index e852ca29a948..676c201a3ed1 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -74,12 +74,12 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String // --------------------------------------------------------------------------- // -// former viewfunc/dbfunc methods +// former viewfunc/dbfunc methods // void ScDocShell::ErrorMessage( USHORT nGlobStrId ) { - //! StopMarking an der (aktiven) View? + //! StopMarking an der (aktiven) View? Window* pParent = GetActiveDialogParent(); ScWaitCursorOff aWaitOff( pParent ); @@ -119,7 +119,7 @@ void ScDocShell::DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCR ScDBData* lcl_GetDBNearCursor( ScDBCollection* pColl, SCCOL nCol, SCROW nRow, SCTAB nTab ) { - //! nach document/dbcolect verschieben + //! nach document/dbcolect verschieben if (!pColl) return NULL; @@ -143,15 +143,15 @@ ScDBData* lcl_GetDBNearCursor( ScDBCollection* pColl, SCCOL nCol, SCROW nRow, SC else if ( nCol < nStartCol || nCol > nEndCol || nRow < nStartRow || nRow > nEndRow ) { if (!pNearData) - pNearData = pDB; // ersten angrenzenden Bereich merken + pNearData = pDB; // ersten angrenzenden Bereich merken } else - return pDB; // nicht "unbenannt" und Cursor steht wirklich drin + return pDB; // nicht "unbenannt" und Cursor steht wirklich drin } } if (pNearData) - return pNearData; // angrenzender, wenn nichts direkt getroffen - return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden + return pNearData; // angrenzender, wenn nichts direkt getroffen + return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden } ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel ) @@ -167,9 +167,9 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe SCROW nEndRow = rMarked.aEnd.Row(); SCTAB nEndTab = rMarked.aEnd.Tab(); - // Wegen #49655# nicht einfach GetDBAtCursor: Der zusammenhaengende Datenbereich - // fuer "unbenannt" (GetDataArea) kann neben dem Cursor legen, also muss auch ein - // benannter DB-Bereich dort gesucht werden. + // Wegen #49655# nicht einfach GetDBAtCursor: Der zusammenhaengende Datenbereich + // fuer "unbenannt" (GetDataArea) kann neben dem Cursor legen, also muss auch ein + // benannter DB-Bereich dort gesucht werden. ScDBData* pData = aDocument.GetDBAtArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); if (!pData) @@ -182,7 +182,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe BOOL bUseThis = FALSE; if (pData) { - // Bereich nehmen, wenn nichts anderes markiert + // Bereich nehmen, wenn nichts anderes markiert SCTAB nDummy; SCCOL nOldCol1; @@ -213,10 +213,10 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe } aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE, bOnlyDown ); if ( nOldCol1 != nStartCol || nOldCol2 != nEndCol || nOldRow1 != nStartRow ) - bUseThis = FALSE; // passt gar nicht + bUseThis = FALSE; // passt gar nicht else if ( nOldRow2 != nEndRow ) { - // Bereich auf neue End-Zeile erweitern + // Bereich auf neue End-Zeile erweitern pData->SetArea( nTab, nOldCol1,nOldRow1, nOldCol2,nEndRow ); } } @@ -224,13 +224,13 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe else { if ( nOldCol1 == nStartCol && nOldRow1 == nStartRow && - nOldCol2 == nEndCol && nOldRow2 == nEndRow ) // genau markiert? + nOldCol2 == nEndCol && nOldRow2 == nEndRow ) // genau markiert? bUseThis = TRUE; else - bUseThis = FALSE; // immer Markierung nehmen (Bug 11964) + bUseThis = FALSE; // immer Markierung nehmen (Bug 11964) } - // fuer Import nie "unbenannt" nehmen + // fuer Import nie "unbenannt" nehmen if ( bUseThis && eMode == SC_DB_IMPORT && bIsNoName ) bUseThis = FALSE; @@ -243,20 +243,20 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe } else if ( eMode == SC_DB_OLD ) { - pData = NULL; // nichts gefunden + pData = NULL; // nichts gefunden nStartCol = nEndCol = nCol; nStartRow = nEndRow = nRow; nStartTab = nEndTab = nTab; -// bMark = FALSE; // nichts zu markieren +// bMark = FALSE; // nichts zu markieren } else { if ( bSelected ) { -// bMark = FALSE; +// bMark = FALSE; } else - { // zusammenhaengender Bereich + { // zusammenhaengender Bereich nStartCol = nCol; nStartRow = nRow; if (bOnlyDown) @@ -289,19 +289,19 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe pOldAutoDBRange = new ScDBData( *pNoNameData ); } - SCCOL nOldX1; // alten Bereich sauber wegnehmen - SCROW nOldY1; //! (UNDO ???) + SCCOL nOldX1; // alten Bereich sauber wegnehmen + SCROW nOldY1; //! (UNDO ???) SCCOL nOldX2; SCROW nOldY2; SCTAB nOldTab; pNoNameData->GetArea( nOldTab, nOldX1, nOldY1, nOldX2, nOldY2 ); DBAreaDeleted( nOldTab, nOldX1, nOldY1, nOldX2, nOldY2 ); - pNoNameData->SetSortParam( ScSortParam() ); // Parameter zuruecksetzen + pNoNameData->SetSortParam( ScSortParam() ); // Parameter zuruecksetzen pNoNameData->SetQueryParam( ScQueryParam() ); pNoNameData->SetSubTotalParam( ScSubTotalParam() ); - pNoNameData->SetArea( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); // neu setzen + pNoNameData->SetArea( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); // neu setzen pNoNameData->SetByRow( TRUE ); pNoNameData->SetHeader( bHasHeader ); pNoNameData->SetAutoFilter( FALSE ); @@ -313,8 +313,8 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe String aNewName; if (eMode==SC_DB_IMPORT) { - aDocument.CompileDBFormula( TRUE ); // CreateFormulaString - pUndoColl = new ScDBCollection( *pColl ); // Undo fuer Import1-Bereich + aDocument.CompileDBFormula( TRUE ); // CreateFormulaString + pUndoColl = new ScDBCollection( *pColl ); // Undo fuer Import1-Bereich String aImport = ScGlobal::GetRscString( STR_DBNAME_IMPORT ); long nCount = 0; @@ -336,15 +336,15 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe if ( pUndoColl ) { - aDocument.CompileDBFormula( FALSE ); // CompileFormulaString + aDocument.CompileDBFormula( FALSE ); // CompileFormulaString ScDBCollection* pRedoColl = new ScDBCollection( *pColl ); GetUndoManager()->AddUndoAction( new ScUndoDBData( this, pUndoColl, pRedoColl ) ); } - // neuen Bereich am Sba anmelden nicht mehr noetig + // neuen Bereich am Sba anmelden nicht mehr noetig - // "Import1" etc am Navigator bekanntmachen + // "Import1" etc am Navigator bekanntmachen if (eMode==SC_DB_IMPORT) SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) ); } @@ -397,8 +397,8 @@ void ScDocShell::CancelAutoDBRange() } - // Hoehen anpassen - //! mit docfunc zusammenfassen + // Hoehen anpassen + //! mit docfunc zusammenfassen BOOL ScDocShell::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) { @@ -463,13 +463,13 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore ) void ScDocShell::RefreshPivotTables( const ScRange& rSource ) { - //! rename to RefreshDataPilotTables? + //! rename to RefreshDataPilotTables? ScDPCollection* pColl = aDocument.GetDPCollection(); if ( pColl ) { - // DataPilotUpdate doesn't modify the collection order like PivotUpdate did, - // so a simple loop can be used. + // DataPilotUpdate doesn't modify the collection order like PivotUpdate did, + // so a simple loop can be used. USHORT nCount = pColl->GetCount(); for ( USHORT i=0; i<nCount; i++ ) @@ -483,7 +483,7 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource ) ScDPObject* pNew = new ScDPObject( *pOld ); ScDBDocFunc aFunc( *this ); aFunc.DataPilotUpdate( pOld, pNew, TRUE, FALSE ); - delete pNew; // DataPilotUpdate copies settings from "new" object + delete pNew; // DataPilotUpdate copies settings from "new" object } } } @@ -537,7 +537,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord ) return; } - // ausfuehren + // ausfuehren WaitObject aWait( GetActiveDialogParent() ); ScDocShellModificator aModificator( *this ); @@ -628,7 +628,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord ) } } - if (pDestData) // Zielbereich loeschen / anpassen + if (pDestData) // Zielbereich loeschen / anpassen { aDocument.DeleteAreaTab(aOldDest, IDF_CONTENTS); pDestData->SetArea( rParam.nTab, rParam.nCol, rParam.nRow, @@ -670,23 +670,23 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord ) { if (!aDocument.IsScenario(nTab)) { - SCTAB nTabCount = aDocument.GetTableCount(); - SCTAB nSrcTab = SCTAB_MAX; - SCTAB nEndTab = nTab; + SCTAB nTabCount = aDocument.GetTableCount(); + SCTAB nSrcTab = SCTAB_MAX; + SCTAB nEndTab = nTab; String aCompare; while ( nEndTab+1 < nTabCount && aDocument.IsScenario(nEndTab+1) ) { ++nEndTab; - if (nSrcTab > MAXTAB) // noch auf der Suche nach dem Szenario? + if (nSrcTab > MAXTAB) // noch auf der Suche nach dem Szenario? { aDocument.GetName( nEndTab, aCompare ); if (aCompare == rName) - nSrcTab = nEndTab; // gefunden + nSrcTab = nEndTab; // gefunden } } if (ValidTab(nSrcTab)) { - if ( aDocument.TestCopyScenario( nSrcTab, nTab ) ) // Zellschutz testen + if ( aDocument.TestCopyScenario( nSrcTab, nTab ) ) // Zellschutz testen { ScDocShellModificator aModificator( *this ); ScMarkData aScenMark; @@ -701,11 +701,11 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord ) if (bRecord) { ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pUndoDoc->InitUndo( &aDocument, nTab,nEndTab ); // auch alle Szenarien - // angezeigte Tabelle: + pUndoDoc->InitUndo( &aDocument, nTab,nEndTab ); // auch alle Szenarien + // angezeigte Tabelle: aDocument.CopyToDocument( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, IDF_ALL,TRUE, pUndoDoc, &aScenMark ); - // Szenarien + // Szenarien for (SCTAB i=nTab+1; i<=nEndTab; i++) { pUndoDoc->SetScenario( i, TRUE ); @@ -716,7 +716,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord ) pUndoDoc->SetScenarioData( i, aComment, aColor, nScenFlags ); BOOL bActive = aDocument.IsActiveScenario( i ); pUndoDoc->SetActiveScenario( i, bActive ); - // Bei Zurueckkopier-Szenarios auch Inhalte + // Bei Zurueckkopier-Szenarios auch Inhalte if ( nScenFlags & SC_SCENARIO_TWOWAY ) aDocument.CopyToDocument( 0,0,i, MAXCOL,MAXROW,i, IDF_ALL,FALSE, pUndoDoc ); @@ -731,9 +731,9 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord ) aDocument.CopyScenario( nSrcTab, nTab ); aDocument.SetDirty(); - // alles painten, weil in anderen Bereichen das aktive Szenario - // geaendert sein kann - //! nur, wenn sichtbare Rahmen vorhanden? + // alles painten, weil in anderen Bereichen das aktive Szenario + // geaendert sein kann + //! nur, wenn sichtbare Rahmen vorhanden? PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); aModificator.SetDocumentModified(); } @@ -760,7 +760,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord ) void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String& rComment, const Color& rColor, USHORT nFlags ) { - // Undo + // Undo String aOldName; aDocument.GetName( nTab, aOldName ); String aOldComment; @@ -772,7 +772,7 @@ void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String& aOldName, rName, aOldComment, rComment, aOldColor, rColor, nOldFlags, nFlags ) ); - // ausfuehren + // ausfuehren ScDocShellModificator aModificator( *this ); aDocument.RenameTab( nTab, rName ); aDocument.SetScenarioData( nTab, rComment, rColor, nFlags ); @@ -817,14 +817,14 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r rName, rComment, rColor, nFlags, rMark )); } - aDocument.RenameTab( nNewTab, rName, FALSE ); // ohne Formel-Update + aDocument.RenameTab( nNewTab, rName, FALSE ); // ohne Formel-Update aDocument.SetScenario( nNewTab, TRUE ); aDocument.SetScenarioData( nNewTab, rComment, rColor, nFlags ); ScMarkData aDestMark = rMark; aDestMark.SelectOneTable( nNewTab ); - //! auf Filter / Buttons / Merging testen ! + //! auf Filter / Buttons / Merging testen ! ScPatternAttr aProtPattern( aDocument.GetPool() ); aProtPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) ); @@ -838,12 +838,12 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r if (!bCopyAll) aDocument.SetVisible( nNewTab, FALSE ); - // dies ist dann das aktive Szenario - aDocument.CopyScenario( nNewTab, nTab, TRUE ); // TRUE - nicht aus Szenario kopieren + // dies ist dann das aktive Szenario + aDocument.CopyScenario( nNewTab, nTab, TRUE ); // TRUE - nicht aus Szenario kopieren if (nFlags & SC_SCENARIO_SHOWFRAME) - PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); // Rahmen painten - PostPaintExtras(); // Tabellenreiter + PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); // Rahmen painten + PostPaintExtras(); // Tabellenreiter aModificator.SetDocumentModified(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); @@ -861,7 +861,7 @@ ULONG ScDocShell::TransferTab( ScDocShell& rSrcDocShell, SCTAB nSrcPos, ScDocument* pSrcDoc = rSrcDocShell.GetDocument(); ULONG nErrVal = aDocument.TransferTab( pSrcDoc, nSrcPos, nDestPos, - bInsertNew ); // no insert + bInsertNew ); // no insert // TransferTab doesn't copy drawing objects with bInsertNew=FALSE if ( nErrVal > 0 && !bInsertNew) @@ -907,20 +907,20 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec if (bCopy) { if (bRecord) - aDocument.BeginDrawUndo(); // drawing layer must do its own undo actions + aDocument.BeginDrawUndo(); // drawing layer must do its own undo actions String sSrcCodeName; aDocument.GetCodeName( nSrcTab, sSrcCodeName ); if (!aDocument.CopyTab( nSrcTab, nDestTab )) { - //! EndDrawUndo? + //! EndDrawUndo? return FALSE; } else { SCTAB nAdjSource = nSrcTab; if ( nDestTab <= nSrcTab ) - ++nAdjSource; // new position of source table after CopyTab + ++nAdjSource; // new position of source table after CopyTab if ( aDocument.IsTabProtected( nAdjSource ) ) aDocument.CopyTabProtection(nAdjSource, nDestTab); @@ -978,8 +978,8 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec if ( nSrcTab == nDestTab ) { - //! allow only for api calls? - return TRUE; // nothing to do, but valid + //! allow only for api calls? + return TRUE; // nothing to do, but valid } if (!aDocument.MoveTab( nSrcTab, nDestTab )) @@ -1019,7 +1019,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) ScRange aRange; pDBData->GetArea( aRange ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet; - bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag as parameter + bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag as parameter // internal operations (sort, query, subtotal) only if no error if (bContinue) { diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 60f75c885a83..e40b2b2d3108 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.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 @@ -96,13 +96,13 @@ inline OUString C2U(const char* s) //---------------------------------------------------------------------- // -// Ole +// Ole // void __EXPORT ScDocShell::SetVisArea( const Rectangle & rVisArea ) { - // with the SnapVisArea call in SetVisAreaOrSize, it's safe to always - // use both the size and position of the VisArea + // with the SnapVisArea call in SetVisAreaOrSize, it's safe to always + // use both the size and position of the VisArea SetVisAreaOrSize( rVisArea, TRUE ); } @@ -128,9 +128,9 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart { if ( ( bNegativePage ? (aArea.Right() > 0) : (aArea.Left() < 0) ) || aArea.Top() < 0 ) { - // VisArea start position can't be negative. - // Move the VisArea, otherwise only the upper left position would - // be changed in SnapVisArea, and the size would be wrong. + // VisArea start position can't be negative. + // Move the VisArea, otherwise only the upper left position would + // be changed in SnapVisArea, and the size would be wrong. Point aNewPos( 0, Max( aArea.Top(), (long) 0 ) ); if ( bNegativePage ) @@ -155,10 +155,10 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart aArea.SetPos( aOldVisArea.TopLeft() ); } - // hier Position anpassen! + // hier Position anpassen! - // #92248# when loading an ole object, the VisArea is set from the document's - // view settings and must be used as-is (document content may not be complete yet). + // #92248# when loading an ole object, the VisArea is set from the document's + // view settings and must be used as-is (document content may not be complete yet). if ( !aDocument.IsImportingXML() ) aDocument.SnapVisArea( aArea ); @@ -175,7 +175,7 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart //TODO/LATER: formerly in SvInplaceObject SfxObjectShell::SetVisArea( aArea ); - if (bIsInplace) // Zoom in der InPlace View einstellen + if (bIsInplace) // Zoom in der InPlace View einstellen { ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if (pViewSh) @@ -207,8 +207,8 @@ BOOL ScDocShell::IsOle() void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize ) { - // wenn's gar nicht Ole ist, kann man sich die Berechnungen sparen - // (VisArea wird dann beim Save wieder zurueckgesetzt) + // wenn's gar nicht Ole ist, kann man sich die Berechnungen sparen + // (VisArea wird dann beim Save wieder zurueckgesetzt) if (GetCreateMode() == SFX_CREATE_MODE_STANDARD) return; @@ -245,13 +245,13 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize ) if (aNewArea != aOldArea) { - SetVisAreaOrSize( aNewArea, TRUE ); // hier muss auch der Start angepasst werden + SetVisAreaOrSize( aNewArea, TRUE ); // hier muss auch der Start angepasst werden bChange = TRUE; } } // -// Style-Krempel fuer Organizer etc. +// Style-Krempel fuer Organizer etc. // SfxStyleSheetBasePool* __EXPORT ScDocShell::GetStyleSheetPool() @@ -260,9 +260,9 @@ SfxStyleSheetBasePool* __EXPORT ScDocShell::GetStyleSheetPool() } -// nach dem Laden von Vorlagen aus einem anderen Dokment (LoadStyles, Insert) -// muessen die SetItems (ATTR_PAGE_HEADERSET, ATTR_PAGE_FOOTERSET) auf den richtigen -// Pool umgesetzt werden, bevor der Quell-Pool geloescht wird. +// nach dem Laden von Vorlagen aus einem anderen Dokment (LoadStyles, Insert) +// muessen die SetItems (ATTR_PAGE_HEADERSET, ATTR_PAGE_FOOTERSET) auf den richtigen +// Pool umgesetzt werden, bevor der Quell-Pool geloescht wird. void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool ) { @@ -297,22 +297,22 @@ void __EXPORT ScDocShell::LoadStyles( SfxObjectShell &rSource ) aDocument.StylesToNames(); SfxObjectShell::LoadStyles(rSource); - lcl_AdjustPool( GetStyleSheetPool() ); // SetItems anpassen + lcl_AdjustPool( GetStyleSheetPool() ); // SetItems anpassen aDocument.UpdStlShtPtrsFrmNms(); UpdateAllRowHeights(); - // Paint + // Paint PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT ); } void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles ) { - // similar to LoadStyles, but with selectable behavior for XStyleLoader::loadStylesFromURL call + // similar to LoadStyles, but with selectable behavior for XStyleLoader::loadStylesFromURL call - if ( !bCellStyles && !bPageStyles ) // nothing to do + if ( !bCellStyles && !bPageStyles ) // nothing to do return; ScStyleSheetPool* pSourcePool = rSource.GetDocument()->GetStyleSheetPool(); @@ -324,12 +324,12 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS SfxStyleSheetIterator aIter( pSourcePool, eFamily ); USHORT nSourceCount = aIter.Count(); if ( nSourceCount == 0 ) - return; // no source styles + return; // no source styles ScStylePair* pStyles = new ScStylePair[ nSourceCount ]; USHORT nFound = 0; - // first create all new styles + // first create all new styles SfxStyleSheetBase* pSourceStyle = aIter.First(); while (pSourceStyle) @@ -356,7 +356,7 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS pSourceStyle = aIter.Next(); } - // then copy contents (after inserting all styles, for parent etc.) + // then copy contents (after inserting all styles, for parent etc.) for ( USHORT i = 0; i < nFound; ++i ) { @@ -367,9 +367,9 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS // follow is never used } - lcl_AdjustPool( GetStyleSheetPool() ); // adjust SetItems + lcl_AdjustPool( GetStyleSheetPool() ); // adjust SetItems UpdateAllRowHeights(); - PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT ); // Paint + PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT ); // Paint delete[] pStyles; } @@ -382,7 +382,7 @@ BOOL __EXPORT ScDocShell::Insert( SfxObjectShell &rSource, BOOL bRet = SfxObjectShell::Insert( rSource, nSourceIdx1, nSourceIdx2, nSourceIdx3, nIdx1, nIdx2, nIdx3, rIdxDeleted ); if (bRet) - lcl_AdjustPool( GetStyleSheetPool() ); // SetItems anpassen + lcl_AdjustPool( GetStyleSheetPool() ); // SetItems anpassen return bRet; } @@ -417,7 +417,7 @@ void ScDocShell::UpdateLinks() if (!aNames.Insert(pData)) delete pData; } - else // nicht mehr benutzt -> loeschen + else // nicht mehr benutzt -> loeschen { pTabLink->SetAddUndo(TRUE); pLinkManager->Remove(k); @@ -435,9 +435,9 @@ void ScDocShell::UpdateLinks() String aDocName = aDocument.GetLinkDoc(i); String aFltName = aDocument.GetLinkFlt(i); String aOptions = aDocument.GetLinkOpt(i); - ULONG nRefresh = aDocument.GetLinkRefreshDelay(i); + ULONG nRefresh = aDocument.GetLinkRefreshDelay(i); BOOL bThere = FALSE; - for (SCTAB j=0; j<i && !bThere; j++) // im Dokument mehrfach? + for (SCTAB j=0; j<i && !bThere; j++) // im Dokument mehrfach? if (aDocument.IsLinked(j) && aDocument.GetLinkDoc(j) == aDocName && aDocument.GetLinkFlt(j) == aFltName @@ -447,7 +447,7 @@ void ScDocShell::UpdateLinks() // if it ain't. bThere = TRUE; - if (!bThere) // schon als Filter eingetragen? + if (!bThere) // schon als Filter eingetragen? { StrData* pData = new StrData(aDocName); if (!aNames.Insert(pData)) @@ -479,7 +479,7 @@ BOOL ScDocShell::ReloadTabLinks() if (pBase->ISA(ScTableLink)) { ScTableLink* pTabLink = (ScTableLink*)pBase; - pTabLink->SetPaint(FALSE); // Paint nur einmal am Ende + pTabLink->SetPaint(FALSE); // Paint nur einmal am Ende pTabLink->Update(); pTabLink->SetPaint(TRUE); bAny = TRUE; @@ -488,14 +488,14 @@ BOOL ScDocShell::ReloadTabLinks() if ( bAny ) { - // Paint nur einmal + // Paint nur einmal PostPaint( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB), PAINT_GRID | PAINT_TOP | PAINT_LEFT ); SetDocumentModified(); } - return TRUE; //! Fehler erkennen + return TRUE; //! Fehler erkennen } void ScDocShell::CheckConfigOptions() diff --git a/sc/source/ui/docshell/docsh7.cxx b/sc/source/ui/docshell/docsh7.cxx index 85ca951be483..7aaefa5caccc 100644 --- a/sc/source/ui/docshell/docsh7.cxx +++ b/sc/source/ui/docshell/docsh7.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 @@ -39,7 +39,7 @@ void ScDocShell::GetDrawObjState( SfxItemSet & /* rSet */ ) { - // SID_SC_ACTIVEOBJECT (SelectedObject) - removed (old Basic) + // SID_SC_ACTIVEOBJECT (SelectedObject) - removed (old Basic) } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 1e94a7f3b2e4..a9e05e1d43b1 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.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 @@ -94,25 +94,25 @@ using ::std::vector; // ----------------------------------------------------------------------- -#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" -#define SC_SERVICE_DRVMAN "com.sun.star.sdbc.DriverManager" +#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" +#define SC_SERVICE_DRVMAN "com.sun.star.sdbc.DriverManager" -//! move to a header file? -//#define SC_DBPROP_DATASOURCENAME "DataSourceName" -#define SC_DBPROP_ACTIVECONNECTION "ActiveConnection" -#define SC_DBPROP_COMMAND "Command" -#define SC_DBPROP_COMMANDTYPE "CommandType" +//! move to a header file? +//#define SC_DBPROP_DATASOURCENAME "DataSourceName" +#define SC_DBPROP_ACTIVECONNECTION "ActiveConnection" +#define SC_DBPROP_COMMAND "Command" +#define SC_DBPROP_COMMANDTYPE "CommandType" #define SC_DBPROP_PROPCHANGE_NOTIFY "PropertyChangeNotificationEnabled" -#define SC_DBPROP_NAME "Name" -#define SC_DBPROP_TYPE "Type" -#define SC_DBPROP_PRECISION "Precision" -#define SC_DBPROP_SCALE "Scale" +#define SC_DBPROP_NAME "Name" +#define SC_DBPROP_TYPE "Type" +#define SC_DBPROP_PRECISION "Precision" +#define SC_DBPROP_SCALE "Scale" -#define SC_DBPROP_EXTENSION "Extension" -#define SC_DBPROP_CHARSET "CharSet" +#define SC_DBPROP_EXTENSION "Extension" +#define SC_DBPROP_CHARSET "CharSet" -#define SC_ROWCOUNT_ERROR (-1) +#define SC_ROWCOUNT_ERROR (-1) namespace { @@ -152,7 +152,7 @@ namespace } // if ( aIter == aMap.end() ) rtl::OUString aCharSetStr; if ( RTL_TEXTENCODING_DONTKNOW != *aIter ) - { // it's not the virtual "system charset" + { // it's not the virtual "system charset" const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( *aIter ); OSL_ENSURE( pIanaName, "invalid mime name!" ); if ( pIanaName ) @@ -322,7 +322,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet, if ( !xConnection.is() || !xDrvMan.is() ) return nRet; ::utl::DisposableComponent aConnectionHelper(xConnection); - + long nRowCount = 0; if ( nRowCount < 0 ) { @@ -367,12 +367,12 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet, if ( xMetaSupp.is() ) xMeta = xMetaSupp->getMetaData(); if ( xMeta.is() ) - nColCount = xMeta->getColumnCount(); // this is the number of real columns + nColCount = xMeta->getColumnCount(); // this is the number of real columns if ( nColCount > MAXCOL+1 ) { nColCount = MAXCOL+1; - nErr = SCWARN_IMPORT_RANGE_OVERFLOW; // warning + nErr = SCWARN_IMPORT_RANGE_OVERFLOW; // warning } if ( nColCount > 0 ) @@ -384,13 +384,13 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet, if (!xRow.is()) return SCERR_IMPORT_CONNECT; // currency flag is not needed for dBase - uno::Sequence<sal_Int32> aColTypes( nColCount ); // column types + uno::Sequence<sal_Int32> aColTypes( nColCount ); // column types sal_Int32* pTypeArr = aColTypes.getArray(); for (i=0; i<nColCount; i++) pTypeArr[i] = xMeta->getColumnType( i+1 ); - // read column names - //! add type descriptions + // read column names + //! add type descriptions vector<long> aScales(nColCount, -1); for (i=0; i<nColCount; i++) @@ -432,7 +432,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet, lcl_setScalesToColumns(aDocument, aScales); - SCROW nRow = 1; // 0 is column titles + SCROW nRow = 1; // 0 is column titles BOOL bEnd = FALSE; while ( !bEnd && xRowSet->next() ) { @@ -465,10 +465,10 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet, rRowHeightsRecalc.setTrue(nRow, nRow); ++nRow; } - else // past the end of the spreadsheet + else // past the end of the spreadsheet { - bEnd = TRUE; // don't continue - nErr = SCWARN_IMPORT_RANGE_OVERFLOW; // warning message + bEnd = TRUE; // don't continue + nErr = SCWARN_IMPORT_RANGE_OVERFLOW; // warning message } if ( nRowCount ) @@ -506,9 +506,9 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell, sal_Int32* pColLengths, sal_Int32* pColScales, BOOL& bHasMemo, CharSet eCharSet ) { - // updating of column titles didn't work in 5.2 and isn't always wanted - // (saving normally shouldn't modify the document) - //! read flag from configuration + // updating of column titles didn't work in 5.2 and isn't always wanted + // (saving normally shouldn't modify the document) + //! read flag from configuration BOOL bUpdateTitles = FALSE; ScDocument* pDoc = rDocShell.GetDocument(); @@ -612,7 +612,7 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell, aFieldName.Erase( 10 ); StrData* pStrData = new StrData( aFieldName ); if ( !aFieldNamesCollection.Insert( pStrData ) ) - { // doppelter Feldname, numerisch erweitern + { // doppelter Feldname, numerisch erweitern USHORT nSub = 1; String aFixPart( aFieldName ); do @@ -634,7 +634,7 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell, } if ( !bTypeDefined ) - { // Feldtyp + { // Feldtyp ScBaseCell* pCell; pDoc->GetCell( nCol, nFirstDataRow, nTab, pCell ); if ( !pCell || pCell->HasStringData() ) @@ -673,14 +673,14 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell, BOOL bSdbLenBad = FALSE; // Feldlaenge if ( nDbType == sdbc::DataType::VARCHAR && !nFieldLen ) - { // maximale Feldbreite bestimmen + { // maximale Feldbreite bestimmen nFieldLen = pDoc->GetMaxStringLen( nTab, nCol, nFirstDataRow, nLastRow, eCharSet ); if ( nFieldLen == 0 ) nFieldLen = 1; } else if ( nDbType == sdbc::DataType::DECIMAL ) - { // maximale Feldbreite und Nachkommastellen bestimmen + { // maximale Feldbreite und Nachkommastellen bestimmen xub_StrLen nLen; sal_uInt16 nPrec; nLen = pDoc->GetMaxNumberStringLen( nPrec, nTab, nCol, @@ -691,11 +691,11 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell, if ( nPrec > 15 ) nPrec = 15; if ( bPrecDefined && nPrecision != nPrec ) - { // Laenge auf vorgegebene Nachkommastellen anpassen + { // Laenge auf vorgegebene Nachkommastellen anpassen if ( nPrecision ) nLen = sal::static_int_cast<xub_StrLen>( nLen + ( nPrecision - nPrec ) ); else - nLen -= nPrec+1; // auch den . mit raus + nLen -= nPrec+1; // auch den . mit raus } if ( nLen > nFieldLen && !bTypeDefined ) nFieldLen = nLen; @@ -704,9 +704,9 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell, if ( nFieldLen == 0 ) nFieldLen = 1; else if ( nFieldLen > 19 ) - nFieldLen = 19; // dBaseIII Limit Feldlaenge numerisch: 19 + nFieldLen = 19; // dBaseIII Limit Feldlaenge numerisch: 19 if ( nPrecision && nFieldLen < nPrecision + 2 ) - nFieldLen = nPrecision + 2; // 0. muss mit reinpassen + nFieldLen = nPrecision + 2; // 0. muss mit reinpassen // 538 MUST: Sdb internal representation adds 2 to the field length! // To give the user what he wants we must substract it here. //! CAVEAT! There is no way to define a numeric field with a length @@ -719,13 +719,13 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell, if ( nFieldLen > 254 ) { if ( nDbType == sdbc::DataType::VARCHAR ) - { // zu lang fuer normales Textfeld => Memofeld + { // zu lang fuer normales Textfeld => Memofeld nDbType = sdbc::DataType::LONGVARCHAR; nFieldLen = 10; bHasMemo = TRUE; } else - nFieldLen = 254; // dumm gelaufen.. + nFieldLen = 254; // dumm gelaufen.. } pColNames[nField] = aFieldName; @@ -738,10 +738,10 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell, { nFieldLen = SvDbaseConverter::ConvertPrecisionToDbase( nFieldLen, nPrecision ); if ( bSdbLenBad && nFieldLen == 1 ) - nFieldLen = 2; // THIS is reality + nFieldLen = 2; // THIS is reality } if ( bUpdateTitles ) - { // Angabe anpassen und ausgeben + { // Angabe anpassen und ausgeben String aOutString = aFieldName; switch ( nDbType ) { @@ -818,7 +818,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO BOOL bHasFieldNames = TRUE; for ( SCCOL nDocCol = nFirstCol; nDocCol <= nLastCol && bHasFieldNames; nDocCol++ ) - { // nur Strings in erster Zeile => sind Feldnamen + { // nur Strings in erster Zeile => sind Feldnamen if ( !aDocument.HasStringData( nDocCol, nFirstRow, nTab ) ) bHasFieldNames = FALSE; } @@ -852,7 +852,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO // get dBase driver uno::Reference< sdbc::XDriverAccess> xAccess(xDrvMan,uno::UNO_QUERY); uno::Reference< sdbcx::XDataDefinitionSupplier > xDDSup( xAccess->getDriverByURL( xConnection->getMetaData()->getURL() ), uno::UNO_QUERY ); - if ( !xDDSup.is() ) + if ( !xDDSup.is() ) return SCERR_EXPORT_CONNECT; // create table @@ -927,9 +927,9 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO xTablesAppend->appendByDescriptor( xTableDesc ); // re-open connection -// xConnection = xDrvMan->getConnectionWithInfo( aConnUrl, aProps ); -// DBG_ASSERT( xConnection.is(), "can't get Connection" ); -// if (!xConnection.is()) return SCERR_EXPORT_CONNECT; +// xConnection = xDrvMan->getConnectionWithInfo( aConnUrl, aProps ); +// DBG_ASSERT( xConnection.is(), "can't get Connection" ); +// if (!xConnection.is()) return SCERR_EXPORT_CONNECT; // get row set for writing uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); @@ -985,7 +985,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE ) { if ( pCell->GetCellType() == CELLTYPE_EDIT ) - { // #60761# Paragraphs erhalten + { // #60761# Paragraphs erhalten lcl_getLongVarCharEditString( aString, pCell, aEditEngine); } @@ -1025,8 +1025,8 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO } else { - Date aDate = *(pNumFmt->GetNullDate()); // tools date - aDate += (long)fVal; //! approxfloor? + Date aDate = *(pNumFmt->GetNullDate()); // tools date + aDate += (long)fVal; //! approxfloor? util::Date aUnoDate( aDate.GetDay(), aDate.GetMonth(), aDate.GetYear() ); xRowUpdate->updateDate( nCol+1, aUnoDate ); } @@ -1056,11 +1056,11 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO xResultUpdate->insertRow(); - //! error handling and recovery of old - //! ScDocShell::SbaSdbExport is still missing! + //! error handling and recovery of old + //! ScDocShell::SbaSdbExport is still missing! if ( !aProgress.SetStateOnPercent( nDocRow - nFirstRow ) ) - { // UserBreak + { // UserBreak nErr = SCERR_EXPORT_DATA; break; } diff --git a/sc/source/ui/docshell/docshimp.hxx b/sc/source/ui/docshell/docshimp.hxx index 37f6d6bb1387..492e333d2e89 100644 --- a/sc/source/ui/docshell/docshimp.hxx +++ b/sc/source/ui/docshell/docshimp.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/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx index 24cae921fddf..7ebd9de1d1bd 100644 --- a/sc/source/ui/docshell/editable.cxx +++ b/sc/source/ui/docshell/editable.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 @@ ScEditableTester::ScEditableTester( ScDocument* pDoc, SCTAB nTab, TestBlock( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow ); } -ScEditableTester::ScEditableTester( ScDocument* pDoc, +ScEditableTester::ScEditableTester( ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) : bIsEditable( TRUE ), @@ -99,7 +99,7 @@ void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab, } } -void ScEditableTester::TestSelectedBlock( ScDocument* pDoc, +void ScEditableTester::TestSelectedBlock( ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index ee7a8a6844aa..c0fc2fbfa215 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1393,8 +1393,7 @@ static ScTokenArray* lcl_convertToTokenArray(const ScDocument* pSrcDoc, ScRange& // Only loop within the data area. SCCOL nDataCol1 = nCol1, nDataCol2 = nCol2; SCROW nDataRow1 = nRow1, nDataRow2 = nRow2; - bool bShrunk; - if (!pSrcDoc->ShrinkToUsedDataArea( bShrunk, nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2, false)) + if (!pSrcDoc->ShrinkToDataArea(nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2)) // no data within specified range. continue; @@ -1721,8 +1720,8 @@ ScExternalRefCache::TokenRef ScExternalRefManager::getSingleRefToken( SCCOL nDataCol1 = 0, nDataCol2 = MAXCOL; SCROW nDataRow1 = 0, nDataRow2 = MAXROW; - bool bData = pSrcDoc->ShrinkToDataArea(nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2); - if (!bData || rCell.Col() < nDataCol1 || nDataCol2 < rCell.Col() || rCell.Row() < nDataRow1 || nDataRow2 < rCell.Row()) + pSrcDoc->ShrinkToDataArea(nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2); + if (rCell.Col() < nDataCol1 || nDataCol2 < rCell.Col() || rCell.Row() < nDataRow1 || nDataRow2 < rCell.Row()) { // requested cell is outside the data area. Don't even bother caching // this data, but add it to the cached range to prevent accessing the diff --git a/sc/source/ui/docshell/hiranges.cxx b/sc/source/ui/docshell/hiranges.cxx index 0ad4c4e3e5d8..5716abe19b62 100644 --- a/sc/source/ui/docshell/hiranges.cxx +++ b/sc/source/ui/docshell/hiranges.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/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 1e85d17bd741..3cbf5364b964 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.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 @@ -115,7 +115,7 @@ enum SylkVersion ScImportExport::ScImportExport( ScDocument* p ) : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), - nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), + nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), bFormulas( FALSE ), bIncludeFiltered( TRUE ), bAll( TRUE ), bSingle( TRUE ), bUndo( FALSE ), bOverflow( FALSE ), mbApi( true ), mExportTextOptions() @@ -130,7 +130,7 @@ ScImportExport::ScImportExport( ScDocument* p ) ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt ) : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), aRange( rPt ), - nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), + nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), bFormulas( FALSE ), bIncludeFiltered( TRUE ), bAll( FALSE ), bSingle( TRUE ), bUndo( BOOL( pDocSh != NULL ) ), bOverflow( FALSE ), mbApi( true ), mExportTextOptions() @@ -140,8 +140,8 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt ) } -// ctor with a range is only used for export -//! ctor with a string (and bSingle=TRUE) is also used for DdeSetData +// ctor with a range is only used for export +//! ctor with a string (and bSingle=TRUE) is also used for DdeSetData ScImportExport::ScImportExport( ScDocument* p, const ScRange& r ) : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), @@ -185,7 +185,7 @@ ScImportExport::ScImportExport( ScDocument* p, const String& rPos ) if( pData->HasType( RT_REFAREA ) || pData->HasType( RT_ABSAREA ) || pData->HasType( RT_ABSPOS ) ) - pData->GetSymbol( aPos ); // mit dem Inhalt weitertesten + pData->GetSymbol( aPos ); // mit dem Inhalt weitertesten } } formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); @@ -214,7 +214,7 @@ void ScImportExport::SetExtOptions( const ScAsciiOptions& rOpt ) else pExtOptions = new ScAsciiOptions( rOpt ); - // "normale" Optionen uebernehmen + // "normale" Optionen uebernehmen cSep = rOpt.GetFieldSeps().GetChar(0); cStr = rOpt.GetTextSep(); @@ -284,7 +284,7 @@ void ScImportExport::EndPaste() if( pDocSh ) { if (!bHeight) - pDocSh->PostPaint( aRange, PAINT_GRID ); // AdjustRowHeight paintet evtl. selber + pDocSh->PostPaint( aRange, PAINT_GRID ); // AdjustRowHeight paintet evtl. selber pDocSh->SetDocumentModified(); } ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); @@ -338,7 +338,7 @@ BOOL ScImportExport::ImportString( const ::rtl::OUString& rText, ULONG nFmt ) ::rtl::OString aTmp( rText.getStr(), rText.getLength(), eEnc ); SvMemoryStream aStrm( (void*)aTmp.getStr(), aTmp.getLength() * sizeof(sal_Char), STREAM_READ ); aStrm.SetStreamCharSet( eEnc ); - SetNoEndianSwap( aStrm ); //! no swapping in memory + SetNoEndianSwap( aStrm ); //! no swapping in memory return ImportStream( aStrm, String(), nFmt ); } } @@ -356,11 +356,11 @@ BOOL ScImportExport::ExportString( ::rtl::OUString& rText, ULONG nFmt ) rText = UniString( aTmp, eEnc ); return bOk; } - // nSizeLimit not needed for OUString + // nSizeLimit not needed for OUString SvMemoryStream aStrm; aStrm.SetStreamCharSet( RTL_TEXTENCODING_UNICODE ); - SetNoEndianSwap( aStrm ); //! no swapping in memory + SetNoEndianSwap( aStrm ); //! no swapping in memory // mba: no BaseURL for data exc if( ExportStream( aStrm, String(), nFmt ) ) { @@ -388,7 +388,7 @@ BOOL ScImportExport::ExportByteString( ByteString& rText, rtl_TextEncoding eEnc, SvMemoryStream aStrm; aStrm.SetStreamCharSet( eEnc ); - SetNoEndianSwap( aStrm ); //! no swapping in memory + SetNoEndianSwap( aStrm ); //! no swapping in memory // mba: no BaseURL for data exchange if( ExportStream( aStrm, String(), nFmt ) ) { @@ -410,7 +410,7 @@ BOOL ScImportExport::ImportStream( SvStream& rStrm, const String& rBaseURL, ULON { if( nFmt == FORMAT_STRING ) { - if( ExtText2Doc( rStrm ) ) // pExtOptions auswerten + if( ExtText2Doc( rStrm ) ) // pExtOptions auswerten return TRUE; } if( nFmt == SOT_FORMATSTR_ID_SYLK ) @@ -429,7 +429,7 @@ BOOL ScImportExport::ImportStream( SvStream& rStrm, const String& rBaseURL, ULON return TRUE; } if( nFmt == SOT_FORMATSTR_ID_LINK ) - return TRUE; // Link-Import? + return TRUE; // Link-Import? if ( nFmt == SOT_FORMATSTR_ID_HTML ) { if( HTML2Doc( rStrm, rBaseURL ) ) @@ -437,7 +437,7 @@ BOOL ScImportExport::ImportStream( SvStream& rStrm, const String& rBaseURL, ULON } if ( nFmt == SOT_FORMATSTR_ID_HTML_SIMPLE ) { - MSE40HTMLClipFormatObj aMSE40ClpObj; // needed to skip the header data + MSE40HTMLClipFormatObj aMSE40ClpObj; // needed to skip the header data SvStream* pHTML = aMSE40ClpObj.IsValid( rStrm ); if ( pHTML && HTML2Doc( *pHTML, rBaseURL ) ) return TRUE; @@ -551,7 +551,7 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rS void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm ) { if ( rStrm.GetStreamCharSet() == RTL_TEXTENCODING_UNICODE ) - { // same as endl() but unicode + { // same as endl() but unicode switch ( rStrm.GetLineDelimiter() ) { case LINEEND_CR : @@ -571,16 +571,16 @@ void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm ) enum DoubledQuoteMode { - DQM_KEEP, // both are taken - DQM_ESCAPE, // escaped quote, one is taken, one ignored - DQM_CONCAT, // first is end, next is start, both ignored => strings combined - DQM_SEPARATE // end one string and begin next + DQM_KEEP, // both are taken + DQM_ESCAPE, // escaped quote, one is taken, one ignored + DQM_CONCAT, // first is end, next is start, both ignored => strings combined + DQM_SEPARATE // end one string and begin next }; static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString, sal_Unicode cStr, DoubledQuoteMode eMode ) { - p++; //! jump over opening quote + p++; //! jump over opening quote BOOL bCont; do { @@ -598,16 +598,16 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString, switch ( eMode ) { case DQM_KEEP : - p++; // both for us (not breaking for-loop) + p++; // both for us (not breaking for-loop) break; case DQM_ESCAPE : - p++; // one for us (breaking for-loop) - bCont = TRUE; // and more + p++; // one for us (breaking for-loop) + bCont = TRUE; // and more break; case DQM_CONCAT : if ( p0+1 < p ) rString.Append( p0, sal::static_int_cast<xub_StrLen>( (p-1) - p0 ) ); // first part - p0 = ++p; // text of next part starts here + p0 = ++p; // text of next part starts here break; case DQM_SEPARATE : // positioned on next opening quote @@ -628,7 +628,7 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString, void lcl_UnescapeSylk( String & rString, SylkVersion eVersion ) { // Older versions didn't escape the semicolon. - // Older versions quoted the string and doubled embedded quotes, but not + // Older versions quoted the string and doubled embedded quotes, but not // the semicolons, which was plain wrong. if (eVersion >= SYLK_OOO32) rString.SearchAndReplaceAll( DOUBLE_SEMICOLON, ';' ); @@ -702,18 +702,18 @@ static const sal_Unicode* lcl_ScanSylkFormula( const sal_Unicode* p, } else { - // Nasty. If in old versions the formula contained a semicolon, it was - // quoted and embedded quotes were doubled, but semicolons were not. If - // there was no semicolon, it could still contain quotes and doubled - // embedded quotes if it was something like ="a""b", which was saved as - // E"a""b" as is and has to be preserved, even if older versions - // couldn't even load it correctly. However, theoretically another - // field might follow and thus the line contain a semicolon again, such + // Nasty. If in old versions the formula contained a semicolon, it was + // quoted and embedded quotes were doubled, but semicolons were not. If + // there was no semicolon, it could still contain quotes and doubled + // embedded quotes if it was something like ="a""b", which was saved as + // E"a""b" as is and has to be preserved, even if older versions + // couldn't even load it correctly. However, theoretically another + // field might follow and thus the line contain a semicolon again, such // as ...;E"a""b";... bool bQuoted = false; if (*p == '"') { - // May be a quoted expression or just a string constant expression + // May be a quoted expression or just a string constant expression // with quotes. while (*(++p)) { @@ -834,8 +834,8 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm ) if( bData && nCol <= nEndCol && nRow <= nEndRow ) pDoc->SetString( nCol, nRow, aRange.aStart.Tab(), aCell ); } - else // zuviele Spalten/Zeilen - bOverflow = TRUE; // beim Import Warnung ausgeben + else // zuviele Spalten/Zeilen + bOverflow = TRUE; // beim Import Warnung ausgeben ++nCol; } ++nRow; @@ -857,11 +857,11 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm ) } // - // erweiterter Ascii-Import + // erweiterter Ascii-Import // -static bool lcl_PutString( +static bool lcl_PutString( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rStr, BYTE nColFormat, SvNumberFormatter* pFormatter, bool bDetectNumFormat, ::utl::TransliterationWrapper& rTransliteration, CalendarWrapper& rCalendar, @@ -891,20 +891,20 @@ static bool lcl_PutString( if ( nColFormat == SC_COL_ENGLISH ) { - //! SetString mit Extra-Flag ??? + //! SetString mit Extra-Flag ??? SvNumberFormatter* pDocFormatter = pDoc->GetFormatTable(); sal_uInt32 nEnglish = pDocFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US); double fVal; if ( pDocFormatter->IsNumberFormat( rStr, nEnglish, fVal ) ) { - // Zahlformat wird nicht auf englisch gesetzt + // Zahlformat wird nicht auf englisch gesetzt pDoc->SetValue( nCol, nRow, nTab, fVal ); return bMultiLine; } - // sonst weiter mit SetString + // sonst weiter mit SetString } - else if ( nColFormat != SC_COL_STANDARD ) // Datumsformate + else if ( nColFormat != SC_COL_STANDARD ) // Datumsformate { const USHORT nMaxNumberParts = 7; // Y-M-D h:m:s.t xub_StrLen nLen = rStr.Len(); @@ -946,7 +946,7 @@ static bool lcl_PutString( if ( nFound == 1 ) { - // try to break one number (without separators) into date fields + // try to break one number (without separators) into date fields xub_StrLen nDateStart = nStart[0]; xub_StrLen nDateLen = nEnd[0] + 1 - nDateStart; @@ -954,9 +954,9 @@ static bool lcl_PutString( if ( nDateLen >= 5 && nDateLen <= 8 && ScGlobal::pCharClass->isNumeric( rStr.Copy( nDateStart, nDateLen ) ) ) { - // 6 digits: 2 each for day, month, year - // 8 digits: 4 for year, 2 each for day and month - // 5 or 7 digits: first field is shortened by 1 + // 6 digits: 2 each for day, month, year + // 8 digits: 4 for year, 2 each for day and month + // 5 or 7 digits: first field is shortened by 1 BOOL bLongYear = ( nDateLen >= 7 ); BOOL bShortFirst = ( nDateLen == 5 || nDateLen == 7 ); @@ -964,11 +964,11 @@ static bool lcl_PutString( USHORT nFieldStart = nDateStart; for (USHORT nPos=0; nPos<3; nPos++) { - USHORT nFieldEnd = nFieldStart + 1; // default: 2 digits + USHORT nFieldEnd = nFieldStart + 1; // default: 2 digits if ( bLongYear && nPos == nYP ) - nFieldEnd += 2; // 2 extra digits for long year + nFieldEnd += 2; // 2 extra digits for long year if ( bShortFirst && nPos == 0 ) - --nFieldEnd; // first field shortened? + --nFieldEnd; // first field shortened? nStart[nPos] = nFieldStart; nEnd[nPos] = nFieldEnd; @@ -992,7 +992,7 @@ static bool lcl_PutString( static const String aSepShortened( RTL_CONSTASCII_USTRINGPARAM( "SEP" ) ); uno::Sequence< i18n::CalendarItem > xMonths; sal_Int32 i, nMonthCount; - // first test all month names from local international + // first test all month names from local international xMonths = rCalendar.getMonths(); nMonthCount = xMonths.getLength(); for (i=0; i<nMonthCount && !nMonth; i++) @@ -1008,7 +1008,7 @@ static bool lcl_PutString( nMonth = sal::static_int_cast<sal_Int16>( i+1 ); } } - // if none found, then test english month names + // if none found, then test english month names if ( !nMonth && pSecondCalendar && pSecondTransliteration ) { xMonths = pSecondCalendar->getMonths(); @@ -1104,7 +1104,7 @@ static bool lcl_PutString( aParam.mbSetTextCellFormat = true; pDoc->SetString( nCol, nRow, nTab, rStr, &aParam ); } - else + else { bMultiLine = true; pDoc->PutCell( nCol, nRow, nTab, new ScEditCell( rStr, pDoc ) ); @@ -1154,14 +1154,14 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) SCROW nStartRow = aRange.aStart.Row(); SCTAB nTab = aRange.aStart.Tab(); - BOOL bFixed = pExtOptions->IsFixedLen(); + BOOL bFixed = pExtOptions->IsFixedLen(); const String& rSeps = pExtOptions->GetFieldSeps(); const sal_Unicode* pSeps = rSeps.GetBuffer(); - BOOL bMerge = pExtOptions->IsMergeSeps(); - USHORT nInfoCount = pExtOptions->GetInfoCount(); + BOOL bMerge = pExtOptions->IsMergeSeps(); + USHORT nInfoCount = pExtOptions->GetInfoCount(); const xub_StrLen* pColStart = pExtOptions->GetColStart(); const BYTE* pColFormat = pExtOptions->GetColFormat(); - long nSkipLines = pExtOptions->GetStartRow(); + long nSkipLines = pExtOptions->GetStartRow(); LanguageType eDocLang = pExtOptions->GetLanguage(); SvNumberFormatter aNumFormatter(pDoc->GetServiceManager(), eDocLang); @@ -1200,7 +1200,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) // Determine range for Undo. // TODO: we don't need this during import of a file to a new sheet or // document, could set bDetermineRange=false then. - bool bDetermineRange = true; + bool bDetermineRange = true; // Row heights don't need to be adjusted on the fly if EndPaste() is called // afterwards, which happens only if bDetermineRange. This variable also @@ -1210,7 +1210,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) bool bQuotedAsText = pExtOptions && pExtOptions->IsQuotedAsText(); ULONG nOriginalStreamPos = rStrm.Tell(); - + do { for( ;; ) @@ -1222,7 +1222,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) xub_StrLen nLineLen = aLine.Len(); SCCOL nCol = nStartCol; bool bMultiLine = false; - if ( bFixed ) // Feste Satzlaenge + if ( bFixed ) // Feste Satzlaenge { // Yes, the check is nCol<=MAXCOL+1, +1 because it is only an // overflow if there is really data following to be put behind @@ -1244,7 +1244,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) if (bIsQuoted && bQuotedAsText) nFmt = SC_COL_TEXT; - bMultiLine |= lcl_PutString( + bMultiLine |= lcl_PutString( pDoc, nCol, nRow, nTab, aCell, nFmt, &aNumFormatter, bDetectNumFormat, aTransliteration, aCalendar, pEnglishTransliteration, pEnglishCalendar); @@ -1253,7 +1253,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) } } } - else // Nach Trennzeichen suchen + else // Nach Trennzeichen suchen { SCCOL nSourceCol = 0; USHORT nInfoStart = 0; @@ -1270,11 +1270,11 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) BYTE nFmt = SC_COL_STANDARD; for ( i=nInfoStart; i<nInfoCount; i++ ) { - if ( pColStart[i] == nSourceCol + 1 ) // pColStart ist 1-basiert + if ( pColStart[i] == nSourceCol + 1 ) // pColStart ist 1-basiert { nFmt = pColFormat[i]; - nInfoStart = i + 1; // ColInfos sind in Reihenfolge - break; // for + nInfoStart = i + 1; // ColInfos sind in Reihenfolge + break; // for } } if ( nFmt != SC_COL_SKIP ) @@ -1286,8 +1286,8 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) if (bIsQuoted && bQuotedAsText) nFmt = SC_COL_TEXT; - bMultiLine |= lcl_PutString( - pDoc, nCol, nRow, nTab, aCell, nFmt, + bMultiLine |= lcl_PutString( + pDoc, nCol, nRow, nTab, aCell, nFmt, &aNumFormatter, bDetectNumFormat, aTransliteration, aCalendar, pEnglishTransliteration, pEnglishCalendar); } @@ -1315,9 +1315,9 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) } // so far nRow/nEndCol pointed to the next free if (nRow > nStartRow) - --nRow; + --nRow; if (nEndCol > nStartCol) - nEndCol = ::std::min( static_cast<SCCOL>(nEndCol - 1), MAXCOL); + nEndCol = ::std::min( static_cast<SCCOL>(nEndCol - 1), MAXCOL); if (bDetermineRange) { @@ -1367,7 +1367,7 @@ const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p { rbIsQuoted = false; rField.Erase(); - if ( *p == cStr ) // String in Anfuehrungszeichen + if ( *p == cStr ) // String in Anfuehrungszeichen { rbIsQuoted = true; const sal_Unicode* p1; @@ -1381,7 +1381,7 @@ const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p if( *p ) p++; } - else // bis zum Trennzeichen + else // bis zum Trennzeichen { const sal_Unicode* p0 = p; while ( *p && !ScGlobal::UnicodeStrChr( pSeps, *p ) ) @@ -1390,7 +1390,7 @@ const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p if( *p ) p++; } - if ( bMergeSeps ) // folgende Trennzeichen ueberspringen + if ( bMergeSeps ) // folgende Trennzeichen ueberspringen { while ( *p && ScGlobal::UnicodeStrChr( pSeps, *p ) ) p++; @@ -1491,7 +1491,7 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm ) if( nCol < nEndCol ) lcl_WriteSimpleString( rStrm, String(cSep) ); } -// if( nRow < nEndRow ) +// if( nRow < nEndRow ) WriteUnicodeOrByteEndl( rStrm ); if( rStrm.GetError() != SVSTREAM_OK ) break; @@ -1537,7 +1537,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm ) rStrm.Seek( nOldPos ); for( ;; ) { - //! allow unicode + //! allow unicode rStrm.ReadLine( aByteLine ); aLine = String( aByteLine, rStrm.GetStreamCharSet() ); if( rStrm.IsEof() ) @@ -1597,7 +1597,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm ) { // don't ignore value if( bText ) { - pDoc->PutCell( nCol, nRow, aRange.aStart.Tab(), + pDoc->PutCell( nCol, nRow, aRange.aStart.Tab(), ScBaseCell::CreateTextCell( aText, pDoc), (BOOL) TRUE); } @@ -1747,7 +1747,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm ) eVersion = SYLK_SCALC3; bMyDoc = (eVersion <= SYLK_OWN); } - else if( cTag == 'E' ) // Ende + else if( cTag == 'E' ) // Ende break; } if( !bData ) @@ -1920,7 +1920,7 @@ BOOL ScImportExport::Doc2HTML( SvStream& rStrm, const String& rBaseURL ) BOOL ScImportExport::Doc2RTF( SvStream& rStrm ) { - // CharSet is ignored in ScExportRTF + // CharSet is ignored in ScExportRTF ScFormatFilter::Get().ScExportRTF( rStrm, pDoc, aRange, RTL_TEXTENCODING_DONTKNOW ); return BOOL( rStrm.GetError() == SVSTREAM_OK ); } diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index dfbe7ed24fe0..866a23453ffe 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.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 @@ -55,14 +55,14 @@ void lcl_InvalidateOutliner( SfxBindings* pBindings ) pBindings->Invalidate( SID_OUTLINE_HIDE ); pBindings->Invalidate( SID_OUTLINE_REMOVE ); - pBindings->Invalidate( SID_STATUS_SUM ); // wegen ein-/ausblenden + pBindings->Invalidate( SID_STATUS_SUM ); // wegen ein-/ausblenden pBindings->Invalidate( SID_ATTR_SIZE ); } } //------------------------------------------------------------------------ -//! PaintWidthHeight zur DocShell verschieben? +//! PaintWidthHeight zur DocShell verschieben? void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd ) @@ -72,7 +72,7 @@ void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, USHORT nParts = PAINT_GRID; SCCOL nStartCol = 0; SCROW nStartRow = 0; - SCCOL nEndCol = MAXCOL; // fuer Test auf Merge + SCCOL nEndCol = MAXCOL; // fuer Test auf Merge SCROW nEndRow = MAXROW; if ( bColumns ) { @@ -138,7 +138,7 @@ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL b if (pDoc->IsStreamValid(nTab)) pDoc->SetStreamValid(nTab, FALSE); - USHORT nParts = 0; // Datenbereich nicht geaendert + USHORT nParts = 0; // Datenbereich nicht geaendert if ( bColumns ) nParts |= PAINT_TOP; else @@ -154,7 +154,7 @@ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL b else { if (!bApi) - rDocShell.ErrorMessage(STR_MSSG_MAKEOUTLINE_0); // "Gruppierung nicht moeglich" + rDocShell.ErrorMessage(STR_MSSG_MAKEOUTLINE_0); // "Gruppierung nicht moeglich" delete pUndoTab; } @@ -204,7 +204,7 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL if (pDoc->IsStreamValid(nTab)) pDoc->SetStreamValid(nTab, FALSE); - USHORT nParts = 0; // Datenbereich nicht geaendert + USHORT nParts = 0; // Datenbereich nicht geaendert if ( bColumns ) nParts |= PAINT_TOP; else @@ -224,7 +224,7 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL } if (!bDone && !bApi) - rDocShell.ErrorMessage(STR_MSSG_REMOVEOUTLINE_0); // "Aufheben nicht moeglich" + rDocShell.ErrorMessage(STR_MSSG_REMOVEOUTLINE_0); // "Aufheben nicht moeglich" return bDone; } @@ -359,7 +359,7 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel, if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; - ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab ); // ist schon da + ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab ); // ist schon da if (!pTable) return FALSE; ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray(); @@ -388,29 +388,29 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel, rDocShell.GetUndoManager()->AddUndoAction( new ScUndoOutlineLevel( &rDocShell, - nStart, nEnd, nTab, //! start und end berechnen + nStart, nEnd, nTab, //! start und end berechnen pUndoDoc, pUndoTab, bColumns, nLevel ) ); } pDoc->InitializeNoteCaptions(nTab); - ScSubOutlineIterator aIter( pArray ); // alle Eintraege + ScSubOutlineIterator aIter( pArray ); // alle Eintraege ScOutlineEntry* pEntry; while ((pEntry=aIter.GetNext()) != NULL) { USHORT nThisLevel = aIter.LastLevel(); BOOL bShow = (nThisLevel < nLevel); - if (bShow) // einblenden + if (bShow) // einblenden { pEntry->SetHidden( FALSE ); pEntry->SetVisible( TRUE ); } - else if ( nThisLevel == nLevel ) // ausblenden + else if ( nThisLevel == nLevel ) // ausblenden { pEntry->SetHidden( TRUE ); pEntry->SetVisible( TRUE ); } - else // verdeckt + else // verdeckt { pEntry->SetVisible( FALSE ); } @@ -481,7 +481,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, pUndoDoc, pUndoTab, TRUE ) ); } - // Spalten + // Spalten nMin=MAXCOL; nMax=0; @@ -502,7 +502,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, for ( i=nMin; i<=nMax; i++ ) pDoc->ShowCol( static_cast<SCCOL>(i), nTab, TRUE ); - // Zeilen + // Zeilen nMin=MAXROW; nMax=0; @@ -522,7 +522,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, } } for ( i=nMin; i<=nMax; i++ ) - if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden + if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden pDoc->ShowRow( i, nTab, TRUE ); pDoc->SetDrawPageSize(nTab); @@ -594,7 +594,7 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, pUndoDoc, pUndoTab, FALSE ) ); } - // Spalten + // Spalten nCount = pColArray->GetCount(nColLevel); for ( i=0; i<nCount; i++ ) @@ -607,7 +607,7 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, HideOutline( nTab, TRUE, nColLevel, i, FALSE, FALSE, bApi ); } - // Zeilen + // Zeilen nCount = pRowArray->GetCount(nRowLevel); for ( i=0; i<nCount; i++ ) @@ -669,11 +669,11 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDoOutline( &rDocShell, - nStart, nEnd, nTab, pUndoDoc, //! start und end berechnen + nStart, nEnd, nTab, pUndoDoc, //! start und end berechnen bColumns, nLevel, nEntry, TRUE ) ); } -//! HideCursor(); +//! HideCursor(); pDoc->InitializeNoteCaptions(nTab); pEntry->SetHidden(FALSE); @@ -683,7 +683,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US if ( bColumns ) pDoc->ShowCol( static_cast<SCCOL>(i), nTab, TRUE ); else - if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden + if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden pDoc->ShowRow( i, nTab, TRUE ); } @@ -713,15 +713,15 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US if (bPaint) lcl_PaintWidthHeight( rDocShell, nTab, bColumns, nStart, nEnd ); -//! ShowCursor(); +//! ShowCursor(); rDocShell.SetDocumentModified(); -//! if (bPaint) -//! UpdateScrollBars(); +//! if (bPaint) +//! UpdateScrollBars(); lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); - return TRUE; //! immer ??? + return TRUE; //! immer ??? } BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, @@ -735,7 +735,7 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray(); ScOutlineEntry* pEntry = pArray->GetEntry( nLevel, nEntry ); SCCOLROW nStart = pEntry->GetStart(); - SCCOLROW nEnd = pEntry->GetEnd(); + SCCOLROW nEnd = pEntry->GetEnd(); if ( bRecord ) { @@ -759,7 +759,7 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US bColumns, nLevel, nEntry, FALSE ) ); } -//! HideCursor(); +//! HideCursor(); pDoc->InitializeNoteCaptions(nTab); pEntry->SetHidden(TRUE); @@ -781,15 +781,15 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US if (bPaint) lcl_PaintWidthHeight( rDocShell, nTab, bColumns, nStart, nEnd ); -//! ShowCursor(); +//! ShowCursor(); rDocShell.SetDocumentModified(); -//! if (bPaint) -//! UpdateScrollBars(); +//! if (bPaint) +//! UpdateScrollBars(); lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); - return TRUE; //! immer ??? + return TRUE; //! immer ??? } diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx index e87c2322a228..6bd7ea083203 100644 --- a/sc/source/ui/docshell/pagedata.cxx +++ b/sc/source/ui/docshell/pagedata.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 @@ -118,7 +118,7 @@ BOOL ScPageBreakData::IsEqual( const ScPageBreakData& rOther ) const if ( pData[i].GetPrintRange() != rOther.pData[i].GetPrintRange() ) return FALSE; - //! ScPrintRangeData komplett vergleichen ?? + //! ScPrintRangeData komplett vergleichen ?? return TRUE; } diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index 0450f7c67a0d..0b71453b39d7 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.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/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 186b94f3bf83..7aecfb6d0b08 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.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 @@ -40,7 +40,7 @@ #include "impex.hxx" #include "brdcst.hxx" #include "rangenam.hxx" -#include "sc.hrc" // SC_HINT_AREAS_CHANGED +#include "sc.hrc" // SC_HINT_AREAS_CHANGED using namespace formula; @@ -87,15 +87,15 @@ ScServerObject::ScServerObject( ScDocShell* pShell, const String& rItem ) : pDocSh( pShell ), bRefreshListener( FALSE ) { - // parse item string + // parse item string if ( lcl_FillRangeFromName( aRange, pDocSh, rItem ) ) { - aItemStr = rItem; // must be parsed again on ref update + aItemStr = rItem; // must be parsed again on ref update } else { - // parse ref + // parse ref ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = pDocSh->GetCurTab(); aRange.aStart.SetTab( nTab ); @@ -120,8 +120,8 @@ ScServerObject::ScServerObject( ScDocShell* pShell, const String& rItem ) : pDocSh->GetDocument()->GetLinkManager()->InsertServer( this ); pDocSh->GetDocument()->StartListeningArea( aRange, &aForwarder ); - StartListening(*pDocSh); // um mitzubekommen, wenn die DocShell geloescht wird - StartListening(*SFX_APP()); // for SC_HINT_AREAS_CHANGED + StartListening(*pDocSh); // um mitzubekommen, wenn die DocShell geloescht wird + StartListening(*SFX_APP()); // for SC_HINT_AREAS_CHANGED } __EXPORT ScServerObject::~ScServerObject() @@ -169,7 +169,7 @@ BOOL __EXPORT ScServerObject::GetData( if ( bRefreshListener ) { - // refresh the listeners now (this is called from a timer) + // refresh the listeners now (this is called from a timer) EndListeningAll(); pDocSh->GetDocument()->StartListeningArea( aRange, &aForwarder ); @@ -217,15 +217,15 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint { BOOL bDataChanged = FALSE; - // DocShell can't be tested via type info, because SFX_HINT_DYING comes from the dtor + // DocShell can't be tested via type info, because SFX_HINT_DYING comes from the dtor if ( &rBC == pDocSh ) { - // from DocShell, only SFX_HINT_DYING is interesting + // from DocShell, only SFX_HINT_DYING is interesting if ( rHint.ISA(SfxSimpleHint) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { pDocSh = NULL; EndListening(*SFX_APP()); - // don't access DocShell anymore for EndListening etc. + // don't access DocShell anymore for EndListening etc. } } else if (rBC.ISA(SfxApplication)) @@ -233,7 +233,7 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint if ( aItemStr.Len() && rHint.ISA(SfxSimpleHint) && ((const SfxSimpleHint&)rHint).GetId() == SC_HINT_AREAS_CHANGED ) { - // check if named range was modified + // check if named range was modified ScRange aNew; if ( lcl_FillRangeFromName( aNew, pDocSh, aItemStr ) && aNew != aRange ) bDataChanged = TRUE; @@ -241,12 +241,12 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint } else { - // must be from Area broadcasters + // must be from Area broadcasters const ScHint* pScHint = PTR_CAST( ScHint, &rHint ); if( pScHint && (pScHint->GetId() & (SC_HINT_DATACHANGED | SC_HINT_DYING)) ) bDataChanged = TRUE; - else if (rHint.ISA(ScAreaChangedHint)) // position of broadcaster changed + else if (rHint.ISA(ScAreaChangedHint)) // position of broadcaster changed { ScRange aNewRange = ((const ScAreaChangedHint&)rHint).GetRange(); if ( aRange != aNewRange ) @@ -260,8 +260,8 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ULONG nId = ((const SfxSimpleHint&)rHint).GetId(); if (nId == SFX_HINT_DYING) { - // If the range is being deleted, listening must be restarted - // after the deletion is complete (done in GetData) + // If the range is being deleted, listening must be restarted + // after the deletion is complete (done in GetData) bRefreshListener = TRUE; bDataChanged = TRUE; } diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx index 3171fa8164ae..e2452affd6f0 100644 --- a/sc/source/ui/docshell/sizedev.cxx +++ b/sc/source/ui/docshell/sizedev.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,7 +50,7 @@ ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* pDocSh ) bOwner = FALSE; aOldMapMode = pDevice->GetMapMode(); - pDevice->SetMapMode( MAP_PIXEL ); // GetNeededSize needs pixel MapMode + pDevice->SetMapMode( MAP_PIXEL ); // GetNeededSize needs pixel MapMode // printer has right DigitLanguage already } else diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index f949b3ffb45c..65f3119009bc 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.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 @@ -129,8 +129,8 @@ __EXPORT ScTableLink::~ScTableLink() void __EXPORT ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl ) { - // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom - // ein Optionen-Dialog kommt... + // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom + // ein Optionen-Dialog kommt... pImpl->m_aEndEditLink = rEndEditHdl; pImpl->m_pOldParent = Application::GetDefDialogParent(); @@ -151,12 +151,12 @@ void __EXPORT ScTableLink::DataChanged( const String&, String aFilter; pLinkManager->GetDisplayNames( this,0,&aFile,NULL,&aFilter); - // the file dialog returns the filter name with the application prefix - // -> remove prefix + // the file dialog returns the filter name with the application prefix + // -> remove prefix ScDocumentLoader::RemoveAppPrefix( aFilter ); if (!bInCreate) - Refresh( aFile, aFilter, NULL, GetRefreshDelay() ); // don't load twice + Refresh( aFile, aFilter, NULL, GetRefreshDelay() ); // don't load twice } } @@ -171,7 +171,7 @@ void __EXPORT ScTableLink::Closed() pImpl->m_pDocSh->GetUndoManager()->AddUndoAction( new ScUndoRemoveLink( pImpl->m_pDocSh, aFileName ) ); - bAddUndo = FALSE; // nur einmal + bAddUndo = FALSE; // nur einmal } // Verbindung wird im dtor aufgehoben @@ -187,7 +187,7 @@ BOOL ScTableLink::IsUsed() const BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, const String* pNewOptions, ULONG nNewRefresh ) { - // Dokument laden + // Dokument laden if (!rNewFile.Len() || !rNewFilter.Len()) return FALSE; @@ -204,21 +204,21 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, BOOL bUndo(pDoc->IsUndoEnabled()); - // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen + // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen if ( rNewFilter != aFilterName ) aOptions.Erase(); - if ( pNewOptions ) // Optionen hart angegeben? + if ( pNewOptions ) // Optionen hart angegeben? aOptions = *pNewOptions; - // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann + // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() ); if ( aOptions.Len() ) pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) ); SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter, pSet); - if ( bInEdit ) // only if using the edit dialog, - pMed->UseInteractionHandler( TRUE ); // enable the filter options dialog + if ( bInEdit ) // only if using the edit dialog, + pMed->UseInteractionHandler( TRUE ); // enable the filter options dialog ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL); SfxObjectShellRef aRef = pSrcShell; @@ -229,22 +229,22 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, if (!aNewOpt.Len()) aNewOpt = aOptions; - // Undo... + // Undo... ScDocument* pUndoDoc = NULL; BOOL bFirst = TRUE; if (bAddUndo && bUndo) pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - // Tabellen kopieren + // Tabellen kopieren ScDocShellModificator aModificator( *pImpl->m_pDocSh ); BOOL bNotFound = FALSE; ScDocument* pSrcDoc = pSrcShell->GetDocument(); - // #74835# from text filters that don't set the table name, - // use the one table regardless of link table name + // #74835# from text filters that don't set the table name, + // use the one table regardless of link table name BOOL bAutoTab = (pSrcDoc->GetTableCount() == 1) && ScDocShell::HasAutomaticTableName( rNewFilter ); @@ -256,7 +256,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, { String aTabName = pDoc->GetLinkTab(nTab); - // Undo + // Undo if (bAddUndo && bUndo) { @@ -272,7 +272,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, aOptions, aTabName, GetRefreshDelay() ); } - // Tabellenname einer ExtDocRef anpassen + // Tabellenname einer ExtDocRef anpassen if ( bNewUrlName && nMode == SC_LINK_VALUE ) { @@ -283,11 +283,11 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, { pDoc->RenameTab( nTab, ScGlobal::GetDocTabName( aNewUrl, aTabName ), - FALSE, TRUE ); // kein RefUpdate, kein ValidTabName + FALSE, TRUE ); // kein RefUpdate, kein ValidTabName } } - // kopieren + // kopieren SCTAB nSrcTab = 0; bool bFound = false; @@ -304,8 +304,8 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, } if (bFound) - pDoc->TransferTab( pSrcDoc, nSrcTab, nTab, FALSE, // nicht neu einfuegen - (nMode == SC_LINK_VALUE) ); // nur Werte? + pDoc->TransferTab( pSrcDoc, nSrcTab, nTab, FALSE, // nicht neu einfuegen + (nMode == SC_LINK_VALUE) ); // nur Werte? else { pDoc->DeleteAreaTab( 0,0,MAXCOL,MAXROW, nTab, IDF_ALL ); @@ -318,7 +318,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, ScRangeList aErrorCells; // cells on the linked sheets that need error values - ScCellIterator aCellIter( pDoc, 0,0,0, MAXCOL,MAXROW,MAXTAB ); // all sheets + ScCellIterator aCellIter( pDoc, 0,0,0, MAXCOL,MAXROW,MAXTAB ); // all sheets ScBaseCell* pCell = aCellIter.GetFirst(); while (pCell) { @@ -393,7 +393,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, } } - // neue Einstellungen merken + // neue Einstellungen merken if ( bNewUrlName ) aFileName = aNewUrl; @@ -402,18 +402,18 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, if ( aNewOpt != aOptions ) aOptions = aNewOpt; - // aufraeumen + // aufraeumen -// pSrcShell->DoClose(); +// pSrcShell->DoClose(); aRef->DoClose(); - // Undo + // Undo if (bAddUndo && bUndo) pImpl->m_pDocSh->GetUndoManager()->AddUndoAction( new ScUndoRefreshLink( pImpl->m_pDocSh, pUndoDoc ) ); - // Paint (koennen mehrere Tabellen sein) + // Paint (koennen mehrere Tabellen sein) if (bDoPaint) { @@ -424,13 +424,13 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, if (bNotFound) { - //! Fehler ausgeben ? + //! Fehler ausgeben ? } pDoc->SetInLinkUpdate( FALSE ); - // notify Uno objects (for XRefreshListener) - //! also notify Uno objects if file name was changed! + // notify Uno objects (for XRefreshListener) + //! also notify Uno objects if file name was changed! ScLinkRefreshedHint aHint; aHint.SetSheetLink( aFileName ); pDoc->BroadcastUno( aHint ); @@ -455,7 +455,7 @@ IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink ) // === ScDocumentLoader ================================================== -String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) // static +String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) // static { SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; @@ -491,7 +491,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName, if ( eProt == INET_PROT_NOT_VALID ) // invalid URL? return FALSE; // abort without creating a medium - // Filter-Detection + // Filter-Detection const SfxFilter* pSfxFilter = NULL; SfxMedium* pMedium = new SfxMedium( rFileName, STREAM_STD_READ, FALSE ); @@ -513,7 +513,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName, if ( pSfxFilter ) rFilter = pSfxFilter->GetFilterName(); else - rFilter = ScDocShell::GetOwnFilterName(); // sonst Calc-Datei + rFilter = ScDocShell::GetOwnFilterName(); // sonst Calc-Datei bOK = (rFilter.Len()>0); } @@ -521,7 +521,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName, return bOK; } -void ScDocumentLoader::RemoveAppPrefix( String& rFilterName ) // static +void ScDocumentLoader::RemoveAppPrefix( String& rFilterName ) // static { String aAppPrefix = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); aAppPrefix.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); @@ -541,7 +541,7 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName, const SfxFilter* pFilter = ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName( rFilterName ); - // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann + // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() ); if ( rOptions.Len() ) pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, rOptions ) ); @@ -551,7 +551,7 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName, return ; if ( bWithInteraction ) - pMedium->UseInteractionHandler( TRUE ); // to enable the filter options dialog + pMedium->UseInteractionHandler( TRUE ); // to enable the filter options dialog pDocShell = new ScDocShell( SFX_CREATE_MODE_INTERNAL ); aRef = pDocShell; @@ -559,7 +559,7 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName, ScDocument* pDoc = pDocShell->GetDocument(); if( pDoc ) { - ScExtDocOptions* pExtDocOpt = pDoc->GetExtDocOptions(); + ScExtDocOptions* pExtDocOpt = pDoc->GetExtDocOptions(); if( !pExtDocOpt ) { pExtDocOpt = new ScExtDocOptions; @@ -570,7 +570,7 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName, pDocShell->DoLoad( pMedium ); - String aNew = GetOptions(*pMedium); // Optionen werden beim Laden per Dialog gesetzt + String aNew = GetOptions(*pMedium); // Optionen werden beim Laden per Dialog gesetzt if (aNew.Len() && aNew != rOptions) rOptions = aNew; } @@ -590,8 +590,8 @@ void ScDocumentLoader::ReleaseDocRef() { if ( aRef.Is() ) { - // release reference without calling DoClose - caller must - // have another reference to the doc and call DoClose later + // release reference without calling DoClose - caller must + // have another reference to the doc and call DoClose later pDocShell = NULL; pMedium = NULL; diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index b5ced9d105a8..640c0a9b6e8b 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.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 @@ -53,17 +53,17 @@ SfxTabPage* __EXPORT ScDocStatPage::Create( Window *pParent, const SfxItemSet& r //------------------------------------------------------------------------ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) - : SfxTabPage( pParent, ScResId(RID_SCPAGE_STAT), rSet ), + : SfxTabPage( pParent, ScResId(RID_SCPAGE_STAT), rSet ), aFlInfo ( this, ScResId( FL_INFO ) ), - aFtTablesLbl ( this, ScResId( FT_TABLES_LBL ) ), - aFtTables ( this, ScResId( FT_TABLES ) ), - aFtCellsLbl ( this, ScResId( FT_CELLS_LBL ) ), - aFtCells ( this, ScResId( FT_CELLS ) ), - aFtPagesLbl ( this, ScResId( FT_PAGES_LBL ) ), - aFtPages ( this, ScResId( FT_PAGES ) ) + aFtTablesLbl ( this, ScResId( FT_TABLES_LBL ) ), + aFtTables ( this, ScResId( FT_TABLES ) ), + aFtCellsLbl ( this, ScResId( FT_CELLS_LBL ) ), + aFtCells ( this, ScResId( FT_CELLS ) ), + aFtPagesLbl ( this, ScResId( FT_PAGES_LBL ) ), + aFtPages ( this, ScResId( FT_PAGES ) ) { ScDocShell* pDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); - ScDocStat aDocStat; + ScDocStat aDocStat; if ( pDocSh ) pDocSh->GetDocStat( aDocStat ); @@ -71,9 +71,9 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) String aInfo = aFlInfo.GetText(); aInfo += aDocStat.aDocName; aFlInfo .SetText( aInfo ); - aFtTables .SetText( String::CreateFromInt32( aDocStat.nTableCount ) ); - aFtCells .SetText( String::CreateFromInt32( aDocStat.nCellCount ) ); - aFtPages .SetText( String::CreateFromInt32( aDocStat.nPageCount ) ); + aFtTables .SetText( String::CreateFromInt32( aDocStat.nTableCount ) ); + aFtCells .SetText( String::CreateFromInt32( aDocStat.nCellCount ) ); + aFtPages .SetText( String::CreateFromInt32( aDocStat.nPageCount ) ); FreeResource(); } diff --git a/sc/source/ui/docshell/tpstat.hrc b/sc/source/ui/docshell/tpstat.hrc index 2b57d20f1a26..67cbea380f9b 100644 --- a/sc/source/ui/docshell/tpstat.hrc +++ b/sc/source/ui/docshell/tpstat.hrc @@ -1,7 +1,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 @@ -26,11 +26,11 @@ ************************************************************************/ #include "sc.hrc" -#define FT_TABLES 1 -#define FT_TABLES_LBL 2 -#define FT_CELLS 3 -#define FT_CELLS_LBL 4 -#define FT_PAGES 5 -#define FT_PAGES_LBL 6 +#define FT_TABLES 1 +#define FT_TABLES_LBL 2 +#define FT_CELLS 3 +#define FT_CELLS_LBL 4 +#define FT_PAGES 5 +#define FT_PAGES_LBL 6 #define FL_INFO 1 diff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.src index 7226da4642c3..b5e338ddc6a8 100644 --- a/sc/source/ui/docshell/tpstat.src +++ b/sc/source/ui/docshell/tpstat.src @@ -1,7 +1,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 @@ -28,7 +28,7 @@ #include "tpstat.hrc" TabPage RID_SCPAGE_STAT { - // HelpID = HID_DOC_STAT; + // HelpID = HID_DOC_STAT; Hide = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; FixedText FT_TABLES_LBL diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 77823a9b37d3..ce71b1b920c4 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.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/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 5da044f24d89..8b7e21d2f08a 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.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 @@ -111,11 +111,11 @@ void lcl_setModified( SfxObjectShell* pShell ) void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) { - USHORT nSlot = rReq.GetSlot(); - Window* pWin = pViewData->GetActiveWin(); -// SfxViewFrame* pViewFrame = SfxViewShell::Current()->GetViewFrame(); //!!! koennte knallen - ScDrawView* pView = pViewData->GetScDrawView(); - SdrModel* pDoc = pViewData->GetDocument()->GetDrawLayer(); + USHORT nSlot = rReq.GetSlot(); + Window* pWin = pViewData->GetActiveWin(); +// SfxViewFrame* pViewFrame = SfxViewShell::Current()->GetViewFrame(); //!!! koennte knallen + ScDrawView* pView = pViewData->GetScDrawView(); + SdrModel* pDoc = pViewData->GetDocument()->GetDrawLayer(); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); ULONG nMarkCount = rMarkList.GetMarkCount(); @@ -132,7 +132,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) } break; - case SID_TEXT_STANDARD: // Harte Textattributierung loeschen + case SID_TEXT_STANDARD: // Harte Textattributierung loeschen { SfxItemSet aEmptyAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END); pView->SetAttributes(aEmptyAttr, TRUE); @@ -366,15 +366,15 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) { - ScDrawView* pView = pViewData->GetScDrawView(); - BOOL bHasMarked = pView->AreObjectsMarked(); - const SdrObject* pObj = NULL; - const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); + ScDrawView* pView = pViewData->GetScDrawView(); + BOOL bHasMarked = pView->AreObjectsMarked(); + const SdrObject* pObj = NULL; + const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if( rMarkList.GetMarkCount() == 1 ) pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - SfxItemSet aNewAttr( pView->GetDefaultAttr() ); + SfxItemSet aNewAttr( pView->GetDefaultAttr() ); if( bHasMarked ) pView->MergeAttrFromMarked( aNewAttr, FALSE ); @@ -405,10 +405,10 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage ) { - ScDrawView* pView = pViewData->GetScDrawView(); - BOOL bHasMarked = pView->AreObjectsMarked(); + ScDrawView* pView = pViewData->GetScDrawView(); + BOOL bHasMarked = pView->AreObjectsMarked(); - SfxItemSet aNewAttr( pView->GetDefaultAttr() ); + SfxItemSet aNewAttr( pView->GetDefaultAttr() ); if( bHasMarked ) pView->MergeAttrFromMarked( aNewAttr, FALSE ); @@ -447,9 +447,9 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage ) void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ ) { - ScDrawView* pView = pViewData->GetScDrawView(); - BOOL bHasMarked = pView->AreObjectsMarked(); - SfxItemSet aNewAttr ( pView->GetDefaultAttr() ); + ScDrawView* pView = pViewData->GetScDrawView(); + BOOL bHasMarked = pView->AreObjectsMarked(); + SfxItemSet aNewAttr ( pView->GetDefaultAttr() ); if( bHasMarked ) pView->MergeAttrFromMarked( aNewAttr, FALSE ); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 0a5b5ad7c21f..b32bc7a432d3 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.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,7 +58,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdocapt.hxx> -USHORT ScGetFontWorkId(); // in drtxtob +USHORT ScGetFontWorkId(); // in drtxtob using namespace com::sun::star; @@ -83,10 +83,10 @@ ScDrawShell::~ScDrawShell() { } -void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles +void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles { - ScDrawView* pView = pViewData->GetScDrawView(); - SdrDragMode eMode = pView->GetDragMode(); + ScDrawView* pView = pViewData->GetScDrawView(); + SdrDragMode eMode = pView->GetDragMode(); rSet.Put( SfxBoolItem( SID_OBJECT_ROTATE, eMode == SDRDRAG_ROTATE ) ); rSet.Put( SfxBoolItem( SID_OBJECT_MIRROR, eMode == SDRDRAG_MIRROR ) ); @@ -133,12 +133,12 @@ void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles } } -void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disablen +void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disablen { ScDrawView* pView = pViewData->GetScDrawView(); - // #111711# call IsMirrorAllowed first to make sure ForcePossibilities (and thus CheckMarked) - // is called before GetMarkCount, so the nMarkCount value is valid for the rest of this method. + // #111711# call IsMirrorAllowed first to make sure ForcePossibilities (and thus CheckMarked) + // is called before GetMarkCount, so the nMarkCount value is valid for the rest of this method. if (!pView->IsMirrorAllowed(TRUE,TRUE)) { rSet.DisableItem( SID_MIRROR_HORIZONTAL ); @@ -157,10 +157,10 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl if ( !pView->IsGroupEntered() ) rSet.DisableItem( SID_LEAVE_GROUP ); - if ( nMarkCount <= 1 ) // nichts oder nur ein Objekt selektiert + if ( nMarkCount <= 1 ) // nichts oder nur ein Objekt selektiert { - // Ausrichtung - rSet.DisableItem( SID_OBJECT_ALIGN_LEFT ); // keine Ausrichtung an der Seite + // Ausrichtung + rSet.DisableItem( SID_OBJECT_ALIGN_LEFT ); // keine Ausrichtung an der Seite rSet.DisableItem( SID_OBJECT_ALIGN_CENTER ); rSet.DisableItem( SID_OBJECT_ALIGN_RIGHT ); rSet.DisableItem( SID_OBJECT_ALIGN_UP ); @@ -246,19 +246,19 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl rSet.DisableItem( SID_TITLE_DESCRIPTION_OBJECT ); } - if ( !nMarkCount ) // nichts selektiert + if ( !nMarkCount ) // nichts selektiert { - // Anordnung + // Anordnung rSet.DisableItem( SID_FRAME_UP ); rSet.DisableItem( SID_FRAME_DOWN ); rSet.DisableItem( SID_FRAME_TO_TOP ); rSet.DisableItem( SID_FRAME_TO_BOTTOM ); - // Clipboard / loeschen + // Clipboard / loeschen rSet.DisableItem( SID_DELETE ); rSet.DisableItem( SID_DELETE_CONTENTS ); rSet.DisableItem( SID_CUT ); rSet.DisableItem( SID_COPY ); - // sonstiges + // sonstiges rSet.DisableItem( SID_ANCHOR_TOGGLE ); rSet.DisableItem( SID_ORIGINALSIZE ); rSet.DisableItem( SID_ATTR_TRANSFORM ); @@ -280,16 +280,16 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl } // -// Attribute fuer Drawing-Objekte +// Attribute fuer Drawing-Objekte // void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) { - Point aMousePos = pViewData->GetMousePosPixel(); - Window* pWindow = pViewData->GetActiveWin(); - ScDrawView* pDrView = pViewData->GetScDrawView(); - Point aPos = pWindow->PixelToLogic(aMousePos); - BOOL bHasMarked = pDrView->AreObjectsMarked(); + Point aMousePos = pViewData->GetMousePosPixel(); + Window* pWindow = pViewData->GetActiveWin(); + ScDrawView* pDrView = pViewData->GetScDrawView(); + Point aPos = pWindow->PixelToLogic(aMousePos); + BOOL bHasMarked = pDrView->AreObjectsMarked(); if( bHasMarked ) { @@ -359,15 +359,15 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet) { - // Dialoge fuer Draw-Attribute disablen, wenn noetig + // Dialoge fuer Draw-Attribute disablen, wenn noetig - ScDrawView* pDrView = pViewData->GetScDrawView(); + ScDrawView* pDrView = pViewData->GetScDrawView(); SfxItemSet aViewSet = pDrView->GetAttrFromMarked(FALSE); if ( aViewSet.GetItemState( XATTR_LINESTYLE ) == SFX_ITEM_DEFAULT ) { rSet.DisableItem( SID_ATTRIBUTES_LINE ); - rSet.DisableItem( SID_ATTR_LINEEND_STYLE ); // Tbx-Controller + rSet.DisableItem( SID_ATTR_LINEEND_STYLE ); // Tbx-Controller } if ( aViewSet.GetItemState( XATTR_FILLSTYLE ) == SFX_ITEM_DEFAULT ) diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx index fe432103a912..863a079e7ce6 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.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,11 +52,11 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet) { - const SdrObject* pObj = NULL; - SvxFontWorkDialog* pDlg = NULL; - ScDrawView* pDrView = pViewData->GetScDrawView(); - const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + const SdrObject* pObj = NULL; + SvxFontWorkDialog* pDlg = NULL; + ScDrawView* pDrView = pViewData->GetScDrawView(); + const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); + USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); if ( pViewFrm->HasChildWindow(nId) ) @@ -93,7 +93,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet) if ( pDocSh ) { const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); - XColorTable* pColorTable = NULL; + XColorTable* pColorTable = NULL; if ( pItem ) pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable(); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 23270038e419..23c29521698c 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.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 @@ -531,8 +531,8 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) if(OBJ_GRAF == nObjType && 0L == aName.Len()) { - // graphics objects must have names - // (all graphics are supposed to be in the navigator) + // graphics objects must have names + // (all graphics are supposed to be in the navigator) ScDrawLayer* pModel = pViewData->GetDocument()->GetDrawLayer(); if(pModel) @@ -541,9 +541,9 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) } } - // An undo action for renaming is missing in svdraw (99363). - // For OLE objects (which can be identified using the persist name), - // ScUndoRenameObject can be used until there is a common action for all objects. + // An undo action for renaming is missing in svdraw (99363). + // For OLE objects (which can be identified using the persist name), + // ScUndoRenameObject can be used until there is a common action for all objects. if(OBJ_OLE2 == nObjType) { const String aPersistName = static_cast<SdrOle2Obj*>(pSelected)->GetPersistName(); @@ -666,7 +666,7 @@ IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog ) } } - return 1; // name is valid + return 1; // name is valid } //------------------------------------------------------------------ diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index e9a986cac5f9..f28699b73016 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.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/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index 65e98eea7b2c..75100da513a2 100644 --- a/sc/source/ui/drawfunc/drformsh.src +++ b/sc/source/ui/drawfunc/drformsh.src @@ -1,7 +1,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 @@ -29,7 +29,7 @@ #include "submenu.hrc" #include <svx/globlmn.hrc> // - // Defines ------------------------------------------------------------------------------- + // Defines ------------------------------------------------------------------------------- // #define MN_LAYER\ ToolBoxItem\ @@ -133,7 +133,7 @@ };\ }; -#define MN_ALIGNSUB \ +#define MN_ALIGNSUB \ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN ; \ @@ -176,7 +176,7 @@ }; - // Popup-Menues --------------------------------------------------------------------- + // Popup-Menues --------------------------------------------------------------------- // String RID_POPUP_DRAWFORM { @@ -184,7 +184,7 @@ String RID_POPUP_DRAWFORM Text [ en-US ] = "Popup menu for form objects"; }; // - // Popup-Menue fuer (Uno-) Controls + // Popup-Menue fuer (Uno-) Controls // Menu RID_POPUP_DRAWFORM { diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index aba4cfa8eabe..e4d02ed69752 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.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 @@ -127,7 +127,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) : { SetPool( pViewData->GetScDrawView()->GetDefaultAttr().GetPool() ); - // UndoManager wird beim Umschalten in den Edit-Modus umgesetzt... + // UndoManager wird beim Umschalten in den Edit-Modus umgesetzt... SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); SetUndoManager( pMgr ); if ( !pViewData->GetDocument()->IsUndoEnabled() ) @@ -155,7 +155,7 @@ __EXPORT ScDrawTextObjectBar::~ScDrawTextObjectBar() //======================================================================== // -// Funktionen +// Funktionen // //======================================================================== @@ -167,7 +167,7 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq ) if (!pOutView || !pOutliner) { - ExecuteGlobal( rReq ); // auf ganze Objekte + ExecuteGlobal( rReq ); // auf ganze Objekte return; } @@ -250,14 +250,14 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq ) else aNewItem = rItem; } - else + else ScViewUtil::ExecuteCharMap( rItem, *pViewData->GetViewShell()->GetViewFrame(), aNewItem, aString ); if ( aString.Len() ) { SfxItemSet aSet( pOutliner->GetEmptyItemSet() ); aSet.Put( aNewItem ); - // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist + // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist pOutView->GetOutliner()->QuickSetAttribs( aSet, pOutView->GetSelection() ); pOutView->InsertText(aString); } @@ -273,21 +273,21 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq ) if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; - const String& rName = pHyper->GetName(); - const String& rURL = pHyper->GetURL(); - const String& rTarget = pHyper->GetTargetFrame(); + const String& rName = pHyper->GetName(); + const String& rURL = pHyper->GetURL(); + const String& rTarget = pHyper->GetTargetFrame(); SvxLinkInsertMode eMode = pHyper->GetInsertMode(); BOOL bDone = FALSE; if ( pOutView && ( eMode == HLINK_DEFAULT || eMode == HLINK_FIELD ) ) { - const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection(); + const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection(); if (pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); if ( pField && pField->ISA(SvxURLField) ) { - // altes Feld selektieren + // altes Feld selektieren ESelection aSel = pOutView->GetSelection(); aSel.Adjust(); @@ -297,19 +297,19 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq ) } } - // neues Feld einfuegen + // neues Feld einfuegen SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR ); aURLField.SetTargetFrame( rTarget ); SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD ); pOutView->InsertField( aURLItem ); - // select new field + // select new field ESelection aSel = pOutView->GetSelection(); if ( aSel.nStartPos == aSel.nEndPos && aSel.nStartPos > 0 ) { - // Cursor is behind the inserted field -> extend selection to the left + // Cursor is behind the inserted field -> extend selection to the left --aSel.nStartPos; pOutView->SetSelection( aSel ); @@ -319,9 +319,9 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq ) } if (!bDone) - ExecuteGlobal( rReq ); // normal an der View + ExecuteGlobal( rReq ); // normal an der View - // InsertURL an der ViewShell schaltet bei "Text" die DrawShell ab !!! + // InsertURL an der ViewShell schaltet bei "Text" die DrawShell ab !!! } } break; @@ -347,12 +347,12 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq ) case SID_ENABLE_HYPHENATION: case SID_TEXTDIRECTION_LEFT_TO_RIGHT: case SID_TEXTDIRECTION_TOP_TO_BOTTOM: - pView->ScEndTextEdit(); // end text edit before switching direction + pView->ScEndTextEdit(); // end text edit before switching direction ExecuteGlobal( rReq ); // restore consistent state between shells and functions: pViewData->GetDispatcher().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); break; - + case SID_THES: { String aReplaceText; @@ -362,14 +362,14 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq ) if (aReplaceText.Len() > 0) ReplaceTextWithSynonym( pOutView->GetEditView(), aReplaceText ); } - break; - + break; + case SID_THESAURUS: { pOutView->StartThesaurus(); } - break; - + break; + } } @@ -386,7 +386,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) } if ( bDisableFontWork ) - rSet.DisableItem( SID_FONTWORK ); + rSet.DisableItem( SID_FONTWORK ); else rSet.Put(SfxBoolItem(SID_FONTWORK, bHasFontWork)); @@ -398,7 +398,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) if ( pOutView ) { BOOL bField = FALSE; - const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection(); + const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection(); if (pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); @@ -462,12 +462,12 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) } } - if ( rSet.GetItemState( SID_THES ) != SFX_ITEM_UNKNOWN || + if ( rSet.GetItemState( SID_THES ) != SFX_ITEM_UNKNOWN || rSet.GetItemState( SID_THESAURUS ) != SFX_ITEM_UNKNOWN ) { SdrView * pView = pViewData->GetScDrawView(); OutlinerView* pOutView = pView->GetTextEditOutlinerView(); - + String aStatusVal; LanguageType nLang = LANGUAGE_NONE; bool bIsLookUpWord = false; @@ -484,7 +484,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) rSet.DisableItem( SID_THES ); if (!bCanDoThesaurus) rSet.DisableItem( SID_THESAURUS ); - } + } } IMPL_LINK( ScDrawTextObjectBar, ClipboardChanged, TransferableDataHelper*, pDataHelper ) @@ -558,13 +558,13 @@ void __EXPORT ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) //======================================================================== // -// Attribute +// Attribute // //======================================================================== void __EXPORT ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) { - // Unterstreichung + // Unterstreichung SdrView* pView = pViewData->GetScDrawView(); @@ -575,7 +575,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) SfxItemSet aViewAttr(pView->GetModel()->GetItemPool()); pView->GetAttributes(aViewAttr); - // Unterstreichung + // Unterstreichung FontUnderline eOld = ((const SvxUnderlineItem&) aViewAttr. Get(EE_CHAR_UNDERLINE)).GetLineStyle(); FontUnderline eNew = eOld; @@ -605,7 +605,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) void lcl_RemoveFields( OutlinerView& rOutView ) { - //! Outliner should have RemoveFields with a selection + //! Outliner should have RemoveFields with a selection Outliner* pOutliner = rOutView.GetOutliner(); if (!pOutliner) return; @@ -618,7 +618,7 @@ void lcl_RemoveFields( OutlinerView& rOutView ) BOOL bUpdate = pOutliner->GetUpdateMode(); BOOL bChanged = FALSE; - //! GetPortions and GetAttribs should be const! + //! GetPortions and GetAttribs should be const! EditEngine& rEditEng = (EditEngine&)pOutliner->GetEditEngine(); ULONG nParCount = pOutliner->GetParagraphCount(); @@ -627,7 +627,7 @@ void lcl_RemoveFields( OutlinerView& rOutView ) { SvUShorts aPortions; rEditEng.GetPortions( (USHORT)nPar, aPortions ); - //! GetPortions should use xub_StrLen instead of USHORT + //! GetPortions should use xub_StrLen instead of USHORT for ( USHORT nPos = aPortions.Count(); nPos; ) { @@ -670,30 +670,30 @@ void lcl_RemoveFields( OutlinerView& rOutView ) pOutliner->SetUpdateMode( TRUE ); } - if ( aOldSel.IsEqual( aSel ) ) // aSel is adjusted + if ( aOldSel.IsEqual( aSel ) ) // aSel is adjusted aOldSel.nEndPos = nNewEnd; else - aOldSel.nStartPos = nNewEnd; // if aOldSel is backwards + aOldSel.nStartPos = nNewEnd; // if aOldSel is backwards rOutView.SetSelection( aOldSel ); } void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) { - SdrView* pView = pViewData->GetScDrawView(); - const SfxItemSet* pArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + SdrView* pView = pViewData->GetScDrawView(); + const SfxItemSet* pArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); BOOL bArgsInReq = ( pArgs != NULL ); if ( !bArgsInReq ) { SfxItemSet aEditAttr(pView->GetModel()->GetItemPool()); pView->GetAttributes(aEditAttr); - SfxItemSet aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() ); - BOOL bDone = TRUE; + SfxItemSet aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() ); + BOOL bDone = TRUE; switch ( nSlot ) { - case SID_TEXT_STANDARD: // Harte Textattributierung loeschen + case SID_TEXT_STANDARD: // Harte Textattributierung loeschen { OutlinerView* pOutView = pView->IsTextEdit() ? pView->GetTextEditOutlinerView() : NULL; @@ -715,8 +715,8 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) } break; - case SID_CHAR_DLG: // Dialog-Button - case SID_ATTR_CHAR_FONT: // Controller nicht angezeigt + case SID_CHAR_DLG: // Dialog-Button + case SID_ATTR_CHAR_FONT: // Controller nicht angezeigt case SID_ATTR_CHAR_FONTHEIGHT: bDone = ExecuteCharDlg( aEditAttr, aNewAttr ); break; @@ -883,7 +883,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) // issue 21255 - Notes now support rich text formatting. } - SvtLanguageOptions aLangOpt; + SvtLanguageOptions aLangOpt; BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled(); BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); @@ -891,11 +891,11 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) SfxItemSet aAttrSet(pView->GetModel()->GetItemPool()); pView->GetAttributes(aAttrSet); - // direkte Attribute + // direkte Attribute rDestSet.Put( aAttrSet ); - // choose font info according to selection script type + // choose font info according to selection script type USHORT nScript = pView->GetScriptType(); @@ -919,7 +919,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) if ( rDestSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN ) ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_ITALIC, nScript ); - // Ausrichtung + // Ausrichtung SvxAdjust eAdj = ((const SvxAdjustItem&)aAttrSet.Get(EE_PARA_JUST)).GetAdjust(); switch( eAdj ) @@ -947,7 +947,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_RIGHT, eAdj == SVX_ADJUST_RIGHT ) ); rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_JUSTIFIED, eAdj == SVX_ADJUST_BLOCK ) ); - // Zeilenabstand + // Zeilenabstand USHORT nLineSpace = (USHORT) ((const SvxLineSpacingItem&)aAttrSet. @@ -965,7 +965,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) break; } - // hoch-/tiefgestellt + // hoch-/tiefgestellt SvxEscapement eEsc = (SvxEscapement) ( (const SvxEscapementItem&) aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); @@ -974,7 +974,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, TRUE ) ); - // Unterstreichung + // Unterstreichung SfxItemState eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, TRUE ); if ( eState == SFX_ITEM_DONTCARE ) @@ -991,16 +991,16 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) USHORT nId = SID_ULINE_VAL_NONE; switch (eUnderline) { - case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; - case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; - case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; + case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; + case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; + case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; default: break; } rDestSet.Put( SfxBoolItem( nId, TRUE ) ); } - // horizontal / vertical + // horizontal / vertical BOOL bLeftToRight = TRUE; @@ -1024,11 +1024,11 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) rDestSet.Put( SfxBoolItem( SID_TEXTDIRECTION_TOP_TO_BOTTOM, !bLeftToRight ) ); } - // left-to-right or right-to-left + // left-to-right or right-to-left if ( !bLeftToRight || bDisableCTLFont ) { - // disabled if vertical + // disabled if vertical rDestSet.DisableItem( SID_ATTR_PARA_LEFT_TO_RIGHT ); rDestSet.DisableItem( SID_ATTR_PARA_RIGHT_TO_LEFT ); } @@ -1043,7 +1043,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) aAttrSet.Get( EE_PARA_WRITINGDIR )).GetValue(); if ( eAttrDir == FRMDIR_ENVIRONMENT ) { - // get "environment" direction from page style + // get "environment" direction from page style if ( pViewData->GetDocument()->GetEditTextDirection( pViewData->GetTabNo() ) == EE_HTEXTDIR_R2L ) eAttrDir = FRMDIR_HORI_RIGHT_TOP; else @@ -1063,12 +1063,12 @@ void ScDrawTextObjectBar::ExecuteTrans( SfxRequest& rReq ) OutlinerView* pOutView = pView->GetTextEditOutlinerView(); if ( pOutView ) { - // change selected text in object + // change selected text in object pOutView->TransliterateText( nType ); } else { - //! apply to whole objects? + //! apply to whole objects? } } } diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index e3ab9efcd409..f018c7885213 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.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 @@ -128,13 +128,13 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest & /* rReq */ ) SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( pViewData->GetDialogParent() ); pDlg->Insert( SOT_FORMAT_STRING, EMPTY_STRING ); - pDlg->Insert( SOT_FORMAT_RTF, EMPTY_STRING ); + pDlg->Insert( SOT_FORMAT_RTF, EMPTY_STRING ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) ); ULONG nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() ); - //! test if outliner view is still valid + //! test if outliner view is still valid if (nFormat > 0) { diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index aef408544aa4..2934b4f779cd 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.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 @@ -68,12 +68,12 @@ BOOL ScDrawTextObjectBar::IsNoteEdit() return ScDrawLayer::IsNoteCaption( pViewData->GetView()->GetSdrView()->GetTextEditObject() ); } -// wenn kein Text editiert wird, Funktionen wie in drawsh +// wenn kein Text editiert wird, Funktionen wie in drawsh void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) { - ScTabView* pTabView = pViewData->GetView(); - ScDrawView* pView = pTabView->GetScDrawView(); + ScTabView* pTabView = pViewData->GetView(); + ScDrawView* pView = pTabView->GetScDrawView(); USHORT nSlot = rReq.GetSlot(); switch ( nSlot ) @@ -93,9 +93,9 @@ void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) case SID_CLIPBOARD_FORMAT_ITEMS: case SID_HYPERLINK_SETLINK: { - // cell methods are at cell shell, which is not available if - // ScDrawTextObjectBar is active - //! move paste etc. to view shell? + // cell methods are at cell shell, which is not available if + // ScDrawTextObjectBar is active + //! move paste etc. to view shell? } break; @@ -112,7 +112,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) com::sun::star::text::WritingMode_LR_TB : com::sun::star::text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION ) ); pView->SetAttributes( aAttr ); - pViewData->GetScDrawView()->InvalidateDrawTextAttrs(); // Bidi slots may be disabled + pViewData->GetScDrawView()->InvalidateDrawTextAttrs(); // Bidi slots may be disabled rReq.Done( aAttr ); } break; @@ -135,9 +135,9 @@ void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) void ScDrawTextObjectBar::GetGlobalClipState( SfxItemSet& rSet ) { - // cell methods are at cell shell, which is not available if - // ScDrawTextObjectBar is active -> disable everything - //! move paste etc. to view shell? + // cell methods are at cell shell, which is not available if + // ScDrawTextObjectBar is active -> disable everything + //! move paste etc. to view shell? SfxWhichIter aIter(rSet); USHORT nWhich = aIter.FirstWhich(); @@ -150,8 +150,8 @@ void ScDrawTextObjectBar::GetGlobalClipState( SfxItemSet& rSet ) void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) { - ScTabView* pTabView = pViewData->GetView(); - ScDrawView* pView = pTabView->GetScDrawView(); + ScTabView* pTabView = pViewData->GetView(); + ScDrawView* pView = pTabView->GetScDrawView(); USHORT nSlot = rReq.GetSlot(); switch ( nSlot ) @@ -190,7 +190,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) EE_PARA_JUST ) ); pView->SetAttributes( aAttr ); pViewData->GetScDrawView()->InvalidateDrawTextAttrs(); - rReq.Done(); //! Done(aAttr) ? + rReq.Done(); //! Done(aAttr) ? } break; @@ -199,9 +199,9 @@ void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq) { - ScTabView* pTabView = pViewData->GetView(); - ScDrawView* pDrView = pTabView->GetScDrawView(); - const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); + ScTabView* pTabView = pViewData->GetView(); + ScDrawView* pDrView = pTabView->GetScDrawView(); + const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() ) { @@ -211,15 +211,15 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq) if ( pDrView->IsTextEdit() ) pDrView->ScEndTextEdit(); - if ( SFX_ITEM_SET == + if ( SFX_ITEM_SET == rSet.GetItemState(XATTR_FORMTXTSTDFORM, TRUE, &pItem) && XFTFORM_NONE != ((const XFormTextStdFormItem*) pItem)->GetValue() ) { - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); - SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); - SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*) + USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); + SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*) (pViewFrm-> GetChildWindow(nId)->GetWindow()); @@ -235,11 +235,11 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq) void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) { - const SdrObject* pObj = NULL; - SvxFontWorkDialog* pDlg = NULL; - ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); - const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + const SdrObject* pObj = NULL; + SvxFontWorkDialog* pDlg = NULL; + ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); + const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); + USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); if ( pViewFrm->HasChildWindow(nId) ) @@ -276,7 +276,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) if ( pDocSh ) { const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); - XColorTable* pColorTable = NULL; + XColorTable* pColorTable = NULL; if ( pItem ) pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable(); diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 48c529d923e6..5cdbd551bbdf 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.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/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index dfcbdb2f5d49..98d0f0266c97 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.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 @@ -240,7 +240,7 @@ void FuConstCustomShape::SetAttributes( SdrObject* pObj ) if( pSourceObj ) { const SfxItemSet& rSource = pSourceObj->GetMergedItemSet(); - SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj + SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index d10259e3456e..321e34770aa6 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.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 @@ -39,7 +39,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/point/b2dpoint.hxx> -// Pixelabstand zum Schliessen von Freihand-Zeichnungen +// Pixelabstand zum Schliessen von Freihand-Zeichnungen #ifndef CLOSE_PIXDIST #define CLOSE_PIXDIST 5 #endif @@ -135,7 +135,7 @@ BOOL __EXPORT FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) if (aVEvt.eEvent == SDREVENT_ENDCREATE) { bReturn = TRUE; - bSimple = TRUE; // Doppelklick nicht weiterreichen + bSimple = TRUE; // Doppelklick nicht weiterreichen } BOOL bParent; @@ -273,9 +273,9 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta case SID_DRAW_BEZIER_NOFILL: { basegfx::B2DPolygon aInnerPoly; - + aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom())); - + const basegfx::B2DPoint aCenterBottom(rRectangle.Center().X(), rRectangle.Bottom()); aInnerPoly.appendBezierSegment( aCenterBottom, @@ -301,12 +301,12 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top()), basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Top()), basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Center().Y())); - + aInnerPoly.appendBezierSegment( basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Bottom()), basegfx::B2DPoint(rRectangle.Right(), rRectangle.Bottom()), basegfx::B2DPoint(rRectangle.Right(), rRectangle.Top())); - + aPoly.append(aInnerPoly); break; } @@ -316,7 +316,7 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta basegfx::B2DPolygon aInnerPoly; const sal_Int32 nWdt(rRectangle.GetWidth()); const sal_Int32 nHgt(rRectangle.GetHeight()); - + aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 30) / 100, rRectangle.Top() + (nHgt * 70) / 100)); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top() + (nHgt * 15) / 100)); @@ -325,7 +325,7 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 80) / 100, rRectangle.Top() + (nHgt * 50) / 100)); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 80) / 100, rRectangle.Top() + (nHgt * 75) / 100)); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Bottom(), rRectangle.Right())); - + if(SID_DRAW_POLYGON_NOFILL == nID) { aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Bottom())); diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 71d46ea98b7c..e736c2fe09af 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.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 @@ -132,13 +132,13 @@ BOOL __EXPORT FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) if (aSfxRequest.GetSlot() == SID_DRAW_CAPTION_VERTICAL) { - // set vertical flag for caption object + // set vertical flag for caption object const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if (rMarkList.GetMark(0)) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - // create OutlinerParaObject now so it can be set to vertical + // create OutlinerParaObject now so it can be set to vertical if ( pObj->ISA(SdrTextObj) ) ((SdrTextObj*)pObj)->ForceOutlinerParaObject(); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); @@ -272,7 +272,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rec sal_Bool bIsVertical(SID_DRAW_CAPTION_VERTICAL == nID); ((SdrTextObj*)pObj)->SetVerticalWriting(bIsVertical); - + if(bIsVertical) { SfxItemSet aSet(pObj->GetMergedItemSet()); diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 63b1a34ac221..f640711dfb43 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.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 @@ -42,9 +42,9 @@ #include "sc.hrc" #include "drawview.hxx" -// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten -//! fusel,fuconstr,futext - zusammenfassen! -#define SC_MAXDRAGMOVE 3 +// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten +//! fusel,fuconstr,futext - zusammenfassen! +#define SC_MAXDRAGMOVE 3 //------------------------------------------------------------------------ @@ -72,7 +72,7 @@ FuConstruct::~FuConstruct() BYTE FuConstruct::Command(const CommandEvent& rCEvt) { - // special code for non-VCL OS2/UNX removed + // special code for non-VCL OS2/UNX removed return FuDraw::Command( rCEvt ); } @@ -184,7 +184,7 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) BOOL bReturn = SimpleMouseButtonUp( rMEvt ); - // Doppelklick auf Textobjekt? (->fusel) + // Doppelklick auf Textobjekt? (->fusel) USHORT nClicks = rMEvt.GetClicks(); if ( nClicks == 2 && rMEvt.IsLeft() ) @@ -197,7 +197,7 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - // #49458# bei Uno-Controls nicht in Textmodus + // #49458# bei Uno-Controls nicht in Textmodus if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) ) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); @@ -209,7 +209,7 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) // jetzt den erzeugten FuText holen und in den EditModus setzen FuPoor* pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr(); - if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // hat keine RTTI + if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // hat keine RTTI { FuText* pText = (FuText*)pPoor; Point aMousePixel = rMEvt.GetPosPixel(); @@ -226,18 +226,18 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) return bReturn; } -// SimpleMouseButtonUp - ohne Test auf Doppelklick +// SimpleMouseButtonUp - ohne Test auf Doppelklick BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = TRUE; + BOOL bReturn = TRUE; if (aDragTimer.IsActive() ) { aDragTimer.Stop(); } - Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); + Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); if ( pView->IsDragObj() ) pView->EndDragObj( rMEvt.IsMod1() ); @@ -288,7 +288,7 @@ BOOL __EXPORT FuConstruct::KeyInput(const KeyEvent& rKEvt) pWindow->ReleaseMouse(); bReturn = TRUE; } - else // Zeichenmodus beenden + else // Zeichenmodus beenden { pViewShell->GetViewData()->GetDispatcher(). Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index 45df699b3e75..75aaa6a3a965 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.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 @@ -175,7 +175,7 @@ void FuConstUnoControl::Deactivate() SdrObject* FuConstUnoControl::CreateDefaultObject(const sal_uInt16 /* nID */, const Rectangle& rRectangle) { // case SID_FM_CREATE_CONTROL: - + SdrObject* pObj = SdrObjFactory::MakeNewObject( pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(), 0L, pDrDoc); diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 70342cc10e24..a96a16206421 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.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 @@ -31,7 +31,7 @@ //------------------------------------------------------------------------ -#include <editeng/editeng.hxx> // EditEngine::IsSimpleCharInput +#include <editeng/editeng.hxx> // EditEngine::IsSimpleCharInput #include <editeng/outlobj.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> @@ -87,23 +87,23 @@ FuDraw::~FuDraw() void FuDraw::DoModifiers(const MouseEvent& rMEvt) { - // Shift = Ortho und AngleSnap - // Control = Snap (Toggle) - // Alt = zentrisch + // Shift = Ortho und AngleSnap + // Control = Snap (Toggle) + // Alt = zentrisch - BOOL bShift = rMEvt.IsShift(); + BOOL bShift = rMEvt.IsShift(); // BOOL bCtrl = rMEvt.IsMod1(); - BOOL bAlt = rMEvt.IsMod2(); + BOOL bAlt = rMEvt.IsMod2(); // ScViewData* pViewData = pViewShell->GetViewData(); // const ScViewOptions& rOpt = pViewData->GetOptions(); // const ScGridOptions& rGrid = rOpt.GetGridOptions(); // BOOL bGridOpt = rGrid.GetUseGridSnap(); - BOOL bOrtho = bShift; - BOOL bAngleSnap = bShift; + BOOL bOrtho = bShift; + BOOL bAngleSnap = bShift; // BOOL bGridSnap = ( bGridOpt != bCtrl ); // andere Snap's nicht unterstuetzt - BOOL bCenter = bAlt; + BOOL bCenter = bAlt; // #i33136# if(doConstructOrthogonal()) @@ -116,7 +116,7 @@ void FuDraw::DoModifiers(const MouseEvent& rMEvt) if (pView->IsAngleSnapEnabled() != bAngleSnap) pView->SetAngleSnapEnabled(bAngleSnap); -/* Control fuer Snap beisst sich beim Verschieben mit "kopieren" !!! +/* Control fuer Snap beisst sich beim Verschieben mit "kopieren" !!! if (pView->IsGridSnap() != bGridSnap) pView->SetGridSnap(bGridSnap); @@ -176,8 +176,8 @@ BOOL __EXPORT FuDraw::MouseButtonDown(const MouseEvent& rMEvt) BOOL __EXPORT FuDraw::MouseMove(const MouseEvent& rMEvt) { - // #106438# evaluate modifiers only if in a drawing layer action - // (don't interfere with keyboard shortcut handling) + // #106438# evaluate modifiers only if in a drawing layer action + // (don't interfere with keyboard shortcut handling) if (pView->IsAction()) DoModifiers( rMEvt ); @@ -230,7 +230,7 @@ BOOL lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEven // get the resulting FuText and set in edit mode pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr(); - if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI + if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI { FuText* pText = (FuText*)pPoor; pText->SetInEditMode( pObj, NULL, TRUE, pInitialKey ); @@ -252,20 +252,20 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) /* 18.12.95: TextShell beibehalten nicht mehr gewuenscht... * - * if ( pView->IsAction() ) - * { - * pView->BrkAction(); - * pWindow->ReleaseMouse(); - * bReturn = TRUE; - * } - * else if ( pView->IsTextEdit() ) - * { - * pView->EndTextEdit(); - * pView->SetCreateMode(); - * pViewShell->GetScDrawView()->InvalidateDrawTextAttrs(); - * bReturn = TRUE; - * } - * else + * if ( pView->IsAction() ) + * { + * pView->BrkAction(); + * pWindow->ReleaseMouse(); + * bReturn = TRUE; + * } + * else if ( pView->IsTextEdit() ) + * { + * pView->EndTextEdit(); + * pView->SetCreateMode(); + * pViewShell->GetScDrawView()->InvalidateDrawTextAttrs(); + * bReturn = TRUE; + * } + * else */ if ( pViewShell->IsDrawTextShell() || aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT ) @@ -289,7 +289,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) else pView->UnmarkAll(); - // Beim Bezier-Editieren ist jetzt wieder das Objekt selektiert + // Beim Bezier-Editieren ist jetzt wieder das Objekt selektiert if (!pView->AreObjectsMarked()) pViewShell->SetDrawShell( FALSE ); @@ -297,7 +297,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) } break; - case KEY_DELETE: //! ueber Accelerator + case KEY_DELETE: //! ueber Accelerator pView->DeleteMarked(); bReturn = TRUE; break; @@ -321,7 +321,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) // consumed bReturn = TRUE; } - else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object + else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object bReturn = TRUE; } } @@ -338,7 +338,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) if( !pView->IsTextEdit() && 1 == rMarkList.GetMarkCount() ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object + if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object bReturn = TRUE; } } @@ -720,7 +720,7 @@ void FuDraw::SelectionHasChanged() void FuDraw::ScrollStart() { -// HideShownXor in Gridwin +// HideShownXor in Gridwin } /************************************************************************* @@ -731,7 +731,7 @@ void FuDraw::ScrollStart() void FuDraw::ScrollEnd() { -// ShowShownXor in Gridwin +// ShowShownXor in Gridwin } /************************************************************************* @@ -786,9 +786,9 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ( !pView->IsAction() ) { Point aPosPixel = pWindow->GetPointerPosPixel(); - BOOL bAlt = pMEvt && pMEvt->IsMod2(); - Point aPnt = pWindow->PixelToLogic( aPosPixel ); - SdrHdl* pHdl = pView->PickHandle(aPnt); + BOOL bAlt = pMEvt && pMEvt->IsMod2(); + Point aPnt = pWindow->PixelToLogic( aPosPixel ); + SdrHdl* pHdl = pView->PickHandle(aPnt); SdrObject* pObj; SdrPageView* pPV; @@ -806,7 +806,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ( pView->IsTextEdit() ) { - pViewShell->SetActivePointer(Pointer(POINTER_TEXT)); // kann nicht sein ? + pViewShell->SetActivePointer(Pointer(POINTER_TEXT)); // kann nicht sein ? } else if ( pHdl ) { @@ -820,13 +820,13 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) else if ( !bAlt && ( !pMEvt || !pMEvt->GetButtons() ) && lcl_UrlHit( pView, aPosPixel, pWindow ) ) { - // kann mit ALT unterdrueckt werden - pWindow->SetPointer( Pointer( POINTER_REFHAND ) ); // Text-URL / ImageMap + // kann mit ALT unterdrueckt werden + pWindow->SetPointer( Pointer( POINTER_REFHAND ) ); // Text-URL / ImageMap } else if ( !bAlt && pView->PickObj(aPnt, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) ) { - // kann mit ALT unterdrueckt werden - SdrObjMacroHitRec aHitRec; //! muss da noch irgendwas gesetzt werden ???? + // kann mit ALT unterdrueckt werden + SdrObjMacroHitRec aHitRec; //! muss da noch irgendwas gesetzt werden ???? pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) ); } else if ( !bAlt && pInfo && ((pInfo->GetMacro().getLength() > 0) || (pInfo->GetHlink().getLength() > 0)) ) @@ -834,7 +834,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) else if ( IsDetectiveHit( aPnt ) ) pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) ); else - pViewShell->SetActivePointer( aNewPointer ); //! in Gridwin? + pViewShell->SetActivePointer( aNewPointer ); //! in Gridwin? } } diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 41501905fe61..26dc67b1b81e 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.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 @@ -56,48 +56,48 @@ ////======================================================================== -//// class ImportProgress +//// class ImportProgress //// //// Bemerkung: -//// Diese Klasse stellt lediglich den Handler fuer den ImportProgress des -//// Grafikfilters bereit. +//// Diese Klasse stellt lediglich den Handler fuer den ImportProgress des +//// Grafikfilters bereit. ////======================================================================== // //class ImportProgress //{ //public: -// ImportProgress( GraphicFilter& rFilter ); -// ~ImportProgress(); +// ImportProgress( GraphicFilter& rFilter ); +// ~ImportProgress(); // -// DECL_LINK( Update, GraphicFilter* ); +// DECL_LINK( Update, GraphicFilter* ); // //private: -// ScProgress aProgress; +// ScProgress aProgress; //}; // ////------------------------------------------------------------------------ // //ImportProgress::ImportProgress( GraphicFilter& rFilter ) -// : aProgress( NULL, // SfxViewFrame*, NULL == alle Docs locken -// String( ScResId(STR_INSERTGRAPHIC) ), -// 100 ) +// : aProgress( NULL, // SfxViewFrame*, NULL == alle Docs locken +// String( ScResId(STR_INSERTGRAPHIC) ), +// 100 ) //{ -// rFilter.SetUpdatePercentHdl( LINK( this, ImportProgress, Update) ); +// rFilter.SetUpdatePercentHdl( LINK( this, ImportProgress, Update) ); //} // ////------------------------------------------------------------------------ // //__EXPORT ImportProgress::~ImportProgress() //{ -// aProgress.SetState( 100 ); +// aProgress.SetState( 100 ); //} // ////------------------------------------------------------------------------ // //IMPL_LINK( ImportProgress, Update, GraphicFilter*, pGraphicFilter ) //{ -// aProgress.SetState( pGraphicFilter->GetPercent() ); -// return 0; +// aProgress.SetState( pGraphicFilter->GetPercent() ); +// return 0; //} @@ -112,7 +112,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r BOOL bNegative = aPageSize.Width() < 0; if ( bNegative ) { - // make everything positive temporarily + // make everything positive temporarily aPageSize.Width() = -aPageSize.Width(); rPos.X() = -rPos.X() - rSize.Width(); } @@ -145,18 +145,18 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r rPos.Y() = aPageSize.Height() - rSize.Height(); if ( bNegative ) - rPos.X() = -rPos.X() - rSize.Width(); // back to real position + rPos.X() = -rPos.X() - rSize.Width(); // back to real position } //------------------------------------------------------------------------ void lcl_InsertGraphic( const Graphic& rGraphic, const String& rFileName, const String& rFilterName, BOOL bAsLink, BOOL bApi, - ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView ) + ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView ) { - // #74778# set the size so the graphic has its original pixel size - // at 100% view scale (as in SetMarkedOriginalSize), - // instead of respecting the current view scale + // #74778# set the size so the graphic has its original pixel size + // at 100% view scale (as in SetMarkedOriginalSize), + // instead of respecting the current view scale ScDrawView* pDrawView = pViewSh->GetScDrawView(); MapMode aSourceMap = rGraphic.GetPrefMapMode(); @@ -171,7 +171,7 @@ void lcl_InsertGraphic( const Graphic& rGraphic, Size aLogicSize = pWindow->LogicToLogic( rGraphic.GetPrefSize(), &aSourceMap, &aDestMap ); - // Limit size + // Limit size SdrPageView* pPV = pView->GetSdrPageView(); SdrPage* pPage = pPV->GetPage(); @@ -179,7 +179,7 @@ void lcl_InsertGraphic( const Graphic& rGraphic, ScViewData* pData = pViewSh->GetViewData(); if ( pData->GetDocument()->IsNegativePage( pData->GetTabNo() ) ) - aInsertPos.X() -= aLogicSize.Width(); // move position to left edge + aInsertPos.X() -= aLogicSize.Width(); // move position to left edge ScLimitSizeOnDrawPage( aLogicSize, aInsertPos, pPage->GetSize() ); @@ -189,13 +189,13 @@ void lcl_InsertGraphic( const Graphic& rGraphic, // #118522# calling SetGraphicLink here doesn't work - // #49961# Path is no longer used as name for the graphics object + // #49961# Path is no longer used as name for the graphics object ScDrawLayer* pLayer = (ScDrawLayer*) pView->GetModel(); - String aName = pLayer->GetNewGraphicName(); // "Grafik x" + String aName = pLayer->GetNewGraphicName(); // "Grafik x" pObj->SetName(aName); - // don't select if from (dispatch) API, to allow subsequent cell operations + // don't select if from (dispatch) API, to allow subsequent cell operations ULONG nInsOptions = bApi ? SDRINSERT_DONTMARK : 0; pView->InsertObjectAtView( pObj, *pPV, nInsOptions ); @@ -212,12 +212,12 @@ void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView, const Size& rPrefSize ) { - SdrPageView* pPV = pView->GetSdrPageView(); - SdrPage* pPage = pPV->GetPage(); - ScViewData* pData = pViewSh->GetViewData(); - Point aInsertPos( pViewSh->GetInsertPos() ); - Size aSize; - + SdrPageView* pPV = pView->GetSdrPageView(); + SdrPage* pPage = pPV->GetPage(); + ScViewData* pData = pViewSh->GetViewData(); + Point aInsertPos( pViewSh->GetInsertPos() ); + Size aSize; + if( rPrefSize.Width() && rPrefSize.Height() ) { if( pWindow ) @@ -229,13 +229,13 @@ void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi, aSize = Size( 5000, 5000 ); ScLimitSizeOnDrawPage( aSize, aInsertPos, pPage->GetSize() ); - + if( pData->GetDocument()->IsNegativePage( pData->GetTabNo() ) ) aInsertPos.X() -= aSize.Width(); SdrMediaObj* pObj = new SdrMediaObj( Rectangle( aInsertPos, aSize ) ); - - pObj->setURL( rMediaURL ); + + pObj->setURL( rMediaURL ); pView->InsertObjectAtView( pObj, *pPV, bApi ? SDRINSERT_DONTMARK : 0 ); } @@ -249,11 +249,11 @@ void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi, #pragma optimize("",off) #endif -FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, - Window* pWin, +FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, + Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, - SfxRequest& rReq ) + SdrModel* pDoc, + SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { const SfxItemSet* pReqArgs = rReq.GetArgs(); @@ -302,7 +302,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, FALSE, pViewSh, pWindow, pView ); - // append items for recording + // append items for recording rReq.AppendItem( SfxStringItem( SID_INSERT_GRAPHIC, aFileName ) ); rReq.AppendItem( SfxStringItem( FN_PARAM_FILTER, aFilterName ) ); rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bAsLink ) ); @@ -310,7 +310,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, } else { - // error is handled in SvxOpenGraphicDialog::GetGraphic + // error is handled in SvxOpenGraphicDialog::GetGraphic } } } @@ -354,21 +354,21 @@ void FuInsertGraphic::Deactivate() |* \************************************************************************/ -FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh, - Window* pWin, +FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh, + Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, - SfxRequest& rReq ) : + SdrModel* pDoc, + SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { - ::rtl::OUString aURL; - const SfxItemSet* pReqArgs = rReq.GetArgs(); - bool bAPI = false; + ::rtl::OUString aURL; + const SfxItemSet* pReqArgs = rReq.GetArgs(); + bool bAPI = false; if( pReqArgs ) { const SfxStringItem* pStringItem = PTR_CAST( SfxStringItem, &pReqArgs->Get( rReq.GetSlot() ) ); - + if( pStringItem ) { aURL = pStringItem->GetValue(); @@ -382,19 +382,19 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh, if( pWin ) pWin->EnterWait(); - + if( !::avmedia::MediaWindow::isMediaURL( aURL, true, &aPrefSize ) ) { if( pWin ) pWin->LeaveWait(); - + if( !bAPI ) ::avmedia::MediaWindow::executeFormatErrorBox( pWindow ); } else { lcl_InsertMedia( aURL, bAPI, pViewSh, pWindow, pView, aPrefSize ); - + if( pWin ) pWin->LeaveWait(); } diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 89a483d736d5..4629e560a8d2 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.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 @@ -93,7 +93,7 @@ using namespace ::com::sun::star; #include "globstr.hrc" #include "drawview.hxx" -extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht zeichnen +extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht zeichnen //------------------------------------------------------------------------ @@ -224,7 +224,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie if( ! rReq.IsAPI() ) rReq.Done(); - //! hier DLL's initalisieren, damit die Factories existieren? + //! hier DLL's initalisieren, damit die Factories existieren? uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); @@ -328,7 +328,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie } } - // SvInsertObjectDialog (alles in einem Dialog) wird nicht mehr benutzt + // SvInsertObjectDialog (alles in einem Dialog) wird nicht mehr benutzt if (xObj.is()) { pView->UnmarkAll(); @@ -379,7 +379,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie MapMode( aMapUnit ), aMap100 ); } - // Chart initialisieren ? + // Chart initialisieren ? if ( SvtModuleOptions().IsChart() && SotExchange::IsChart( SvGlobalName( xObj->getClassID() ) ) ) lcl_ChartInit( xObj, pViewSh->GetViewData(), rtl::OUString() ); @@ -387,7 +387,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie Point aPnt = pViewSh->GetInsertPos(); if ( pData->GetDocument()->IsNegativePage( pData->GetTabNo() ) ) - aPnt.X() -= aSize.Width(); // move position to left edge + aPnt.X() -= aSize.Width(); // move position to left edge Rectangle aRect (aPnt, aSize); SdrOle2Obj* pObj = new SdrOle2Obj( aObjRef, aName, aRect); @@ -401,9 +401,9 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie if ( nAspect != embed::Aspects::MSOLE_ICON ) { - // #73279# Math objects change their object size during InsertObject. - // New size must be set in SdrObject, or a wrong scale will be set at - // ActivateObject. + // #73279# Math objects change their object size during InsertObject. + // New size must be set in SdrObject, or a wrong scale will be set at + // ActivateObject. try { @@ -490,7 +490,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* SdrModel* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { - const SfxItemSet* pReqArgs = rReq.GetArgs(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); if( ! rReq.IsAPI() ) rReq.Done(); @@ -569,7 +569,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* SCTAB nMarkTab; BOOL bDrawRect = pViewShell->GetChartArea( aDummy, aMarkDest, nMarkTab ); - // Objekt-Groesse + // Objekt-Groesse awt::Size aSz = xObj->getVisualAreaSize( nAspect ); Size aSize( aSz.Width, aSz.Height ); @@ -597,7 +597,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* ScViewData* pData = pViewSh->GetViewData(); ScDocShell* pScDocSh = pData->GetDocShell(); - ScDocument* pScDoc = pScDocSh->GetDocument(); + ScDocument* pScDoc = pScDocSh->GetDocument(); BOOL bUndo (pScDoc->IsUndoEnabled()); if( pReqArgs ) @@ -611,8 +611,8 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* nToTable = ((const SfxUInt16Item*)pItem)->GetValue(); else if ( pItem->ISA( SfxBoolItem ) ) { - // #46033# in der idl fuer Basic steht FN_PARAM_4 als SfxBoolItem - // -> wenn gesetzt, neue Tabelle, sonst aktuelle Tabelle + // #46033# in der idl fuer Basic steht FN_PARAM_4 als SfxBoolItem + // -> wenn gesetzt, neue Tabelle, sonst aktuelle Tabelle if ( ((const SfxBoolItem*)pItem)->GetValue() ) nToTable = static_cast<UINT16>(pScDoc->GetTableCount()); @@ -631,8 +631,8 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* if ( nToTable == pScDoc->GetTableCount() ) { // dann los... - String aTabName; - SCTAB nNewTab = pScDoc->GetTableCount(); + String aTabName; + SCTAB nNewTab = pScDoc->GetTableCount(); pScDoc->CreateValidTabName( aTabName ); @@ -649,7 +649,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pScDocSh->Broadcast( ScTablesHint( SC_TAB_INSERTED, nNewTab ) ); pViewSh->SetTabNo( nNewTab, TRUE ); - pScDocSh->PostPaintExtras(); //! erst hinterher ??? + pScDocSh->PostPaintExtras(); //! erst hinterher ??? } else { @@ -664,11 +664,11 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* lcl_ChartInit( xObj, pData, aRangeString ); // set source range, auto-detect column/row headers - // Objekt-Position + // Objekt-Position Point aStart; if ( bDrawRect ) - aStart = aMarkDest.TopLeft(); // marked by hand + aStart = aMarkDest.TopLeft(); // marked by hand else { // get chart position (from window size and data range) @@ -722,7 +722,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* if( xChartModel.is() && xInit.is() ) { uno::Reference< awt::XWindow > xDialogParentWindow(0); - // initialize dialog + // initialize dialog uno::Sequence<uno::Any> aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx index dfbf584bc8bd..837894551d06 100644 --- a/sc/source/ui/drawfunc/fumark.cxx +++ b/sc/source/ui/drawfunc/fumark.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 @@ -79,7 +79,7 @@ BOOL FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt) SetMouseButtonCode(rMEvt.GetButtons()); pWindow->CaptureMouse(); - pView->UnmarkAll(); // der Einheitlichkeit halber und wegen #50558# + pView->UnmarkAll(); // der Einheitlichkeit halber und wegen #50558# bStartDrag = TRUE; aBeginPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() ); @@ -140,7 +140,7 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) { // Klick auf der Stelle - aZoomRect.SetSize(Size()); // dann ganz leer + aZoomRect.SetSize(Size()); // dann ganz leer } bStartDrag = FALSE; @@ -149,15 +149,15 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) pViewShell->GetViewData()->GetDispatcher(). Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); - // Daten an der View merken + // Daten an der View merken pViewShell->SetChartArea( aSourceRange, aZoomRect ); - // Chart-Dialog starten: + // Chart-Dialog starten: -// USHORT nId = ScChartDlgWrapper::GetChildWindowId(); -// SfxChildWindow* pWnd = pViewShell->GetViewFrame()->GetChildWindow( nId ); -// SC_MOD()->SetRefDialog( nId, pWnd ? FALSE : TRUE ); +// USHORT nId = ScChartDlgWrapper::GetChildWindowId(); +// SfxChildWindow* pWnd = pViewShell->GetViewFrame()->GetChildWindow( nId ); +// SC_MOD()->SetRefDialog( nId, pWnd ? FALSE : TRUE ); return TRUE; } @@ -172,8 +172,8 @@ BYTE FuMarkRect::Command(const CommandEvent& rCEvt) { if ( COMMAND_STARTDRAG == rCEvt.GetCommand() ) { - // #29877# nicht anfangen, auf der Tabelle rumzudraggen, - // aber Maus-Status nicht zuruecksetzen + // #29877# nicht anfangen, auf der Tabelle rumzudraggen, + // aber Maus-Status nicht zuruecksetzen return SC_CMD_IGNORE; } else @@ -196,7 +196,7 @@ BOOL FuMarkRect::KeyInput(const KeyEvent& rKEvt) switch ( rKEvt.GetKeyCode().GetCode() ) { case KEY_ESCAPE: - // beenden + // beenden pViewShell->GetViewData()->GetDispatcher(). Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); bReturn = TRUE; @@ -241,7 +241,7 @@ void FuMarkRect::Activate() { FuPoor::Activate(); - // Markierung merken, bevor evtl. Tabelle umgeschaltet wird + // Markierung merken, bevor evtl. Tabelle umgeschaltet wird ScViewData* pViewData = pViewShell->GetViewData(); ScMarkData& rMark = pViewData->GetMarkData(); @@ -249,9 +249,9 @@ void FuMarkRect::Activate() if ( !rMark.IsMultiMarked() && !rMark.IsMarked() ) pViewShell->MarkDataArea( TRUE ); - pViewData->GetMultiArea( aSourceRange ); // Mehrfachselektion erlaubt + pViewData->GetMultiArea( aSourceRange ); // Mehrfachselektion erlaubt -// pViewShell->Unmark(); +// pViewShell->Unmark(); ForcePointer(NULL); } diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 370385aace20..fa4c089f643a 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.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 @@ -128,9 +128,9 @@ void FuPoor::ForceScroll(const Point& aPixPos) SCsCOL dx = 0; SCsROW dy = 0; - if ( aPixPos.X() <= 0 ) dx = -1; + if ( aPixPos.X() <= 0 ) dx = -1; if ( aPixPos.X() >= aSize.Width() ) dx = 1; - if ( aPixPos.Y() <= 0 ) dy = -1; + if ( aPixPos.Y() <= 0 ) dy = -1; if ( aPixPos.Y() >= aSize.Height() ) dy = 1; ScViewData* pViewData = pViewShell->GetViewData(); @@ -153,7 +153,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) if ( dx != 0 || dy != 0 ) { - ScrollStart(); // Scrollaktion in abgeleiteter Klasse + ScrollStart(); // Scrollaktion in abgeleiteter Klasse pViewShell->ScrollLines(2*dx, 4*dy); ScrollEnd(); aScrollTimer.Start(); @@ -169,7 +169,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG ) { Point aPosPixel = pWindow->GetPointerPosPixel(); - + // #95491# use remembered MouseButton state to create correct // MouseEvents for this artifical MouseMove. MouseMove(MouseEvent(aPosPixel, 1, 0, GetMouseButtonCode())); @@ -180,20 +180,20 @@ IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) // #95491# moved from inline to *.cxx BOOL FuPoor::MouseButtonUp(const MouseEvent& rMEvt) -{ +{ // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return FALSE; + return FALSE; } // #95491# moved from inline to *.cxx BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) -{ +{ // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return FALSE; + return FALSE; } /************************************************************************* @@ -202,7 +202,7 @@ BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -// WriteStatus gibt's nicht mehr +// WriteStatus gibt's nicht mehr /************************************************************************* |* @@ -249,7 +249,7 @@ void FuPoor::DoCut() { if (pView) { -//! pView->DoCut(pWindow); +//! pView->DoCut(pWindow); } } @@ -263,7 +263,7 @@ void FuPoor::DoCopy() { if (pView) { -//! pView->DoCopy(pWindow); +//! pView->DoCopy(pWindow); } } @@ -277,7 +277,7 @@ void FuPoor::DoPaste() { if (pView) { -//! pView->DoPaste(pWindow); +//! pView->DoPaste(pWindow); } } @@ -289,12 +289,12 @@ void FuPoor::DoPaste() IMPL_LINK( FuPoor, DragTimerHdl, Timer *, EMPTYARG ) { - // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer - // aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei - // (z.B. im Drop) wieder ein Timer gestartet wird (z.B. ComeBack-Timer der - // DrawView fuer Solid Handles / ModelHasChanged) - der neue Timer laeuft - // dann um die Dauer des Drag&Drop zu spaet ab. - // Darum Drag&Drop aus eigenem Event: + // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer + // aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei + // (z.B. im Drop) wieder ein Timer gestartet wird (z.B. ComeBack-Timer der + // DrawView fuer Solid Handles / ModelHasChanged) - der neue Timer laeuft + // dann um die Dauer des Drag&Drop zu spaet ab. + // Darum Drag&Drop aus eigenem Event: Application::PostUserEvent( LINK( this, FuPoor, DragHdl ) ); return 0; @@ -309,13 +309,13 @@ IMPL_LINK( FuPoor, DragHdl, void *, EMPTYARG ) pWindow->ReleaseMouse(); bIsInDragMode = TRUE; -// pView->BeginDrag(pWindow, aMDPos); +// pView->BeginDrag(pWindow, aMDPos); pViewShell->GetScDrawView()->BeginDrag(pWindow, aMDPos); } return 0; } -// Detektiv-Linie +// Detektiv-Linie BOOL FuPoor::IsDetectiveHit( const Point& rLogicPos ) { @@ -366,13 +366,13 @@ void FuPoor::ImpForceQuadratic(Rectangle& rRect) if(rRect.GetWidth() > rRect.GetHeight()) { rRect = Rectangle( - Point(rRect.Left() + ((rRect.GetWidth() - rRect.GetHeight()) / 2), rRect.Top()), + Point(rRect.Left() + ((rRect.GetWidth() - rRect.GetHeight()) / 2), rRect.Top()), Size(rRect.GetHeight(), rRect.GetHeight())); } else { rRect = Rectangle( - Point(rRect.Left(), rRect.Top() + ((rRect.GetHeight() - rRect.GetWidth()) / 2)), + Point(rRect.Left(), rRect.Top() + ((rRect.GetHeight() - rRect.GetWidth()) / 2)), Size(rRect.GetWidth(), rRect.GetWidth())); } } diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 1fdf75eabc2f..a7a08487fadf 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.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 @@ -60,9 +60,9 @@ // ----------------------------------------------------------------------- -// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten -//! fusel,fuconstr,futext - zusammenfassen! -#define SC_MAXDRAGMOVE 3 +// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten +//! fusel,fuconstr,futext - zusammenfassen! +#define SC_MAXDRAGMOVE 3 // ----------------------------------------------------------------------- @@ -97,7 +97,7 @@ FuSelection::~FuSelection() BYTE FuSelection::Command(const CommandEvent& rCEvt) { - // special code for non-VCL OS2/UNX removed + // special code for non-VCL OS2/UNX removed return FuDraw::Command( rCEvt ); } @@ -121,7 +121,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } bVCAction = FALSE; - bIsInDragMode = FALSE; // irgendwo muss es ja zurueckgesetzt werden (#50033#) + bIsInDragMode = FALSE; // irgendwo muss es ja zurueckgesetzt werden (#50033#) BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); @@ -237,14 +237,14 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } } - // URL / ImageMap + // URL / ImageMap SdrViewEvent aVEvt; if ( !bAlt && pView->PickAnything( rMEvt, SDRMOUSEBUTTONDOWN, aVEvt ) != SDRHIT_NONE && aVEvt.pObj != NULL ) { - if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) ) // ImageMap + if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) ) // ImageMap { const IMapObject* pIMapObj = ScDrawLayer::GetHitIMapObject( aVEvt.pObj, aMDPos, *pWindow ); @@ -254,7 +254,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) sTarget = pIMapObj->GetTarget(); } } - if ( aVEvt.eEvent == SDREVENT_EXECUTEURL && aVEvt.pURLField ) // URL + if ( aVEvt.eEvent == SDREVENT_EXECUTEURL && aVEvt.pURLField ) // URL { sURL = aVEvt.pURLField->GetURL(); sTarget = aVEvt.pURLField->GetTargetFrame(); @@ -269,12 +269,12 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) return TRUE; // kein CaptureMouse etc. } - // Is another object being edited in this view? - // (Editing is ended in MarkListHasChanged - test before UnmarkAll) + // Is another object being edited in this view? + // (Editing is ended in MarkListHasChanged - test before UnmarkAll) SfxInPlaceClient* pClient = pViewShell->GetIPClient(); BOOL bWasOleActive = ( pClient && pClient->IsObjectInPlaceActive() ); - // Markieren + // Markieren // do not allow multiselection with note caption bool bCaptionClicked = IsNoteCaptionClicked( aMDPos ); @@ -294,10 +294,10 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) //******************************************************** if (pView->IsMarkedHit(aMDPos)) { - // #95834# Don't start drag timer if inplace editing of an OLE object - // was just ended with this mouse click - the view will be moved - // (different tool bars) and the object that was clicked on would - // be moved unintentionally. + // #95834# Don't start drag timer if inplace editing of an OLE object + // was just ended with this mouse click - the view will be moved + // (different tool bars) and the object that was clicked on would + // be moved unintentionally. if ( !bWasOleActive ) aDragTimer.Start(); @@ -305,13 +305,13 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl); bReturn = TRUE; } - else // Objekt am Rand getroffen + else // Objekt am Rand getroffen if (pViewShell->IsDrawSelMode()) bReturn = TRUE; } else { - // nichts getroffen + // nichts getroffen if (pViewShell->IsDrawSelMode()) { @@ -329,7 +329,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if (!bIsInDragMode) { - if (!bVCAction) // VC rufen selber CaptureMouse + if (!bVCAction) // VC rufen selber CaptureMouse pWindow->CaptureMouse(); ForcePointer(&rMEvt); } @@ -370,9 +370,9 @@ BOOL __EXPORT FuSelection::MouseMove(const MouseEvent& rMEvt) // Event an den Manager weiterleiten if( bVCAction ) { - // GetSbxForm gibts nicht mehr - Basic-Controls sind tot + // GetSbxForm gibts nicht mehr - Basic-Controls sind tot //SdrPageView* pPgView = pView->GetPageViewByIndex(0); - //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage(); + //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage(); //VCSbxForm* pForm = (VCSbxForm*)(SbxObject*)(pPage->GetSbxForm()); //((VCManager*)(pForm->GetVCContainer()))-> // MouseMove( pWindow, rMEvt ); @@ -396,7 +396,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) SetMouseButtonCode(rMEvt.GetButtons()); BOOL bReturn = FuDraw::MouseButtonUp(rMEvt); -// BOOL bOle = pViewShell->GetViewData()->IsOle(); +// BOOL bOle = pViewShell->GetViewData()->IsOle(); BOOL bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace(); if (aDragTimer.IsActive() ) @@ -462,7 +462,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) if ( pView->IsObjEdit() ) { BOOL bShowCursor = TRUE; -//! pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor); +//! pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor); bReturn = TRUE; } */ @@ -491,8 +491,8 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - // #43984# aktivieren nur, wenn die Maus auch (noch) ueber dem - // selektierten Objekt steht + // #43984# aktivieren nur, wenn die Maus auch (noch) ueber dem + // selektierten Objekt steht SdrViewEvent aVEvt; SdrHitKind eHit = pView->PickAnything( rMEvt, SDRMOUSEBUTTONDOWN, aVEvt ); @@ -501,7 +501,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) UINT16 nSdrObjKind = pObj->GetObjIdentifier(); // - // OLE: aktivieren + // OLE: aktivieren // if (nSdrObjKind == OBJ_OLE2) @@ -532,7 +532,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) // jetzt den erzeugten FuText holen und in den EditModus setzen FuPoor* pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr(); - if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // hat keine RTTI + if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // hat keine RTTI { FuText* pText = (FuText*)pPoor; Point aMousePixel = rMEvt.GetPosPixel(); @@ -551,9 +551,9 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) // Event an den Manager weiterleiten if( bVCAction ) { - // GetSbxForm gibts nicht mehr - Basic-Controls sind tot + // GetSbxForm gibts nicht mehr - Basic-Controls sind tot //SdrPageView* pPgView = pView->GetPageViewByIndex(0); - //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage(); + //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage(); //VCSbxForm* pForm = (VCSbxForm*)(SbxObject*)(pPage->GetSbxForm()); //((VCManager*)(pForm->GetVCContainer()))-> // MouseButtonUp( pWindow, rMEvt ); @@ -566,8 +566,8 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) pWindow->ReleaseMouse(); - // Command-Handler fuer Kontext-Menue kommt erst nach MouseButtonUp, - // darum hier die harte IsLeft-Abfrage + // Command-Handler fuer Kontext-Menue kommt erst nach MouseButtonUp, + // darum hier die harte IsLeft-Abfrage if ( !bReturn && rMEvt.IsLeft() ) if (pViewShell->IsDrawSelMode()) pViewShell->GetViewData()->GetDispatcher(). @@ -641,7 +641,7 @@ void FuSelection::Deactivate() // BOOL bShowCursor = FALSE; //! pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor); -// pView->SetDragMode(SDRDRAG_MOVE); +// pView->SetDragMode(SDRDRAG_MOVE); FuDraw::Deactivate(); } diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index 8e884ee45a61..cfa421c97230 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.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/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 6742ea4c8186..72f2f011e5d2 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.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 @@ -53,9 +53,9 @@ // #98185# Create default drawing objects via keyboard #include "scresid.hxx" -// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten -//! fusel,fuconstr,futext - zusammenfassen! -#define SC_MAXDRAGMOVE 3 +// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten +//! fusel,fuconstr,futext - zusammenfassen! +#define SC_MAXDRAGMOVE 3 //------------------------------------------------------------------ @@ -123,7 +123,7 @@ FuText::FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, FuText::~FuText() { -// StopEditMode(); // in Deactivate ! +// StopEditMode(); // in Deactivate ! } /************************************************************************* @@ -138,12 +138,12 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) SetMouseButtonCode(rMEvt.GetButtons()); if ( pView->MouseButtonDown(rMEvt, pWindow) ) - return (TRUE); // Event von der SdrView ausgewertet + return (TRUE); // Event von der SdrView ausgewertet if ( pView->IsTextEdit() ) { if( !IsSizingOrMovingNote(rMEvt) ) - StopEditMode(); // Danebengeklickt, Ende mit Edit + StopEditMode(); // Danebengeklickt, Ende mit Edit pView->SetCreateMode(); } @@ -190,26 +190,26 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) if ( pHdl != NULL || pView->IsMarkedHit(aMDPos) ) { if (pHdl == NULL && -// pView->TakeTextEditObject(aMDPos, pObj, pPV) ) +// pView->TakeTextEditObject(aMDPos, pObj, pPV) ) pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKTEXTEDIT) ) { SdrOutliner* pO = MakeOutliner(); lcl_UpdateHyphenator( *pO, pObj ); - // vertical flag: - // deduced from slot ids only if text object has no content + // vertical flag: + // deduced from slot ids only if text object has no content USHORT nSlotID = aSfxRequest.GetSlot(); BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL ); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if ( pOPO ) - bVertical = pOPO->IsVertical(); // content wins + bVertical = pOPO->IsVertical(); // content wins pO->SetVertical( bVertical ); - //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!? + //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!? if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, sal_True, pO) ) { - // EditEngine-UndoManager anmelden + // EditEngine-UndoManager anmelden pViewShell->SetDrawTextUndo( &pO->GetUndoManager() ); OutlinerView* pOLV = pView->GetTextEditOutlinerView(); @@ -247,7 +247,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) { BOOL bMacro = FALSE; -// if (bMacro && pView->TakeMacroObject(aMDPos,pObj,pPV)) +// if (bMacro && pView->TakeMacroObject(aMDPos,pObj,pPV)) if (bMacro && pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) ) { @@ -305,8 +305,8 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) } else if (aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT ) { - // Notizen editieren -> keine neuen Textobjekte erzeugen, - // stattdessen Textmodus verlassen + // Notizen editieren -> keine neuen Textobjekte erzeugen, + // stattdessen Textmodus verlassen pViewShell->GetViewData()->GetDispatcher(). Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); @@ -326,14 +326,14 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) if (!bIsInDragMode) { pWindow->CaptureMouse(); -// ForcePointer(&rMEvt); +// ForcePointer(&rMEvt); lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() ); } pViewShell->SetActivePointer(pView->GetPreferedPointer( pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow )); -// return (bReturn); +// return (bReturn); return TRUE; } @@ -347,7 +347,7 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt) { BOOL bReturn = FALSE; -// pViewShell->SetActivePointer(aNewPointer); +// pViewShell->SetActivePointer(aNewPointer); pViewShell->SetActivePointer(pView->GetPreferedPointer( pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow )); @@ -366,7 +366,7 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt) if ( pView->IsAction() ) { -/* aNewPointer = Pointer(POINTER_TEXT); +/* aNewPointer = Pointer(POINTER_TEXT); pViewShell->SetActivePointer(aNewPointer); */ Point aPix(rMEvt.GetPosPixel()); @@ -376,7 +376,7 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt) pView->MovAction(aPnt); } -// ForcePointer(&rMEvt); +// ForcePointer(&rMEvt); return (bReturn); } @@ -427,7 +427,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt) pView->EndCreateObj(SDRCREATE_FORCEEND); if (aSfxRequest.GetSlot() == SID_DRAW_TEXT_MARQUEE) { - // Lauftext-Objekt erzeugen? + // Lauftext-Objekt erzeugen? const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if (rMarkList.GetMark(0)) @@ -477,8 +477,8 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt) SetInEditMode(); - // Modus verlassen bei einzelnem Klick - // (-> fuconstr) + // Modus verlassen bei einzelnem Klick + // (-> fuconstr) if ( !pView->AreObjectsMarked() ) { @@ -554,7 +554,7 @@ void FuText::ForcePointer(const MouseEvent* /* pMEvt */) } else { -// if ( pView->TakeMacroObject(aPnt, pObj, pPV) ) +// if ( pView->TakeMacroObject(aPnt, pObj, pPV) ) if ( pView->PickObj(aPnt, pObj, pPV, SDRSEARCH_PICKMACRO) ) { pViewShell->SetActivePointer( pObj->GetMacroPointer() ); @@ -612,17 +612,17 @@ void FuText::Activate() rBindings.Invalidate( SID_OBJECT_ROTATE ); rBindings.Invalidate( SID_OBJECT_MIRROR ); -// Sofort in den Edit Mode setzen -// SetInEditMode(); +// Sofort in den Edit Mode setzen +// SetInEditMode(); -// if (!pTextObj) +// if (!pTextObj) { /********************************************************************** * Kein Textobjekt im EditMode, daher CreateMode setzen **********************************************************************/ USHORT nObj = OBJ_TEXT; -/* UINT16 nIdent; +/* UINT16 nIdent; UINT32 nInvent; pView->TakeCurrentObj(nIdent, nInvent); */ @@ -632,7 +632,7 @@ void FuText::Activate() } aNewPointer = Pointer(POINTER_TEXT); -// aNewPointer = Pointer(POINTER_CROSS); //! ??? +// aNewPointer = Pointer(POINTER_CROSS); //! ??? aOldPointer = pWindow->GetPointer(); pViewShell->SetActivePointer( aNewPointer ); @@ -701,21 +701,21 @@ void FuText::SelectionHasChanged() UINT32 nInvent; pView->TakeCurrentObj(nIdent, nInvent); -// if (! pView->IsEditMode() ) -// { -// if (nIdent == OBJ_TEXT) -// { -// nObj = OBJ_TEXT; -// } -// else if (nIdent == OBJ_OUTLINETEXT) -// { -// nObj = OBJ_OUTLINETEXT; -// } -// else if (nIdent == OBJ_TITLETEXT) -// { -// nObj = OBJ_TITLETEXT; -// } -// } +// if (! pView->IsEditMode() ) +// { +// if (nIdent == OBJ_TEXT) +// { +// nObj = OBJ_TEXT; +// } +// else if (nIdent == OBJ_OUTLINETEXT) +// { +// nObj = OBJ_OUTLINETEXT; +// } +// else if (nIdent == OBJ_TITLETEXT) +// { +// nObj = OBJ_TITLETEXT; +// } +// } pView->SetCurrentObj(nObj); @@ -768,27 +768,27 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, SdrOutliner* pO = MakeOutliner(); lcl_UpdateHyphenator( *pO, pObj ); - // vertical flag: - // deduced from slot ids only if text object has no content + // vertical flag: + // deduced from slot ids only if text object has no content USHORT nSlotID = aSfxRequest.GetSlot(); BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL ); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if ( pOPO ) - bVertical = pOPO->IsVertical(); // content wins + bVertical = pOPO->IsVertical(); // content wins pO->SetVertical( bVertical ); - //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!? + //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!? if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, sal_True, pO) ) { - // EditEngine-UndoManager anmelden + // EditEngine-UndoManager anmelden pViewShell->SetDrawTextUndo( &pO->GetUndoManager() ); pTextObj = (SdrTextObj*) pObj; pView->SetEditMode(); - // set text cursor to click position or to end, - // pass initial key event to outliner view + // set text cursor to click position or to end, + // pass initial key event to outliner view if ( pMousePixel || bCursorToEnd || pInitialKey ) { OutlinerView* pOLV = pView->GetTextEditOutlinerView(); @@ -870,7 +870,7 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR pObj->SetMergedItemSetAndBroadcast(aSet); } - SetInEditMode( pObj ); // #105815# start edit mode + SetInEditMode( pObj ); // #105815# start edit mode } else { diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index 354339dd0d75..0fd5c747ff6c 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.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 @@ -292,11 +292,11 @@ SdrOutliner* FuText::MakeOutliner() pViewData->UpdateOutlinerFlags(*pOutl); - // Die EditEngine benutzt beim RTF Export (Clipboard / Drag&Drop) - // den MapMode des RefDevices, um die Fontgroesse zu setzen + // Die EditEngine benutzt beim RTF Export (Clipboard / Drag&Drop) + // den MapMode des RefDevices, um die Fontgroesse zu setzen - // #i10426# The ref device isn't set to the EditEngine before SdrBeginTextEdit now, - // so the device must be taken from the model here. + // #i10426# The ref device isn't set to the EditEngine before SdrBeginTextEdit now, + // so the device must be taken from the model here. OutputDevice* pRef = pDrDoc->GetRefDevice(); if (pRef && pRef != pWindow) pRef->SetMapMode( MapMode(MAP_100TH_MM) ); diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 09a4240c0678..5ec884ee5f21 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.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,7 +43,7 @@ #include "global.hxx" #include "drwlayer.hxx" #include "userdat.hxx" -#include "tabvwsh.hxx" // oder GetDocument irgendwo +#include "tabvwsh.hxx" // oder GetDocument irgendwo #include "document.hxx" #include "editutil.hxx" #include "futext.hxx" @@ -56,10 +56,10 @@ #include "undocell.hxx" // ------------------------------------------------------------------------------------ -// Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden, -// damit die Aenderungen ins Dokument uebernommen werden! -// (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte) -// bTextDirection=TRUE means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx). +// Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden, +// damit die Aenderungen ins Dokument uebernommen werden! +// (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte) +// bTextDirection=TRUE means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx). // ------------------------------------------------------------------------------------ void FuText::StopEditMode(BOOL /*bTextDirection*/) diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 101ce8578f05..40cd4d0fd520 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.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 @@ -130,8 +130,8 @@ void ScGraphicShell::ExecuteFilter( SfxRequest& rReq ) if( pPageView ) { - SdrGrafObj* pFilteredObj = (SdrGrafObj*) pObj->Clone(); - String aStr( pView->GetDescriptionOfMarkedObjects() ); + SdrGrafObj* pFilteredObj = (SdrGrafObj*) pObj->Clone(); + String aStr( pView->GetDescriptionOfMarkedObjects() ); aStr.Append( sal_Unicode(' ') ); aStr.Append( String( ScResId( SCSTR_UNDO_GRAFFILTER ) ) ); diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index 542573e39fa9..ec1e4ae41e38 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.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 @@ -74,15 +74,15 @@ void ScMediaShell::GetMediaState( SfxItemSet& rSet ) if( pView ) { - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter( rSet ); + USHORT nWhich = aIter.FirstWhich(); while( nWhich ) { if( SID_AVMEDIA_TOOLBOX == nWhich ) { - SdrMarkList* pMarkList = new SdrMarkList( pView->GetMarkedObjectList() ); - bool bDisable = true; + SdrMarkList* pMarkList = new SdrMarkList( pView->GetMarkedObjectList() ); + bool bDisable = true; if( 1 == pMarkList->GetMarkCount() ) { @@ -115,8 +115,8 @@ void ScMediaShell::ExecuteMedia( SfxRequest& rReq ) if( pView && SID_AVMEDIA_TOOLBOX == rReq.GetSlot() ) { - const SfxItemSet* pArgs = rReq.GetArgs(); - const SfxPoolItem* pItem; + const SfxItemSet* pArgs = rReq.GetArgs(); + const SfxPoolItem* pItem; if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) ) pItem = NULL; diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index c221567f3671..9fb1b969f060 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -1,7 +1,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 @@ -29,7 +29,7 @@ #include "submenu.hrc" #include <svx/globlmn.hrc> // - // Defines ------------------------------------------------------------------------------- + // Defines ------------------------------------------------------------------------------- // #define MN_RESET\ MenuItem\ @@ -40,8 +40,8 @@ Text [ x-comment ] = " ";\ }; - // Font (SID_ATTR_CHAR_FONT) und Groesse (SID_ATTR_CHAR_FONTHEIGHT) duerfen nicht im - // Formatmenue auftauchen, weil die Controller im ExeEnv sonst im Container angelegt werden + // Font (SID_ATTR_CHAR_FONT) und Groesse (SID_ATTR_CHAR_FONTHEIGHT) duerfen nicht im + // Formatmenue auftauchen, weil die Controller im ExeEnv sonst im Container angelegt werden #define MN_TEXT_ATTR\ MenuItem\ {\ @@ -118,7 +118,7 @@ HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Left" ;\ - Text [ x-comment ] = " "; \ + Text [ x-comment ] = " "; \ };\ MenuItem\ {\ @@ -356,7 +356,7 @@ Text [ x-comment ] = " ";\ }; -#define MN_ALIGNSUB \ +#define MN_ALIGNSUB \ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN ; \ @@ -400,10 +400,10 @@ }; // - // ------------------------------------------------------------------------------ + // ------------------------------------------------------------------------------ // // - // Objekt-Leisten + // Objekt-Leisten // String RID_DRAW_OBJECTBAR { @@ -435,7 +435,7 @@ ToolBox RID_DRAW_OBJECTBAR //--------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //--------------------------------------------- - // Linien + // Linien ToolBoxItem { Identifier = SID_ATTRIBUTES_LINE ; @@ -483,7 +483,7 @@ ToolBox RID_DRAW_OBJECTBAR //--------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //--------------------------------------------- - // Rest + // Rest ToolBoxItem { Identifier = SID_OBJECT_ROTATE ; @@ -555,7 +555,7 @@ ToolBox RID_DRAW_OBJECTBAR Scroll = TRUE ; }; // - // Text-Toolbox + // Text-Toolbox // String RID_TEXT_TOOLBOX { @@ -1061,7 +1061,7 @@ ToolBox RID_TEXT_TOOLBOX }; }; // - // Graphics toolbox + // Graphics toolbox // String RID_GRAPHIC_OBJECTBAR { @@ -1244,7 +1244,7 @@ ToolBox RID_GRAPHIC_OBJECTBAR }; }; // - // Popup-Menues --------------------------------------------------------------------- + // Popup-Menues --------------------------------------------------------------------- // String RID_POPUP_DRAW { @@ -1253,7 +1253,7 @@ String RID_POPUP_DRAW Text [ x-comment ] = " "; }; // - // Popup-Menue fuer (allgemeine) Zeichenobjekte + // Popup-Menue fuer (allgemeine) Zeichenobjekte // Menu RID_POPUP_DRAW { @@ -1305,7 +1305,7 @@ Menu RID_POPUP_DRAW }; // - // Popup-Menue fuer (Uno-) Controls + // Popup-Menue fuer (Uno-) Controls // Menu RID_POPUP_CONTROL @@ -1339,7 +1339,7 @@ Menu RID_POPUP_CONTROL }; // - // Grafik + // Grafik // Menu RID_POPUP_GRAPHIC @@ -1380,7 +1380,7 @@ Menu RID_POPUP_GRAPHIC }; // - // Media + // Media // Menu RID_POPUP_MEDIA @@ -1440,7 +1440,7 @@ ToolBox RID_MEDIA_OBJECTBAR }; // - // Ole-Objekt + // Ole-Objekt // Menu RID_POPUP_OLE @@ -1470,7 +1470,7 @@ Menu RID_POPUP_OLE }; // - // Charts + // Charts // Menu RID_POPUP_CHART diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index d8a0b8c052ac..a7d344c25f5b 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.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/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index d22531e76f59..2e0f67e37b01 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.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 @@ -40,7 +40,7 @@ #include <sfx2/viewsh.hxx> #include "sc.hrc" -#include "global.hxx" // ScAddress +#include "global.hxx" // ScAddress #include "scresid.hxx" #include "reffact.hxx" #include "document.hxx" @@ -60,18 +60,18 @@ SFX_IMPL_DOCKINGWINDOW( ScFunctionChildWindow, FID_FUNCTION_BOX ) /************************************************************************* -#* Member: ScFunctionChildWindow Datum:06.10.97 +#* Member: ScFunctionChildWindow Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionChildWindow +#* Klasse: ScFunctionChildWindow #* -#* Funktion: Konstruktor der Klasse ScFunctionChildWindow -#* Ableitung vom SfxChildWindow als "Behaelter" fuer -#* Funktions- Fenster in Clac +#* Funktion: Konstruktor der Klasse ScFunctionChildWindow +#* Ableitung vom SfxChildWindow als "Behaelter" fuer +#* Funktions- Fenster in Clac #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -91,16 +91,16 @@ __EXPORT ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP, } /************************************************************************* -#* Member: ScFunctionDockWin Datum:06.10.97 +#* Member: ScFunctionDockWin Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Konstruktor der Klasse ScFunctionDockWin +#* Funktion: Konstruktor der Klasse ScFunctionDockWin #* -#* Input: Sfx- Verknuepfungen, Fenster, Resource +#* Input: Sfx- Verknuepfungen, Fenster, Resource #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -108,13 +108,13 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, SfxChildWindow *pCW, Window* pParent, const ResId& rResId ) : SfxDockingWindow( pBindingsP, pCW, pParent, rResId ), - aPrivatSplit ( this, ResId( FT_SPLIT, *rResId.GetResMgr() ),SC_SPLIT_VERT), - aCatBox ( this, ResId( CB_CAT, *rResId.GetResMgr() ) ), - aFuncList ( this, ResId( LB_FUNC, *rResId.GetResMgr() ) ), - aDDFuncList ( this, ResId( DDLB_FUNC, *rResId.GetResMgr() ) ), - aInsertButton ( this, ResId( IMB_INSERT, *rResId.GetResMgr() ) ), - aFiFuncDesc ( this, ResId( FI_FUNCDESC, *rResId.GetResMgr() ) ), - aOldSize (0,0) + aPrivatSplit ( this, ResId( FT_SPLIT, *rResId.GetResMgr() ),SC_SPLIT_VERT), + aCatBox ( this, ResId( CB_CAT, *rResId.GetResMgr() ) ), + aFuncList ( this, ResId( LB_FUNC, *rResId.GetResMgr() ) ), + aDDFuncList ( this, ResId( DDLB_FUNC, *rResId.GetResMgr() ) ), + aInsertButton ( this, ResId( IMB_INSERT, *rResId.GetResMgr() ) ), + aFiFuncDesc ( this, ResId( FI_FUNCDESC, *rResId.GetResMgr() ) ), + aOldSize (0,0) { FreeResource(); InitLRUList(); @@ -136,8 +136,8 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, Font aFont=aFiFuncDesc.GetFont(); aFont.SetColor(Color(COL_BLACK)); aFiFuncDesc.SetFont(aFont); - aFiFuncDesc.SetBackground( GetBackground() ); //! never transparent? -//? SetBackground(); + aFiFuncDesc.SetBackground( GetBackground() ); //! never transparent? +//? SetBackground(); Link aLink=LINK( this, ScFunctionDockWin, SelHdl); aCatBox.SetSelectHdl(aLink); @@ -170,16 +170,16 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, } /************************************************************************* -#* Member: ScFunctionDockWin Datum:06.10.97 +#* Member: ScFunctionDockWin Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Destruktor der Klasse ScFunctionDockWin +#* Funktion: Destruktor der Klasse ScFunctionDockWin #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -189,17 +189,17 @@ __EXPORT ScFunctionDockWin::~ScFunctionDockWin() } /************************************************************************* -#* Member: UpdateFunctionList Datum:06.10.97 +#* Member: UpdateFunctionList Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Aktualisiert die Liste der Funktionen ab- -#* haengig von der eingestellten Kategorie. +#* Funktion: Aktualisiert die Liste der Funktionen ab- +#* haengig von der eingestellten Kategorie. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -207,7 +207,7 @@ void ScFunctionDockWin::InitLRUList() { const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); USHORT nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (USHORT)LRU_MAX ); - USHORT* pLRUListIds = rAppOpt.GetLRUFuncList(); + USHORT* pLRUListIds = rAppOpt.GetLRUFuncList(); USHORT i; for ( i=0; i<LRU_MAX; i++ ) @@ -220,23 +220,23 @@ void ScFunctionDockWin::InitLRUList() aLRUList[i] = pFuncMgr->Get( pLRUListIds[i] ); } - USHORT nSelPos = aCatBox.GetSelectEntryPos(); + USHORT nSelPos = aCatBox.GetSelectEntryPos(); if(nSelPos == 0) UpdateFunctionList(); } /************************************************************************* -#* Member: UpdateFunctionList Datum:10.12.99 +#* Member: UpdateFunctionList Datum:10.12.99 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Aktualisiert die Liste der zuletzt verwendeten Funktionen. +#* Funktion: Aktualisiert die Liste der zuletzt verwendeten Funktionen. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -251,16 +251,16 @@ void ScFunctionDockWin::UpdateLRUList() /************************************************************************* -#* Member: SetSize Datum:06.10.97 +#* Member: SetSize Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Groesse fuer die einzelnen Controls einzustellen. +#* Funktion: Groesse fuer die einzelnen Controls einzustellen. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -299,7 +299,7 @@ void ScFunctionDockWin::SetSize() } break; - default: nNewDockMode=0; + default: nNewDockMode=0; if(nDockMode!=nNewDockMode) { nDockMode=nNewDockMode; @@ -328,17 +328,17 @@ void ScFunctionDockWin::SetSize() } } /************************************************************************* -#* Member: SetLeftRightSize Datum:15.10.97 +#* Member: SetLeftRightSize Datum:15.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Groesse fuer die einzelnen Controls einstellen, -#* wenn Links oder Rechts angedockt wird. +#* Funktion: Groesse fuer die einzelnen Controls einstellen, +#* wenn Links oder Rechts angedockt wird. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -380,17 +380,17 @@ void ScFunctionDockWin::SetLeftRightSize() } /************************************************************************* -#* Member: SetTopBottonSize Datum:15.10.97 +#* Member: SetTopBottonSize Datum:15.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Groesse fuer die einzelnen Controls einzustellen. -#* wenn oben oder unten angedockt wird. +#* Funktion: Groesse fuer die einzelnen Controls einzustellen. +#* wenn oben oder unten angedockt wird. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -416,23 +416,23 @@ void ScFunctionDockWin::SetTopBottonSize() } /************************************************************************* -#* Member: SetMyWidthLeRi Datum:15.10.97 +#* Member: SetMyWidthLeRi Datum:15.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Breite fuer die einzelnen Controls und -#* das Fenster einstellen,wenn Li oder Re +#* Funktion: Breite fuer die einzelnen Controls und +#* das Fenster einstellen,wenn Li oder Re #* -#* Input: neue Fenstergroesse +#* Input: neue Fenstergroesse #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize) { - if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth; + if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth; Size aCDSize=aCatBox.GetSizePixel(); Size aFLSize=aFuncList.GetSizePixel(); @@ -456,17 +456,17 @@ void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize) } /************************************************************************* -#* Member: SetHeight Datum:06.10.97 +#* Member: SetHeight Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Hoehe fuer die einzelnen Controls und -#* das Fenster einstellen bei Li oder Re +#* Funktion: Hoehe fuer die einzelnen Controls und +#* das Fenster einstellen bei Li oder Re #* -#* Input: neue Fenstergroesse +#* Input: neue Fenstergroesse #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -504,24 +504,24 @@ void ScFunctionDockWin::SetMyHeightLeRi(Size &aNewSize) } /************************************************************************* -#* Member: SetMyWidthToBo Datum:16.10.97 +#* Member: SetMyWidthToBo Datum:16.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Breite fuer die einzelnen Controls und -#* das Fenster einstellen, wenn oben oder -#* unten angedockt werden soll. +#* Funktion: Breite fuer die einzelnen Controls und +#* das Fenster einstellen, wenn oben oder +#* unten angedockt werden soll. #* -#* Input: neue Fenstergroesse +#* Input: neue Fenstergroesse #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ScFunctionDockWin::SetMyWidthToBo(Size &aNewSize) { - if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth; + if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth; Size aCDSize=aCatBox.GetSizePixel(); Size aDdFLSize=aDDFuncList.GetSizePixel(); @@ -545,18 +545,18 @@ void ScFunctionDockWin::SetMyWidthToBo(Size &aNewSize) } /************************************************************************* -#* Member: SetHeight Datum:16.10.97 +#* Member: SetHeight Datum:16.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Hoehe fuer die einzelnen Controls und -#* das Fenster einstellen, wenn oben oder -#* unten angedockt werden soll. +#* Funktion: Hoehe fuer die einzelnen Controls und +#* das Fenster einstellen, wenn oben oder +#* unten angedockt werden soll. #* -#* Input: neue Fenstergroesse +#* Input: neue Fenstergroesse #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -574,16 +574,16 @@ void ScFunctionDockWin::SetMyHeightToBo(Size &aNewSize) } /************************************************************************* -#* Member: SetDescription Datum:13.10.97 +#* Member: SetDescription Datum:13.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Erklaerungstext fuer die Funktion einstellen. +#* Funktion: Erklaerungstext fuer die Funktion einstellen. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -597,7 +597,7 @@ void ScFunctionDockWin::SetDescription() { pDesc->initArgumentInfo(); // full argument info is needed - String aString=pAllFuncList->GetSelectEntry(); + String aString=pAllFuncList->GetSelectEntry(); if(nDockMode==0) { aString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ":\n\n" )); @@ -629,17 +629,17 @@ void ScFunctionDockWin::SetDescription() } /************************************************************************* -#* Member: Resizing Datum:06.10.97 +#* Member: Resizing Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Ueberladene Funktion um die Groesse der -#* einzelnen Controls einzustellen. +#* Funktion: Ueberladene Funktion um die Groesse der +#* einzelnen Controls einzustellen. #* -#* Input: neue Groesse +#* Input: neue Groesse #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -651,16 +651,16 @@ void __EXPORT ScFunctionDockWin::Resizing( Size& rNewSize ) } /************************************************************************* -#* Member: Close Datum:07.10.97 +#* Member: Close Datum:07.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Schliessen des Fensters +#* Funktion: Schliessen des Fensters #* -#* Input: --- +#* Input: --- #* -#* Output: TRUE +#* Output: TRUE #* #************************************************************************/ @@ -679,17 +679,17 @@ BOOL __EXPORT ScFunctionDockWin::Close() /************************************************************************* -#* Member: CheckAlignment Datum:16.10.97 +#* Member: CheckAlignment Datum:16.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Ueberprueft den Andockmodus und stellt die -#* Groessen dementsprechend ein. +#* Funktion: Ueberprueft den Andockmodus und stellt die +#* Groessen dementsprechend ein. #* -#* Input: Das neue Alignment +#* Input: Das neue Alignment #* -#* Output: Das uebergebene Alignment +#* Output: Das uebergebene Alignment #* #************************************************************************/ SfxChildAlignment __EXPORT ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */, @@ -733,7 +733,7 @@ SfxChildAlignment __EXPORT ScFunctionDockWin::CheckAlignment(SfxChildAlignment / aTxtSize = Size( aFiFuncDesc.GetTextWidth(aString), aFiFuncDesc.GetTextHeight() ); - default: Point aTopLeft=aCatBox.GetPosPixel(); + default: Point aTopLeft=aCatBox.GetPosPixel(); nMinWidth=aTxtSize.Width()+aTopLeft.X() +2*aFuncList.GetPosPixel().X(); nMinHeight=19*aTxtSize.Height(); @@ -745,16 +745,16 @@ SfxChildAlignment __EXPORT ScFunctionDockWin::CheckAlignment(SfxChildAlignment / return aChildAlign; } /************************************************************************* -#* Member: Close Datum:07.10.97 +#* Member: Close Datum:07.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Aenderungen erkennen +#* Funktion: Aenderungen erkennen #* -#* Input: --- +#* Input: --- #* -#* Output: TRUE +#* Output: TRUE #* #************************************************************************/ void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ ) @@ -773,17 +773,17 @@ void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ ) /************************************************************************* -#* Member: Resize Datum:06.10.97 +#* Member: Resize Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Ueberladene Funktion um die Groesse der -#* einzelnen Controls einzustellen. +#* Funktion: Ueberladene Funktion um die Groesse der +#* einzelnen Controls einzustellen. #* -#* Input: neue Groesse +#* Input: neue Groesse #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -800,24 +800,24 @@ void __EXPORT ScFunctionDockWin::Resize() } /************************************************************************* -#* Member: UpdateFunctionList Datum:06.10.97 +#* Member: UpdateFunctionList Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Aktualisiert die Liste der Funktionen ab- -#* haengig von der eingestellten Kategorie. +#* Funktion: Aktualisiert die Liste der Funktionen ab- +#* haengig von der eingestellten Kategorie. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ScFunctionDockWin::UpdateFunctionList() { - USHORT nSelPos = aCatBox.GetSelectEntryPos(); - USHORT nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos ) + USHORT nSelPos = aCatBox.GetSelectEntryPos(); + USHORT nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos ) ? (nSelPos-1) : 0; pAllFuncList->Clear(); @@ -863,18 +863,18 @@ void ScFunctionDockWin::UpdateFunctionList() } /************************************************************************* -#* Member: DoEnter Datum:06.10.97 +#* Member: DoEnter Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Eingabe ins Dokument uebernehmen. Wird aufgerufen -#* nach betaetigen der Uebernehmen- Schaltflaeche -#* oder einem Doppelklick in die Funktionsliste. +#* Funktion: Eingabe ins Dokument uebernehmen. Wird aufgerufen +#* nach betaetigen der Uebernehmen- Schaltflaeche +#* oder einem Doppelklick in die Funktionsliste. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -918,7 +918,7 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ??? aFirstArgStr.SearchAndReplaceAll(' ', '_'); aArgStr = aFirstArgStr; if ( nArgs != VAR_ARGS ) - { // no VarArgs or Fix plus VarArgs, but not VarArgs only + { // no VarArgs or Fix plus VarArgs, but not VarArgs only String aArgSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "; " )); USHORT nFix = ( nArgs < VAR_ARGS ? nArgs : nArgs - VAR_ARGS + 1 ); for ( USHORT nArg = 1; @@ -950,7 +950,7 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ??? { pHdl->InsertFunction(aString); pEdView->InsertText(aArgStr,TRUE); - ESelection aESel=pEdView->GetSelection(); + ESelection aESel=pEdView->GetSelection(); aESel.nEndPos=aESel.nStartPos+aFirstArgStr.Len(); pEdView->SetSelection(aESel); pHdl->DataChanged(); @@ -979,17 +979,17 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ??? /************************************************************************* -#* Handle: SelHdl Datum:06.10.97 +#* Handle: SelHdl Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Bei einer Aenderung der Kategorie wird die -#* die Liste der Funktionen aktualisiert. +#* Funktion: Bei einer Aenderung der Kategorie wird die +#* die Liste der Funktionen aktualisiert. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1012,17 +1012,17 @@ IMPL_LINK( ScFunctionDockWin, SelHdl, ListBox*, pLb ) } /************************************************************************* -#* Handle: SelHdl Datum:06.10.97 +#* Handle: SelHdl Datum:06.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Bei einer Aenderung der Kategorie wird die -#* die Liste der Funktionen aktualisiert. +#* Funktion: Bei einer Aenderung der Kategorie wird die +#* die Liste der Funktionen aktualisiert. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1031,7 +1031,7 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl ) if ((ImageButton *)pCtrl == &aInsertButton || (ListBox *)pCtrl == &aFuncList) { - DoEnter(TRUE); // Uebernimmt die Eingabe + DoEnter(TRUE); // Uebernimmt die Eingabe } //... @@ -1039,17 +1039,17 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl ) } /************************************************************************* -#* Handle: SetSplitHdl Datum:13.10.97 +#* Handle: SetSplitHdl Datum:13.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScFunctionDockWin +#* Klasse: ScFunctionDockWin #* -#* Funktion: Bei einer Aenderung des Split- Controls werden die -#* einzelnen Controls an die neue Groesse angepasst. +#* Funktion: Bei einer Aenderung des Split- Controls werden die +#* einzelnen Controls an die neue Groesse angepasst. #* -#* Input: Zeiger auf Control +#* Input: Zeiger auf Control #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1141,8 +1141,8 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo) aCatBox.SelectEntryPos(nSelPos); SelHdl(&aCatBox); - // if the window has already been shown (from SfxDockingWindow::Initialize if docked), - // set the splitter position now, otherwise it is set in StateChanged with type INITSHOW + // if the window has already been shown (from SfxDockingWindow::Initialize if docked), + // set the splitter position now, otherwise it is set in StateChanged with type INITSHOW UseSplitterInitPos(); } @@ -1166,7 +1166,7 @@ void ScFunctionDockWin::UseSplitterInitPos() if ( IsVisible() && aPrivatSplit.IsEnabled() && aSplitterInitPos != Point() ) { aPrivatSplit.MoveSplitTo(aSplitterInitPos); - aSplitterInitPos = Point(); // use only once + aSplitterInitPos = Point(); // use only once } } @@ -1176,7 +1176,7 @@ void ScFunctionDockWin::StateChanged( StateChangedType nStateChange ) if (nStateChange == STATE_CHANGE_INITSHOW) { - UseSplitterInitPos(); // set initial splitter position if necessary + UseSplitterInitPos(); // set initial splitter position if necessary } } diff --git a/sc/source/ui/formdlg/dwfunctr.hrc b/sc/source/ui/formdlg/dwfunctr.hrc index 388fea28b7ca..5daaa8a0a9a8 100644 --- a/sc/source/ui/formdlg/dwfunctr.hrc +++ b/sc/source/ui/formdlg/dwfunctr.hrc @@ -1,7 +1,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 @@ -25,12 +25,12 @@ * ************************************************************************/ -#define CB_CAT 1 -#define LB_FUNC 2 -#define DDLB_FUNC 3 -#define IMB_INSERT 1 +#define CB_CAT 1 +#define LB_FUNC 2 +#define DDLB_FUNC 3 +#define IMB_INSERT 1 #define FI_FUNCDESC 1 -#define FT_SPLIT 2 +#define FT_SPLIT 2 // ********************************************************************** EOF diff --git a/sc/source/ui/formdlg/dwfunctr.src b/sc/source/ui/formdlg/dwfunctr.src index 6f8a054dd6ff..2f07ff5d1e30 100644 --- a/sc/source/ui/formdlg/dwfunctr.src +++ b/sc/source/ui/formdlg/dwfunctr.src @@ -1,7 +1,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/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx index d11ad33a6a45..90bb97cd7f2b 100644 --- a/sc/source/ui/formdlg/formdata.cxx +++ b/sc/source/ui/formdlg/formdata.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/formdlg/formdlgs.src b/sc/source/ui/formdlg/formdlgs.src index e3550030c74e..3b76875e4e82 100644 --- a/sc/source/ui/formdlg/formdlgs.src +++ b/sc/source/ui/formdlg/formdlgs.src @@ -1,7 +1,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/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 0510d503762b..ed9a2681ce45 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.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 @@ -75,14 +75,14 @@ using namespace formula; using namespace com::sun::star; -ScDocument* ScFormulaDlg::pDoc = NULL; +ScDocument* ScFormulaDlg::pDoc = NULL; ScAddress ScFormulaDlg::aCursorPos; -// -------------------------------------------------------------------------- -// Initialisierung / gemeinsame Funktionen fuer Dialog -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Initialisierung / gemeinsame Funktionen fuer Dialog +// -------------------------------------------------------------------------- ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr ) @@ -113,10 +113,10 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, } } } - //if ( !pParentDoc && pScViewShell ) // use current only if above fails - // pParentDoc = pScViewShell->GetObjectShell(); + //if ( !pParentDoc && pScViewShell ) // use current only if above fails + // pParentDoc = pScViewShell->GetObjectShell(); //if ( pParentDoc ) - // aDocName = pParentDoc->GetTitle(); + // aDocName = pParentDoc->GetTitle(); if ( pDoc == NULL ) pDoc = pViewData->GetDocument(); @@ -126,7 +126,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, m_xOpCodeMapper.set(ScServiceProvider::MakeInstance(SC_SERVICE_OPCODEMAPPER,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY); - ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell); + ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell); DBG_ASSERT( pInputHdl, "Missing input handler :-/" ); @@ -153,16 +153,16 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, SCTAB nTab = pViewData->GetTabNo(); aCursorPos = ScAddress( nCol, nRow, nTab ); - pScMod->InitFormEditData(); // neu anlegen + pScMod->InitFormEditData(); // neu anlegen pData = pScMod->GetFormEditData(); pData->SetInputHandler(pScMod->GetInputHdl()); pData->SetDocShell(pViewData->GetDocShell()); DBG_ASSERT(pData,"FormEditData ist nicht da"); - formula::FormulaDlgMode eMode = FORMULA_FORMDLG_FORMULA; // Default... + formula::FormulaDlgMode eMode = FORMULA_FORMDLG_FORMULA; // Default... - // Formel vorhanden? Dann editieren + // Formel vorhanden? Dann editieren String aFormula; pDoc->GetFormula( nCol, nRow, nTab, aFormula ); @@ -200,7 +200,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, pScMod->InputGetSelection( PrivStart, PrivEnd); SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,FALSE,FALSE); - pData->SetFStart( 1 ); // hinter dem "=" + pData->SetFStart( 1 ); // hinter dem "=" } pData->SetMode( (USHORT) eMode ); @@ -217,7 +217,7 @@ void ScFormulaDlg::notifyChange() { ScModule* pScMod = SC_MOD(); - ScInputHandler* pInputHdl = pScMod->GetInputHdl(); + ScInputHandler* pInputHdl = pScMod->GetInputHdl(); if ( pInputHdl ) pInputHdl->NotifyChange( NULL ); } @@ -230,8 +230,8 @@ void ScFormulaDlg::fill() String rStrExp; if (pData) { - // Daten schon vorhanden -> Zustand wiederherstellen (nach Umschalten) - // pDoc und aCursorPos nicht neu initialisieren + // Daten schon vorhanden -> Zustand wiederherstellen (nach Umschalten) + // pDoc und aCursorPos nicht neu initialisieren //pDoc = pViewData->GetDocument(); if(IsInputHdl(pData->GetInputHandler())) { @@ -240,10 +240,10 @@ void ScFormulaDlg::fill() else { PtrTabViewShell pTabViewShell; - ScInputHandler* pInputHdl = GetNextInputHandler(pData->GetDocShell(),&pTabViewShell); + ScInputHandler* pInputHdl = GetNextInputHandler(pData->GetDocShell(),&pTabViewShell); if ( pInputHdl == NULL ) //DocShell hat keinen InputHandler mehr, - { //hat der Anwender halt Pech gehabt. + { //hat der Anwender halt Pech gehabt. disableOk(); pInputHdl = pScMod->GetInputHdl(); } @@ -289,7 +289,7 @@ BOOL ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl) { BOOL bAlive = FALSE; - // gehoert der InputHandler zu irgendeiner ViewShell ? + // gehoert der InputHandler zu irgendeiner ViewShell ? TypeId aScType = TYPE(ScTabViewShell); SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType ); @@ -332,9 +332,9 @@ BOOL __EXPORT ScFormulaDlg::Close() return TRUE; } -// -------------------------------------------------------------------------- -// Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Funktionen fuer rechte Seite +// -------------------------------------------------------------------------- bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult ) { BOOL bResult = TRUE; @@ -350,7 +350,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult ) { // ColRowName im RPN-Code? if ( pCell->GetCode()->GetCodeLen() <= 1 ) - { // ==1: einzelner ist als Parameter immer Bereich + { // ==1: einzelner ist als Parameter immer Bereich // ==0: es waere vielleicht einer, wenn.. String aBraced( '(' ); aBraced += rStrExp; @@ -403,7 +403,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult ) -// virtuelle Methoden von ScAnyRefDlg: +// virtuelle Methoden von ScAnyRefDlg: void ScFormulaDlg::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) { pEdit->SetSelection(Selection(0, SELECTION_MAX)); @@ -430,16 +430,16 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc ) RefInputStart(GetActiveEdit()); } - String aRefStr; + String aRefStr; BOOL bOtherDoc = ( pRefDoc != pDoc && pRefDoc->GetDocumentShell()->HasName() ); if ( bOtherDoc ) { - // Referenz auf anderes Dokument - wie inputhdl.cxx + // Referenz auf anderes Dokument - wie inputhdl.cxx DBG_ASSERT(rRef.aStart.Tab()==rRef.aEnd.Tab(), "nStartTab!=nEndTab"); String aTmp; - rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pRefDoc ); // immer 3d + rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pRefDoc ); // immer 3d SfxObjectShell* pObjSh = pRefDoc->GetDocumentShell(); @@ -480,19 +480,19 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc ) BOOL ScFormulaDlg::IsRefInputMode() const { - const IFunctionDescription* pDesc = getCurrentFunctionDescription(); + const IFunctionDescription* pDesc = getCurrentFunctionDescription(); BOOL bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL); return bRef; } BOOL ScFormulaDlg::IsDocAllowed(SfxObjectShell* pDocSh) const { - // not allowed: different from this doc, and no name - // pDocSh is always a ScDocShell + // not allowed: different from this doc, and no name + // pDocSh is always a ScDocShell if ( pDocSh && ((ScDocShell*)pDocSh)->GetDocument() != pDoc && !pDocSh->HasName() ) return FALSE; - return TRUE; // everything else is allowed + return TRUE; // everything else is allowed } void ScFormulaDlg::SetActive() @@ -518,7 +518,7 @@ void ScFormulaDlg::doClose(BOOL /*_bOk*/) { m_aHelper.DoClose( ScFormulaDlgWrapper::GetChildWindowId() ); } -void ScFormulaDlg::insertEntryToLRUList(const formula::IFunctionDescription* _pDesc) +void ScFormulaDlg::insertEntryToLRUList(const formula::IFunctionDescription* _pDesc) { const ScFuncDesc* pDesc = dynamic_cast<const ScFuncDesc*>(_pDesc); SaveLRUEntry(pDesc); @@ -558,14 +558,14 @@ void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pB } void ScFormulaDlg::dispatch(BOOL _bOK,BOOL _bMartixChecked) { - SfxBoolItem aRetItem( SID_DLG_RETOK, _bOK ); - SfxBoolItem aMatItem( SID_DLG_MATRIX, _bMartixChecked ); + SfxBoolItem aRetItem( SID_DLG_RETOK, _bOK ); + SfxBoolItem aMatItem( SID_DLG_MATRIX, _bMartixChecked ); SfxStringItem aStrItem( SCITEM_STRING, getCurrentFormula() ); // Wenn durch Dokument-Umschalterei die Eingabezeile weg war/ist, // ist der String leer. Dann nicht die alte Formel loeschen. if ( !aStrItem.GetValue().Len() ) - aRetItem.SetValue( FALSE ); // FALSE = Cancel + aRetItem.SetValue( FALSE ); // FALSE = Cancel m_aHelper.SetDispatcherLock( FALSE ); // Modal-Modus ausschalten @@ -588,7 +588,7 @@ void ScFormulaDlg::setReferenceInput(const formula::FormEditData* _pData) void ScFormulaDlg::deleteFormData() { ScModule* pScMod = SC_MOD(); - pScMod->ClearFormEditData(); // pData wird ungueltig! + pScMod->ClearFormEditData(); // pData wird ungueltig! } void ScFormulaDlg::clear() { @@ -611,7 +611,7 @@ void ScFormulaDlg::switchBack() ScInputHandler* pHdl = pScMod->GetInputHdl(); if ( pHdl ) { - pHdl->ViewShellGone(NULL); // -> aktive View neu holen + pHdl->ViewShellGone(NULL); // -> aktive View neu holen pHdl->ShowRefFrame(); } diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index 2497a86707d6..e8b09550b96d 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.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 @@ -34,16 +34,16 @@ #include "privsplt.hxx" /************************************************************************* -#* Member: ScPrivatSplit Datum:13.10.97 +#* Member: ScPrivatSplit Datum:13.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: MD_Test +#* Klasse: MD_Test #* -#* Funktion: Konstruktor der Klasse ScPrivatSplit +#* Funktion: Konstruktor der Klasse ScPrivatSplit #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -78,17 +78,17 @@ ScPrivatSplit::ScPrivatSplit( Window* pParent, const ResId& rResId, /************************************************************************* -#* Member: MouseButtonDown Datum:13.10.97 +#* Member: MouseButtonDown Datum:13.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScPrivatSplit +#* Klasse: ScPrivatSplit #* -#* Funktion: Reagiert auf einen einzelnen Mouse-Event. Nach Aufruf -#* werden alle Mauseingaben an dieses Control weitergeleitet. +#* Funktion: Reagiert auf einen einzelnen Mouse-Event. Nach Aufruf +#* werden alle Mauseingaben an dieses Control weitergeleitet. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -103,18 +103,18 @@ void ScPrivatSplit::MouseButtonDown( const MouseEvent& rMEvt ) } /************************************************************************* -#* Member: MouseButtonUp Datum:13.10.97 +#* Member: MouseButtonUp Datum:13.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScPrivatSplit +#* Klasse: ScPrivatSplit #* -#* Funktion: Ende einer Benutzeraktion mit der Maus. Es werden -#* die aktuelle Maus- Koordinaten ermittelt und fuer -#* die Verschiebung des Fensters verwendet. +#* Funktion: Ende einer Benutzeraktion mit der Maus. Es werden +#* die aktuelle Maus- Koordinaten ermittelt und fuer +#* die Verschiebung des Fensters verwendet. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -165,18 +165,18 @@ void ScPrivatSplit::MouseButtonUp( const MouseEvent& rMEvt ) } /************************************************************************* -#* Member: MouseMove Datum:13.10.97 +#* Member: MouseMove Datum:13.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScPrivatSplit +#* Klasse: ScPrivatSplit #* -#* Funktion: Reagiert kontinuierlich auf Mausbewegungen. Es werden -#* die aktuelle Maus- Koordinaten ermittelt und fuer -#* die Verschiebung des Fensters verwendet. +#* Funktion: Reagiert kontinuierlich auf Mausbewegungen. Es werden +#* die aktuelle Maus- Koordinaten ermittelt und fuer +#* die Verschiebung des Fensters verwendet. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -230,16 +230,16 @@ void ScPrivatSplit::MouseMove( const MouseEvent& rMEvt ) } /************************************************************************* -#* Member: SetYRange Datum:14.10.97 +#* Member: SetYRange Datum:14.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScPrivatSplit +#* Klasse: ScPrivatSplit #* -#* Funktion: Setzt den Range fuer die Y- Verschiebung +#* Funktion: Setzt den Range fuer die Y- Verschiebung #* -#* Input: neuer Bereich +#* Input: neuer Bereich #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ScPrivatSplit::SetYRange(Range cRgeY) @@ -250,16 +250,16 @@ void ScPrivatSplit::SetYRange(Range cRgeY) /************************************************************************* -#* Member: GetDeltaY Datum:13.10.97 +#* Member: GetDeltaY Datum:13.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScPrivatSplit +#* Klasse: ScPrivatSplit #* -#* Funktion: Liefert die relative x-Verschiebung zurueck +#* Funktion: Liefert die relative x-Verschiebung zurueck #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ short ScPrivatSplit::GetDeltaX() @@ -268,16 +268,16 @@ short ScPrivatSplit::GetDeltaX() } /************************************************************************* -#* Member: GetDeltaY Datum:13.10.97 +#* Member: GetDeltaY Datum:13.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScPrivatSplit +#* Klasse: ScPrivatSplit #* -#* Funktion: Liefert die relative y-Verschiebung zurueck +#* Funktion: Liefert die relative y-Verschiebung zurueck #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ short ScPrivatSplit::GetDeltaY() @@ -286,17 +286,17 @@ short ScPrivatSplit::GetDeltaY() } /************************************************************************* -#* Member: CtrModified Datum:13.10.97 +#* Member: CtrModified Datum:13.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScPrivatSplit +#* Klasse: ScPrivatSplit #* -#* Funktion: Teilt einem installierten Handler mit, dass -#* eine Veraenderung eingetreten ist. +#* Funktion: Teilt einem installierten Handler mit, dass +#* eine Veraenderung eingetreten ist. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ScPrivatSplit::CtrModified() diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx index dee0c99d4861..6f6de13430d3 100644 --- a/sc/source/ui/inc/AccessibilityHints.hxx +++ b/sc/source/ui/inc/AccessibilityHints.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 @@ -34,10 +34,10 @@ #include <svl/smplhint.hxx> #include <svl/hint.hxx> -#define SC_HINT_ACC_SIMPLE_START SFX_HINT_USER00 -#define SC_HINT_ACC_TABLECHANGED SC_HINT_ACC_SIMPLE_START + 1 -#define SC_HINT_ACC_CURSORCHANGED SC_HINT_ACC_SIMPLE_START + 2 -#define SC_HINT_ACC_VISAREACHANGED SC_HINT_ACC_SIMPLE_START + 3 +#define SC_HINT_ACC_SIMPLE_START SFX_HINT_USER00 +#define SC_HINT_ACC_TABLECHANGED SC_HINT_ACC_SIMPLE_START + 1 +#define SC_HINT_ACC_CURSORCHANGED SC_HINT_ACC_SIMPLE_START + 2 +#define SC_HINT_ACC_VISAREACHANGED SC_HINT_ACC_SIMPLE_START + 3 #define SC_HINT_ACC_ENTEREDITMODE SC_HINT_ACC_SIMPLE_START + 4 #define SC_HINT_ACC_LEAVEEDITMODE SC_HINT_ACC_SIMPLE_START + 5 #define SC_HINT_ACC_MAKEDRAWLAYER SC_HINT_ACC_SIMPLE_START + 6 @@ -49,7 +49,7 @@ class ScAccWinFocusLostHint : public SfxHint xOldAccessible; public: TYPEINFO(); - ScAccWinFocusLostHint( + ScAccWinFocusLostHint( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); ~ScAccWinFocusLostHint(); @@ -63,7 +63,7 @@ class ScAccWinFocusGotHint : public SfxHint xNewAccessible; public: TYPEINFO(); - ScAccWinFocusGotHint( + ScAccWinFocusGotHint( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); ~ScAccWinFocusGotHint(); @@ -73,26 +73,26 @@ public: class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint { - ScSplitPos eOldGridWin; + ScSplitPos eOldGridWin; public: TYPEINFO(); - ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin, + ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); ~ScAccGridWinFocusLostHint(); - ScSplitPos GetOldGridWin() const { return eOldGridWin; } + ScSplitPos GetOldGridWin() const { return eOldGridWin; } }; class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint { - ScSplitPos eNewGridWin; + ScSplitPos eNewGridWin; public: TYPEINFO(); ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); ~ScAccGridWinFocusGotHint(); - ScSplitPos GetNewGridWin() const { return eNewGridWin; } + ScSplitPos GetNewGridWin() const { return eNewGridWin; } }; #endif diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 6d0c1dfb524b..e40636a2660a 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.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 @@ -41,12 +41,12 @@ class ScTabViewShell; class ScAccessibleDocument; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleCell</code> service. */ class ScAccessibleCell - : public ScAccessibleCellBase, + : public ScAccessibleCellBase, public accessibility::AccessibleStaticTextBase { public: @@ -90,31 +90,31 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -127,7 +127,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index fb79d76c91a1..1edbe7f1b878 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.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 @@ -42,7 +42,7 @@ typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleValue> ScAccessibleCellBaseImpl; class ScAccessibleCellBase - : public ScAccessibleContextBase, + : public ScAccessibleContextBase, public ScAccessibleCellBaseImpl { public: @@ -59,12 +59,12 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); - + virtual void SAL_CALL release() throw (); ///===== XAccessibleComponent ============================================ @@ -72,26 +72,26 @@ public: virtual sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); ///===== XAccessibleContext ============================================== - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -117,7 +117,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -126,11 +126,11 @@ public: ///===== XTypeProvider =================================================== /// returns the possible types - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -148,7 +148,7 @@ private: const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); }; - + #endif diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 245122f5b73a..8db6137b2147 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.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 @@ -54,7 +54,7 @@ class Rectangle; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleContext</code> service. */ @@ -72,7 +72,7 @@ typedef cppu::ImplHelper1< > ScAccessibleContextBaseImplEvent; class ScAccessibleContextBase - : public comphelper::OBaseMutex, + : public comphelper::OBaseMutex, public ScAccessibleContextBaseWeakImpl, public ScAccessibleContextBaseImplEvent, public SfxListener @@ -108,7 +108,7 @@ public: ///===== XAccessible ===================================================== - /// Return the XAccessibleContext. + /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext(void) throw (::com::sun::star::uno::RuntimeException); @@ -144,62 +144,62 @@ public: virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return a reference to the parent. + /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent(void) throw (::com::sun::star::uno::RuntimeException); - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's role. + /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole(void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL getAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL getAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw (::com::sun::star::uno::RuntimeException); - /** Return the parents locale or throw exception if this object has no + /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL @@ -209,7 +209,7 @@ public: ///===== XAccessibleEventBroadcaster ===================================== - /** Add listener that is informed of future changes of name, + /** Add listener that is informed of future changes of name, description and so on events. */ virtual void SAL_CALL @@ -218,7 +218,7 @@ public: ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException); - // Remove an existing event listener. + // Remove an existing event listener. virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -238,13 +238,13 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) @@ -264,28 +264,28 @@ public: getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); @@ -315,18 +315,18 @@ protected: /// Use this method to set initial Description without notification void SetDescription(const rtl::OUString& rDesc) { msDescription = rDesc; } - /// Reference to the parent object. + /// Reference to the parent object. ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> mxParent; private: - /** Description of this object. This is not a constant because it can + /** Description of this object. This is not a constant because it can be set from the outside. Furthermore, it changes according the the draw page's display mode. */ ::rtl::OUString msDescription; - /** Name of this object. It changes according the the draw page's + /** Name of this object. It changes according the the draw page's display mode. */ ::rtl::OUString msName; diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 87cd4f8d7d26..f4eb41dd3c9a 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.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/inc/AccessibleDataPilotControl.hxx b/sc/source/ui/inc/AccessibleDataPilotControl.hxx index 7d9c3f470bb8..1b6578c41e16 100644 --- a/sc/source/ui/inc/AccessibleDataPilotControl.hxx +++ b/sc/source/ui/inc/AccessibleDataPilotControl.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 @@ -36,7 +36,7 @@ class ScDPFieldWindow; class ScAccessibleDataPilotButton; class ScAccessibleDataPilotControl - : public ScAccessibleContextBase + : public ScAccessibleContextBase { public: //===== internal ======================================================== @@ -72,25 +72,25 @@ public: virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -98,7 +98,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -106,28 +106,28 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index fbfa0667f68f..7facaf856d6f 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.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 @@ -51,7 +51,7 @@ namespace utl class AccessibleRelationSetHelper; } -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleContext</code> service. */ @@ -61,7 +61,7 @@ typedef cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleSelection ScAccessibleDocumentImpl; class ScAccessibleDocument - : public ScAccessibleDocumentBase, + : public ScAccessibleDocumentBase, public ScAccessibleDocumentImpl, public accessibility::IAccessibleViewForwarder { @@ -72,7 +72,7 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, ScSplitPos eSplitPos); - + virtual void Init(); @@ -92,12 +92,12 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); - + virtual void SAL_CALL release() throw (); ///===== XAccessibleComponent ============================================ @@ -112,18 +112,18 @@ public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -131,42 +131,42 @@ public: ///===== XAccessibleSelection =========================================== - virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, + virtual void SAL_CALL + selectAccessibleChild( sal_Int32 nChildIndex ) + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) + virtual sal_Bool SAL_CALL + isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - clearAccessibleSelection( ) + virtual void SAL_CALL + clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - selectAllAccessibleChildren( ) + virtual void SAL_CALL + selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL - getSelectedAccessibleChildCount( ) + virtual sal_Int32 SAL_CALL + getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + ::com::sun::star::accessibility::XAccessible > SAL_CALL + getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nChildIndex ) + virtual void SAL_CALL + deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); ///===== XSelectionListener ============================================= - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) @@ -174,7 +174,7 @@ public: ///===== XServiceInfo =================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -189,11 +189,11 @@ public: ///===== XTypeProvider =================================================== /// returns the possible types - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -212,7 +212,7 @@ public: /** Returns the area of the underlying document that is visible in the * corresponding window. - @return + @return The rectangle of the visible part of the document. The values are, contrary to the base class, in internal coordinates. */ @@ -224,7 +224,7 @@ public: @param rPoint Point in internal coordinates. - @return + @return The same point but in screen coordinates relative to the upper left corner of the (current) screen. */ @@ -236,7 +236,7 @@ public: @param rSize Size in internal coordinates. - @return + @return The same size but in screen coordinates. */ virtual Size LogicToPixel (const Size& rSize) const; @@ -248,7 +248,7 @@ public: Point in screen coordinates relative to the upper left corner of the (current) screen. - @return + @return The same point but in internal coordinates. */ virtual Point PixelToLogic (const Point& rPoint) const; @@ -265,7 +265,7 @@ public: virtual Size PixelToLogic (const Size& rSize) const; ///======== internal ===================================================== - + utl::AccessibleRelationSetHelper* GetRelationSet(const ScAddress* pAddress) const; ::com::sun::star::uno::Reference @@ -273,27 +273,27 @@ public: GetAccessibleSpreadsheet(); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScTabViewShell* mpViewShell; - ScSplitPos meSplitPos; + ScTabViewShell* mpViewShell; + ScSplitPos meSplitPos; ScAccessibleSpreadsheet* mpAccessibleSpreadsheet; ScChildrenShapes* mpChildrenShapes; ScAccessibleEditObject* mpTempAccEdit; diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx index eeab25f7af1c..5a5ebdb191b1 100644 --- a/sc/source/ui/inc/AccessibleDocumentBase.hxx +++ b/sc/source/ui/inc/AccessibleDocumentBase.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 @@ -33,7 +33,7 @@ #include "AccessibleContextBase.hxx" class ScAccessibleDocumentBase - : public ScAccessibleContextBase + : public ScAccessibleContextBase { public: //===== internal ======================================================== @@ -41,7 +41,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); protected: - virtual ~ScAccessibleDocumentBase (void); + virtual ~ScAccessibleDocumentBase (void); }; diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index b524c6f5ffa3..058d92c238a8 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.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 @@ -39,7 +39,7 @@ class ScAccessiblePreviewTable; class ScAccessiblePageHeader; class ScAccessibleDocumentPagePreview - : public ScAccessibleDocumentBase + : public ScAccessibleDocumentBase { public: //===== internal ======================================================== @@ -73,18 +73,18 @@ public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -92,7 +92,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -106,7 +106,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -115,28 +115,28 @@ public: ///===== internal ======================================================== protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); public: // needed in ScShapeChilds - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); protected: - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScPreviewShell* mpViewShell; + ScPreviewShell* mpViewShell; ScNotesChilds* mpNotesChilds; ScShapeChilds* mpShapeChilds; ScAccessiblePreviewTable* mpTable; diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 5dd40f7c0d62..690dea145b62 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.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 @@ -46,19 +46,19 @@ enum EditObjectType EditControl }; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleCell</code> service. */ class ScAccessibleEditObject - : public ScAccessibleContextBase + : public ScAccessibleContextBase { public: //===== internal ======================================================== ScAccessibleEditObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const rtl::OUString& rName, + EditView* pEditView, Window* pWin, const rtl::OUString& rName, const rtl::OUString& rDescription, EditObjectType eObjectType); protected: @@ -85,43 +85,43 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -129,7 +129,7 @@ protected: public: ///===== XAccessibleEventBroadcaster ===================================== - /** Add listener that is informed of future changes of name, + /** Add listener that is informed of future changes of name, description and so on events. */ virtual void SAL_CALL @@ -138,7 +138,7 @@ public: ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException); - // Remove an existing event listener. + // Remove an existing event listener. virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -147,7 +147,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -155,7 +155,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index b3598adf7469..acacbc933745 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.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 @@ -63,7 +63,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleContext ============================================== @@ -94,9 +94,9 @@ protected: virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScPreviewShell* mpViewShell; - sal_Int32 mnIndex; - sal_Bool mbHeader; + ScPreviewShell* mpViewShell; + sal_Int32 mnIndex; + sal_Bool mbHeader; typedef std::vector< ScAccessiblePageHeaderArea* > ScHFAreas; ScHFAreas maAreas; sal_Int32 mnChildCount; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 3f907e5609ed..c0c3758549d9 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.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 @@ -41,7 +41,7 @@ namespace accessibility class ScPreviewShell; class ScAccessiblePageHeaderArea - : public ScAccessibleContextBase + : public ScAccessibleContextBase { public: //===== internal ======================================================== @@ -53,7 +53,7 @@ public: sal_Bool bHeader, SvxAdjust eAdjust); protected: - virtual ~ScAccessiblePageHeaderArea (void); + virtual ~ScAccessiblePageHeaderArea (void); public: const EditTextObject* GetEditTextObject() const { return mpEditObj; } @@ -73,20 +73,20 @@ public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -94,7 +94,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -109,7 +109,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index 02090ad207f9..e4509a64754f 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.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 @@ -66,7 +66,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleContext ============================================== @@ -89,7 +89,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index f3e8d7b29ea3..5f013ac62aed 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.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 @@ -72,12 +72,12 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); - + virtual void SAL_CALL release() throw (); //===== XAccessibleValue ================================================ @@ -93,7 +93,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleContext ============================================== @@ -115,11 +115,11 @@ public: ///===== XTypeProvider =================================================== - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -133,20 +133,20 @@ protected: virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScPreviewShell* mpViewShell; + ScPreviewShell* mpViewShell; accessibility::AccessibleTextHelper* mpTextHelper; - sal_Int32 mnIndex; - ScAddress maCellPos; - sal_Bool mbColumnHeader; - sal_Bool mbRowHeader; - mutable ScPreviewTableInfo* mpTableInfo; + sal_Int32 mnIndex; + ScAddress maCellPos; + sal_Bool mbColumnHeader; + sal_Bool mbRowHeader; + mutable ScPreviewTableInfo* mpTableInfo; sal_Bool IsDefunc( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); - void FillTableInfo() const; + void FillTableInfo() const; }; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 9dfbcfbd6662..31c55d9bb383 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.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 @@ -64,12 +64,12 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); - + virtual void SAL_CALL release() throw (); //===== XAccessibleTable ================================================ @@ -128,7 +128,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleContext ============================================== @@ -150,8 +150,8 @@ public: //===== XTypeProvider =================================================== - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + getTypes() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() @@ -168,15 +168,15 @@ protected: virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScPreviewShell* mpViewShell; - sal_Int32 mnIndex; - mutable ScPreviewTableInfo* mpTableInfo; + ScPreviewShell* mpViewShell; + sal_Int32 mnIndex; + mutable ScPreviewTableInfo* mpTableInfo; sal_Bool IsDefunc( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); - void FillTableInfo() const; + void FillTableInfo() const; }; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 77fae44a37d1..307d9b282db3 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.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 @@ -55,19 +55,19 @@ class ScTabViewShell; class ScAccessibleDocument; class ScAccessibleCell; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleTable</code> service. */ class ScAccessibleSpreadsheet - : public ScAccessibleTableBase + : public ScAccessibleTableBase { public: //===== internal ======================================================== ScAccessibleSpreadsheet( ScAccessibleDocument* pAccDoc, ScTabViewShell* pViewShell, - SCTAB nTab, + SCTAB nTab, ScSplitPos eSplitPos); protected: ScAccessibleSpreadsheet( @@ -170,13 +170,13 @@ public: ///===== XAccessibleContext ============================================== - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -214,7 +214,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -228,7 +228,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -236,7 +236,7 @@ public: ///===== XAccessibleEventBroadcaster ===================================== - /** Add listener that is informed of future changes of name, + /** Add listener that is informed of future changes of name, description and so on events. */ virtual void SAL_CALL @@ -246,26 +246,26 @@ public: throw (com::sun::star::uno::RuntimeException); protected: - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: ScTabViewShell* mpViewShell; - ScRangeList* mpMarkedRanges; + ScRangeList* mpMarkedRanges; std::vector<ScMyAddress>* mpSortedMarkedCells; ScAccessibleDocument* mpAccDoc; ScAccessibleCell* mpAccCell; - Rectangle maVisCells; - ScSplitPos meSplitPos; - ScAddress maActiveCell; + Rectangle maVisCells; + ScSplitPos meSplitPos; + ScAddress maActiveCell; SCTAB mnTab; sal_Bool mbIsSpreadsheet; - sal_Bool mbHasSelection; - sal_Bool mbDelIns; + sal_Bool mbHasSelection; + sal_Bool mbDelIns; sal_Bool mbIsFocusSend; sal_Bool IsDefunc( @@ -282,8 +282,8 @@ private: void AddMarkedRange(const ScRange& rRange); ScDocument* GetDocument(ScTabViewShell* pViewShell); - Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); - Rectangle GetVisCells(const Rectangle& rVisArea); + Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); + Rectangle GetVisCells(const Rectangle& rVisArea); }; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index e436b623397e..4728443783ec 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.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 @@ -39,7 +39,7 @@ class ScTabViewShell; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleTable</code> service. */ @@ -192,13 +192,13 @@ public: //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) @@ -206,24 +206,24 @@ public: ::com::sun::star::lang::IndexOutOfBoundsException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); public: - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. // perhaps sometimes to be implemented virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL @@ -267,7 +267,7 @@ public: ///===== XServiceInfo =================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -280,7 +280,7 @@ public: getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -290,7 +290,7 @@ protected: /// contains the range of the table, because it could be a subrange of the complete table ScRange maRange; - ScDocument* mpDoc; + ScDocument* mpDoc; void CommitTableModelChange(sal_Int32 nStartRow, sal_Int32 nStartCol, sal_Int32 nEndRow, sal_Int32 nEndCol, sal_uInt16 nId); }; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index eaa68f0e6aa2..9c0f327c89e3 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.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 @@ -53,9 +53,9 @@ class ScAccessibleTextData : public SfxListener { public: ScAccessibleTextData() {} - virtual ~ScAccessibleTextData() {} + virtual ~ScAccessibleTextData() {} - virtual ScAccessibleTextData* Clone() const = 0; + virtual ScAccessibleTextData* Clone() const = 0; virtual void Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ ) {} @@ -64,15 +64,15 @@ public: virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) = 0; virtual SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } - virtual void UpdateData() = 0; - virtual void SetDoUpdate(sal_Bool bValue) = 0; - virtual sal_Bool IsDirty() const = 0; + virtual void UpdateData() = 0; + virtual void SetDoUpdate(sal_Bool bValue) = 0; + virtual sal_Bool IsDirty() const = 0; private: mutable SfxBroadcaster maBroadcaster; // prevent the using of this method of the base class - ScSharedCellEditSource* GetOriginalSource() { return NULL; } + ScSharedCellEditSource* GetOriginalSource() { return NULL; } }; @@ -86,28 +86,28 @@ public: const ScAddress& rP) : ScCellTextData(pDocShellP, rP) {} virtual ~ScAccessibleCellBaseTextData() {} - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { ScCellTextData::Notify(rBC, rHint); } + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { ScCellTextData::Notify(rBC, rHint); } - virtual void UpdateData() { ScCellTextData::UpdateData(); } - virtual void SetDoUpdate(sal_Bool bValue) { ScCellTextData::SetDoUpdate(bValue); } - virtual sal_Bool IsDirty() const { return ScCellTextData::IsDirty(); } + virtual void UpdateData() { ScCellTextData::UpdateData(); } + virtual void SetDoUpdate(sal_Bool bValue) { ScCellTextData::SetDoUpdate(bValue); } + virtual sal_Bool IsDirty() const { return ScCellTextData::IsDirty(); } }; // ============================================================================ -// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object +// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object class ScAccessibleCellTextData : public ScAccessibleCellBaseTextData { public: ScAccessibleCellTextData(ScTabViewShell* pViewShell, const ScAddress& rP, ScSplitPos eSplitPos, ScAccessibleCell* pAccCell); - virtual ~ScAccessibleCellTextData(); + virtual ~ScAccessibleCellTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); @@ -119,13 +119,13 @@ protected: private: ScViewForwarder* mpViewForwarder; ScEditViewForwarder* mpEditViewForwarder; - ScTabViewShell* mpViewShell; + ScTabViewShell* mpViewShell; ScSplitPos meSplitPos; sal_Bool mbViewEditEngine; ScAccessibleCell* mpAccessibleCell; // prevent the using of this method of the base class - ScSharedCellEditSource* GetOriginalSource() { return NULL; } + ScSharedCellEditSource* GetOriginalSource() { return NULL; } using ScAccessibleCellBaseTextData::GetDocShell; ScDocShell* GetDocShell(ScTabViewShell* pViewShell); @@ -138,19 +138,19 @@ class ScAccessibleEditObjectTextData : public ScAccessibleTextData { public: ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin); - virtual ~ScAccessibleEditObjectTextData(); + virtual ~ScAccessibleEditObjectTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ); - virtual void UpdateData() { } - virtual void SetDoUpdate(sal_Bool /* bValue */) { } - virtual sal_Bool IsDirty() const { return sal_False; } + virtual void UpdateData() { } + virtual void SetDoUpdate(sal_Bool /* bValue */) { } + virtual sal_Bool IsDirty() const { return sal_False; } DECL_LINK( NotifyHdl, EENotify* ); protected: @@ -158,7 +158,7 @@ protected: ScEditViewForwarder* mpEditViewForwarder; EditView* mpEditView; EditEngine* mpEditEngine; - SvxEditEngineForwarder* mpForwarder; + SvxEditEngineForwarder* mpForwarder; Window* mpWindow; }; @@ -194,11 +194,11 @@ class ScAccessiblePreviewCellTextData : public ScAccessibleCellBaseTextData public: ScAccessiblePreviewCellTextData(ScPreviewShell* pViewShell, const ScAddress& rP); - virtual ~ScAccessiblePreviewCellTextData(); + virtual ~ScAccessiblePreviewCellTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); @@ -206,10 +206,10 @@ public: private: ScPreviewViewForwarder* mpViewForwarder; - ScPreviewShell* mpViewShell; + ScPreviewShell* mpViewShell; // prevent the using of this method of the base class - ScSharedCellEditSource* GetOriginalSource() { return NULL; } + ScSharedCellEditSource* GetOriginalSource() { return NULL; } using ScAccessibleCellBaseTextData::GetDocShell; ScDocShell* GetDocShell(ScPreviewShell* pViewShell); @@ -223,11 +223,11 @@ class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextDat public: ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell, const String& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader); - virtual ~ScAccessiblePreviewHeaderCellTextData(); + virtual ~ScAccessiblePreviewHeaderCellTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); @@ -235,13 +235,13 @@ public: private: ScPreviewViewForwarder* mpViewForwarder; - ScPreviewShell* mpViewShell; - String maText; - sal_Bool mbColHeader; - sal_Bool mbRowHeader; + ScPreviewShell* mpViewShell; + String maText; + sal_Bool mbColHeader; + sal_Bool mbRowHeader; // prevent the using of this method of the base class - ScSharedCellEditSource* GetOriginalSource() { return NULL; } + ScSharedCellEditSource* GetOriginalSource() { return NULL; } using ScAccessibleCellBaseTextData::GetDocShell; ScDocShell* GetDocShell(ScPreviewShell* pViewShell); @@ -259,20 +259,20 @@ public: virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; } - virtual void UpdateData() { } - virtual void SetDoUpdate(sal_Bool /* bValue */) { } - virtual sal_Bool IsDirty() const { return sal_False; } + virtual void UpdateData() { } + virtual void SetDoUpdate(sal_Bool /* bValue */) { } + virtual sal_Bool IsDirty() const { return sal_False; } private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; - ScEditEngineDefaulter* mpEditEngine; - SvxEditEngineForwarder* mpForwarder; + ScEditEngineDefaulter* mpEditEngine; + SvxEditEngineForwarder* mpForwarder; ScDocShell* mpDocSh; const EditTextObject* mpEditObj; sal_Bool mbHeader; @@ -292,20 +292,20 @@ public: virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; } - virtual void UpdateData() { } - virtual void SetDoUpdate(sal_Bool /* bValue */) { } - virtual sal_Bool IsDirty() const { return sal_False; } + virtual void UpdateData() { } + virtual void SetDoUpdate(sal_Bool /* bValue */) { } + virtual sal_Bool IsDirty() const { return sal_False; } private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; - ScEditEngineDefaulter* mpEditEngine; - SvxEditEngineForwarder* mpForwarder; + ScEditEngineDefaulter* mpEditEngine; + SvxEditEngineForwarder* mpForwarder; ScDocShell* mpDocSh; String msText; ScAddress maCellPos; diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index 45127b333983..807cba46a98e 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.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/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index a3c56b722d58..22e6ca85ce46 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.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 @@ -46,15 +46,15 @@ class ScDrawModelBroadcaster : public SfxListener, public: - ScDrawModelBroadcaster( SdrModel *pDrawModel ); + ScDrawModelBroadcaster( SdrModel *pDrawModel ); virtual ~ScDrawModelBroadcaster(); - virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) + virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) + virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; #endif diff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxx index 97212be8552e..7a40593d8e51 100644 --- a/sc/source/ui/inc/IAnyRefDialog.hxx +++ b/sc/source/ui/inc/IAnyRefDialog.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 @@ -43,7 +43,7 @@ class SAL_NO_VTABLE IAnyRefDialog : public formula::IControlReferenceHandler { public: virtual ~IAnyRefDialog(){} - + //virtual void ShowReference(const String& _sRef) = 0; //virtual void HideReference( BOOL bDoneRefMode = TRUE ) = 0; //virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) = 0; @@ -55,7 +55,7 @@ public: virtual void RefInputDone( BOOL bForced = FALSE ) = 0; virtual BOOL IsTableLocked() const = 0; virtual BOOL IsRefInputMode() const = 0; - + virtual BOOL IsDocAllowed( SfxObjectShell* pDocSh ) const = 0; virtual void AddRefEntry() = 0; virtual void SetActive() = 0; diff --git a/sc/source/ui/inc/ScDevChart.hxx b/sc/source/ui/inc/ScDevChart.hxx index 5f60bcec9a3e..cb2c7c42c127 100644 --- a/sc/source/ui/inc/ScDevChart.hxx +++ b/sc/source/ui/inc/ScDevChart.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/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc index b21676ee6ae9..468c57333780 100644 --- a/sc/source/ui/inc/acredlin.hrc +++ b/sc/source/ui/inc/acredlin.hrc @@ -1,7 +1,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 @@ -28,48 +28,48 @@ #include "sc.hrc" // -> RID_SCDLG_CHANGES #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 5 +#define BTN_CANCEL 2 +#define BTN_HELP 5 // -#define CTR_REDLINING 10 -#define TP_FILTER 11 -#define TP_VIEW 12 +#define CTR_REDLINING 10 +#define TP_FILTER 11 +#define TP_VIEW 12 -#define FT_ASSIGN 14 -#define ED_ASSIGN 15 -#define RB_ASSIGN 16 +#define FT_ASSIGN 14 +#define ED_ASSIGN 15 +#define RB_ASSIGN 16 #define STR_INSERT_COLS 20 -#define STR_INSERT_ROWS 21 -#define STR_INSERT_TABS 22 -#define STR_DELETE_COLS 23 -#define STR_DELETE_ROWS 24 -#define STR_DELETE_TABS 25 -#define STR_MOVE 26 -#define STR_CONTENT 27 -#define STR_REJECT 28 -#define STR_ACCEPTED 29 -#define STR_REJECTED 30 -#define STR_NO_ENTRY 31 -#define STR_CONTENT_WITH_CHILD 32 -#define STR_CHILD_CONTENT 33 -#define STR_CHILD_ORGCONTENT 34 -#define STR_EMPTY 35 +#define STR_INSERT_ROWS 21 +#define STR_INSERT_TABS 22 +#define STR_DELETE_COLS 23 +#define STR_DELETE_ROWS 24 +#define STR_DELETE_TABS 25 +#define STR_MOVE 26 +#define STR_CONTENT 27 +#define STR_REJECT 28 +#define STR_ACCEPTED 29 +#define STR_REJECTED 30 +#define STR_NO_ENTRY 31 +#define STR_CONTENT_WITH_CHILD 32 +#define STR_CHILD_CONTENT 33 +#define STR_CHILD_ORGCONTENT 34 +#define STR_EMPTY 35 // Bitmaps -#define BMP_STR_CLOSE 41 -#define BMP_STR_OPEN 42 -#define BMP_STR_END 43 -#define BMP_STR_ERROR 44 +#define BMP_STR_CLOSE 41 +#define BMP_STR_OPEN 42 +#define BMP_STR_END 43 +#define BMP_STR_ERROR 44 -#define SC_CHANGES_COMMENT 49 -#define SC_SUB_SORT 50 -#define SC_SORT_ACTION 51 -#define SC_SORT_POSITION 52 -#define SC_SORT_AUTHOR 53 -#define SC_SORT_DATE 54 -#define SC_SORT_COMMENT 55 +#define SC_CHANGES_COMMENT 49 +#define SC_SUB_SORT 50 +#define SC_SORT_ACTION 51 +#define SC_SORT_POSITION 52 +#define SC_SORT_AUTHOR 53 +#define SC_SORT_DATE 54 +#define SC_SORT_COMMENT 55 // diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index aeff805d72ca..94e557453fd3 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.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 @@ -54,39 +54,39 @@ class ScViewData; class ScDocument; -#define FLT_DATE_BEFORE 0 -#define FLT_DATE_SINCE 1 -#define FLT_DATE_EQUAL 2 -#define FLT_DATE_NOTEQUAL 3 -#define FLT_DATE_BETWEEN 4 -#define FLT_DATE_SAVE 5 +#define FLT_DATE_BEFORE 0 +#define FLT_DATE_SINCE 1 +#define FLT_DATE_EQUAL 2 +#define FLT_DATE_NOTEQUAL 3 +#define FLT_DATE_BETWEEN 4 +#define FLT_DATE_SAVE 5 class ScViewEntryPtr { private: - String* pAction; - String* pPos; - String* pAuthor; - String* pDate; - String* pComment; - void* pData; + String* pAction; + String* pPos; + String* pAuthor; + String* pDate; + String* pComment; + void* pData; public: - String* GetpAction() {return pAction; } - String* GetpPos() {return pPos; } - String* GetpAuthor() {return pAuthor; } - String* GetpDate() {return pDate; } - String* GetpComment() {return pComment;} - void* GetpData() {return pData; } - - void SetpAction (String* pString) {pAction= pString;} - void SetpPos (String* pString) {pPos = pString;} - void SetpAuthor (String* pString) {pAuthor= pString;} - void SetpDate (String* pString) {pDate = pString;} - void SetpComment(String* pString) {pComment=pString;} - void SetpData (void* pdata) {pData =pdata;} + String* GetpAction() {return pAction; } + String* GetpPos() {return pPos; } + String* GetpAuthor() {return pAuthor; } + String* GetpDate() {return pDate; } + String* GetpComment() {return pComment;} + void* GetpData() {return pData; } + + void SetpAction (String* pString) {pAction= pString;} + void SetpPos (String* pString) {pPos = pString;} + void SetpAuthor (String* pString) {pAuthor= pString;} + void SetpDate (String* pString) {pDate = pString;} + void SetpComment(String* pString) {pComment=pString;} + void SetpData (void* pdata) {pData =pdata;} }; class ScViewEntryPtrList @@ -94,7 +94,7 @@ class ScViewEntryPtrList ScViewEntryPtrList* pNext; ScViewEntryPtrList* pLast; - ScViewEntryPtr* pData; + ScViewEntryPtr* pData; }; @@ -104,16 +104,16 @@ public: ScRedlinData(); ~ScRedlinData(); - SCTAB nTable; - SCCOL nCol; - SCROW nRow; - ULONG nActionNo; - ULONG nInfo; - BOOL bIsRejectable; - BOOL bIsAcceptable; + SCTAB nTable; + SCCOL nCol; + SCROW nRow; + ULONG nActionNo; + ULONG nInfo; + BOOL bIsRejectable; + BOOL bIsAcceptable; }; -typedef long LExpNum; +typedef long LExpNum; //@ Expand-Entrys nicht eindeutig, daher gestrichen //DECLARE_TABLE( ScChgTrackExps, LExpNum) @@ -123,49 +123,49 @@ class ScAcceptChgDlg : public SfxModelessDialog { private: - Timer aSelectionTimer; - Timer aReOpenTimer; - SvxAcceptChgCtr aAcceptChgCtr; - ScViewData* pViewData; - ScDocument* pDoc; - ScRangeName aLocalRangeName; - Selection theCurSel; - SvxTPFilter* pTPFilter; - SvxTPView* pTPView; - SvxRedlinTable* pTheView; // PB 2006/02/02 #i48648 now SvHeaderTabListBox - Size MinSize; - ScRangeList aRangeList; - ScChangeViewSettings aChangeViewSet; - String aStrInsertCols; - String aStrInsertRows; - String aStrInsertTabs; - String aStrDeleteCols; - String aStrDeleteRows; - String aStrDeleteTabs; - String aStrMove; - String aStrContent; - String aStrReject; - String aUnknown; - String aStrAllAccepted; - String aStrAllRejected; - String aStrNoEntry; - String aStrContentWithChild; - String aStrChildContent; - String aStrChildOrgContent; - String aStrEmpty; - ULONG nAcceptCount; - ULONG nRejectCount; - BOOL bAcceptEnableFlag; - BOOL bRejectEnableFlag; - BOOL bNeedsUpdate; - BOOL bIgnoreMsg; - BOOL bNoSelection; - BOOL bHasFilterEntry; - BOOL bUseColor; - //ScChgTrackExps aExpandArray; - - void Init(); - void InitFilter(); + Timer aSelectionTimer; + Timer aReOpenTimer; + SvxAcceptChgCtr aAcceptChgCtr; + ScViewData* pViewData; + ScDocument* pDoc; + ScRangeName aLocalRangeName; + Selection theCurSel; + SvxTPFilter* pTPFilter; + SvxTPView* pTPView; + SvxRedlinTable* pTheView; // PB 2006/02/02 #i48648 now SvHeaderTabListBox + Size MinSize; + ScRangeList aRangeList; + ScChangeViewSettings aChangeViewSet; + String aStrInsertCols; + String aStrInsertRows; + String aStrInsertTabs; + String aStrDeleteCols; + String aStrDeleteRows; + String aStrDeleteTabs; + String aStrMove; + String aStrContent; + String aStrReject; + String aUnknown; + String aStrAllAccepted; + String aStrAllRejected; + String aStrNoEntry; + String aStrContentWithChild; + String aStrChildContent; + String aStrChildOrgContent; + String aStrEmpty; + ULONG nAcceptCount; + ULONG nRejectCount; + BOOL bAcceptEnableFlag; + BOOL bRejectEnableFlag; + BOOL bNeedsUpdate; + BOOL bIgnoreMsg; + BOOL bNoSelection; + BOOL bHasFilterEntry; + BOOL bUseColor; + //ScChgTrackExps aExpandArray; + + void Init(); + void InitFilter(); DECL_LINK( FilterHandle, SvxTPFilter* ); DECL_LINK( RefHandle, SvxTPFilter* ); @@ -189,64 +189,64 @@ private: protected: - virtual void Resize(); - virtual BOOL Close(); + virtual void Resize(); + virtual BOOL Close(); - void RejectFiltered(); - void AcceptFiltered(); + void RejectFiltered(); + void AcceptFiltered(); - BOOL IsValidAction(const ScChangeAction* pScChangeAction); + BOOL IsValidAction(const ScChangeAction* pScChangeAction); - String* MakeTypeString(ScChangeActionType eType); + String* MakeTypeString(ScChangeActionType eType); - SvLBoxEntry* InsertChangeAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState, + SvLBoxEntry* InsertChangeAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState, SvLBoxEntry* pParent=NULL,BOOL bDelMaster=FALSE, BOOL bDisabled=FALSE,ULONG nPos=LIST_APPEND); - SvLBoxEntry* InsertFilteredAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState, + SvLBoxEntry* InsertFilteredAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState, SvLBoxEntry* pParent=NULL,BOOL bDelMaster=FALSE, BOOL bDisabled=FALSE,ULONG nPos=LIST_APPEND); - SvLBoxEntry* InsertChangeActionContent(const ScChangeActionContent* pScChangeAction, + SvLBoxEntry* InsertChangeActionContent(const ScChangeActionContent* pScChangeAction, SvLBoxEntry* pParent,ULONG nSpecial); - void GetDependents( const ScChangeAction* pScChangeAction, + void GetDependents( const ScChangeAction* pScChangeAction, ScChangeActionTable& aActionTable, SvLBoxEntry* pEntry); - BOOL InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent); + BOOL InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent); - BOOL InsertAcceptedORejected(SvLBoxEntry* pParent); + BOOL InsertAcceptedORejected(SvLBoxEntry* pParent); - BOOL InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable, + BOOL InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable, SvLBoxEntry* pParent); - BOOL InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent); + BOOL InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent); - void AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, ULONG nEndAction, + void AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, ULONG nEndAction, ULONG nPos=LIST_APPEND); - void RemoveEntrys(ULONG nStartAction,ULONG nEndAction); - void UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,ULONG nEndAction); + void RemoveEntrys(ULONG nStartAction,ULONG nEndAction); + void UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,ULONG nEndAction); - void UpdateView(); - void ClearView(); + void UpdateView(); + void ClearView(); - BOOL Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction, + BOOL Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction, SvLBoxEntry* pEntry, BOOL bFilter=FALSE); public: ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData); + ScViewData* ptrViewData); ~ScAcceptChgDlg(); - void ReInit(ScViewData* ptrViewData); + void ReInit(ScViewData* ptrViewData); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); - void Initialize (SfxChildWinInfo* pInfo); + void Initialize (SfxChildWinInfo* pInfo); virtual void FillInfo(SfxChildWinInfo&) const; }; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index b10ccf083756..9695abbe6b37 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.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 @@ -53,8 +53,8 @@ class ScRangeList; class SfxShell; #include "scmod.hxx" -typedef formula::RefButton ScRefButton; -typedef formula::RefEdit ScRefEdit; +typedef formula::RefButton ScRefButton; +typedef formula::RefEdit ScRefEdit; //-->Added by PengYunQuan for Validity Cell Range Picker class ScFormulaReferenceHelper { @@ -65,7 +65,7 @@ class ScFormulaReferenceHelper formula::RefButton* pRefBtn; // Button dazu Window* m_pWindow; SfxBindings* m_pBindings; - ::std::auto_ptr<Accelerator> + ::std::auto_ptr<Accelerator> pAccel; // fuer Enter/Escape BOOL* pHiddenMarks; // Merkfeld fuer versteckte Controls SCTAB nRefTab; // used for ShowReference @@ -79,9 +79,9 @@ class ScFormulaReferenceHelper BOOL bEnableColorRef; BOOL bHighLightRef; BOOL bAccInserted; - + DECL_LINK( AccelSelectHdl, Accelerator* ); - + public: ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings); ~ScFormulaReferenceHelper(); @@ -107,10 +107,10 @@ public: static void enableInput(BOOL _bInput); //<!--Added by PengYunQuan for Validity Cell Range Picker protected: - Window * GetWindow(){ return m_pWindow; } + Window * GetWindow(){ return m_pWindow; } public: - bool CanInputStart( const ScRefEdit *pEdit ){ return !!pEdit; } - bool CanInputDone( BOOL bForced ){ return pRefEdit && (bForced || !pRefBtn); } + bool CanInputStart( const ScRefEdit *pEdit ){ return !!pEdit; } + bool CanInputDone( BOOL bForced ){ return pRefEdit && (bForced || !pRefBtn); } //<!--Added by PengYunQuan for Validity Cell Range Picker }; //============================================================================ @@ -120,27 +120,27 @@ class SC_DLLPUBLIC ScRefHandler : //public SfxModelessDialog, public IAnyRefDialog { //<!--Added by PengYunQuan for Validity Cell Range Picker - Window & m_rWindow; - bool m_bInRefMode; + Window & m_rWindow; + bool m_bInRefMode; public: - operator Window *(){ return &m_rWindow; } - Window * operator ->() { return static_cast<Window *>(*this); } + operator Window *(){ return &m_rWindow; } + Window * operator ->() { return static_cast<Window *>(*this); } template<class,bool> friend class ScRefHdlrImplBase; //-->Added by PengYunQuan for Validity Cell Range Picker friend class formula::RefButton; friend class formula::RefEdit; private: - ScFormulaReferenceHelper + ScFormulaReferenceHelper m_aHelper; SfxBindings* pMyBindings; - + Window* pActiveWin; Timer aTimer; String aDocName; // document on which the dialog was opened DECL_LINK( UpdateFocusHdl, Timer* ); - + protected: virtual BOOL DoClose( USHORT nId ); @@ -188,8 +188,8 @@ public: public: bool EnterRefMode(); bool LeaveRefMode(); - inline bool CanInputStart( const ScRefEdit *pEdit ); - inline bool CanInputDone( BOOL bForced ); + inline bool CanInputStart( const ScRefEdit *pEdit ); + inline bool CanInputDone( BOOL bForced ); //-->Added by PengYunQuan for Validity Cell Range Picker }; @@ -260,7 +260,7 @@ inline bool ScRefHandler::CanInputStart( const ScRefEdit *pEdit ) return m_aHelper.CanInputStart( pEdit ); } -inline bool ScRefHandler::CanInputDone( BOOL bForced ) +inline bool ScRefHandler::CanInputDone( BOOL bForced ) { return m_aHelper.CanInputDone( bForced ); } diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index c1ba5b4726a0..ae566e01c0a9 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.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 @@ -40,24 +40,24 @@ class ScAreaLink; class ScAreaLinkSaver : public ScDataObject { private: - String aFileName; - String aFilterName; - String aOptions; - String aSourceArea; - ScRange aDestArea; + String aFileName; + String aFilterName; + String aOptions; + String aSourceArea; + ScRange aDestArea; ULONG nRefresh; public: ScAreaLinkSaver( const ScAreaLink& rSource ); ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ); - virtual ~ScAreaLinkSaver(); + virtual ~ScAreaLinkSaver(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - BOOL IsEqual( const ScAreaLink& rCompare ) const; - BOOL IsEqualSource( const ScAreaLink& rCompare ) const; + BOOL IsEqual( const ScAreaLink& rCompare ) const; + BOOL IsEqualSource( const ScAreaLink& rCompare ) const; - void WriteToLink( ScAreaLink& rLink ) const; + void WriteToLink( ScAreaLink& rLink ) const; void InsertNewLink( ScDocument* pDoc ) const; }; @@ -67,14 +67,14 @@ class ScAreaLinkSaveCollection : public ScCollection public: ScAreaLinkSaveCollection(); ScAreaLinkSaveCollection( const ScAreaLinkSaveCollection& rCopy ); - virtual ~ScAreaLinkSaveCollection(); + virtual ~ScAreaLinkSaveCollection(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - ScAreaLinkSaver* operator[](USHORT nIndex) const {return (ScAreaLinkSaver*)At(nIndex);} + ScAreaLinkSaver* operator[](USHORT nIndex) const {return (ScAreaLinkSaver*)At(nIndex);} - BOOL IsEqual( const ScDocument* pDoc ) const; - void Restore( ScDocument* pDoc ) const; + BOOL IsEqual( const ScDocument* pDoc ) const; + void Restore( ScDocument* pDoc ) const; // returns NULL if empty static ScAreaLinkSaveCollection* CreateFromDoc( const ScDocument* pDoc ); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index ed579ea065b7..8f59accfe44f 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.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 @@ -49,40 +49,40 @@ public: ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ); ~ScPrintAreasDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual void AddRefEntry(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void AddRefEntry(); - virtual BOOL IsTableLocked() const; + virtual BOOL IsTableLocked() const; - virtual void SetActive(); - virtual void Deactivate(); - virtual BOOL Close(); + virtual void SetActive(); + virtual void Deactivate(); + virtual BOOL Close(); private: - ListBox aLbPrintArea; + ListBox aLbPrintArea; FixedLine aFlPrintArea; - formula::RefEdit aEdPrintArea; - formula::RefButton aRbPrintArea; + formula::RefEdit aEdPrintArea; + formula::RefButton aRbPrintArea; - ListBox aLbRepeatRow; + ListBox aLbRepeatRow; FixedLine aFlRepeatRow; - formula::RefEdit aEdRepeatRow; - formula::RefButton aRbRepeatRow; + formula::RefEdit aEdRepeatRow; + formula::RefButton aRbRepeatRow; - ListBox aLbRepeatCol; + ListBox aLbRepeatCol; FixedLine aFlRepeatCol; - formula::RefEdit aEdRepeatCol; - formula::RefButton aRbRepeatCol; + formula::RefEdit aEdRepeatCol; + formula::RefButton aRbRepeatCol; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - BOOL bDlgLostFocus; - formula::RefEdit* pRefInputEdit; - ScDocument* pDoc; - ScViewData* pViewData; - SCTAB nCurTab; + BOOL bDlgLostFocus; + formula::RefEdit* pRefInputEdit; + ScDocument* pDoc; + ScViewData* pViewData; + SCTAB nCurTab; #ifdef _AREASDLG_CXX private: @@ -92,10 +92,10 @@ private: BOOL Impl_GetItem( Edit* pEd, SfxStringItem& rItem ); // Handler: - DECL_LINK( Impl_SelectHdl, ListBox* ); - DECL_LINK( Impl_ModifyHdl, formula::RefEdit* ); - DECL_LINK( Impl_BtnHdl, PushButton* ); - DECL_LINK( Impl_GetFocusHdl, Control* ); + DECL_LINK( Impl_SelectHdl, ListBox* ); + DECL_LINK( Impl_ModifyHdl, formula::RefEdit* ); + DECL_LINK( Impl_BtnHdl, PushButton* ); + DECL_LINK( Impl_GetFocusHdl, Control* ); #endif }; diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index 7581f7f8d072..a65a2c6edd18 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.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 @@ -48,17 +48,17 @@ class SC_DLLPUBLIC ScAsciiOptions { private: - BOOL bFixedLen; - String aFieldSeps; - BOOL bMergeFieldSeps; + BOOL bFixedLen; + String aFieldSeps; + BOOL bMergeFieldSeps; bool bQuotedFieldAsText; bool bDetectSpecialNumber; - sal_Unicode cTextSep; - CharSet eCharSet; + sal_Unicode cTextSep; + CharSet eCharSet; LanguageType eLang; - BOOL bCharSetSystem; - long nStartRow; - USHORT nInfoCount; + BOOL bCharSetSystem; + long nStartRow; + USHORT nInfoCount; xub_StrLen* pColStart; //! TODO replace with vector BYTE* pColFormat; //! TODO replace with vector @@ -69,41 +69,41 @@ public: static const sal_Unicode cDefaultTextSep = '"'; - ScAsciiOptions& operator=( const ScAsciiOptions& rCpy ); + ScAsciiOptions& operator=( const ScAsciiOptions& rCpy ); - BOOL operator==( const ScAsciiOptions& rCmp ) const; + BOOL operator==( const ScAsciiOptions& rCmp ) const; - void ReadFromString( const String& rString ); - String WriteToString() const; + void ReadFromString( const String& rString ); + String WriteToString() const; - void InterpretColumnList( const String& rString ); + void InterpretColumnList( const String& rString ); - CharSet GetCharSet() const { return eCharSet; } - BOOL GetCharSetSystem() const { return bCharSetSystem; } - const String& GetFieldSeps() const { return aFieldSeps; } - BOOL IsMergeSeps() const { return bMergeFieldSeps; } + CharSet GetCharSet() const { return eCharSet; } + BOOL GetCharSetSystem() const { return bCharSetSystem; } + const String& GetFieldSeps() const { return aFieldSeps; } + BOOL IsMergeSeps() const { return bMergeFieldSeps; } bool IsQuotedAsText() const { return bQuotedFieldAsText; } bool IsDetectSpecialNumber() const { return bDetectSpecialNumber; } - sal_Unicode GetTextSep() const { return cTextSep; } - BOOL IsFixedLen() const { return bFixedLen; } - USHORT GetInfoCount() const { return nInfoCount; } - const xub_StrLen* GetColStart() const { return pColStart; } - const BYTE* GetColFormat() const { return pColFormat; } - long GetStartRow() const { return nStartRow; } + sal_Unicode GetTextSep() const { return cTextSep; } + BOOL IsFixedLen() const { return bFixedLen; } + USHORT GetInfoCount() const { return nInfoCount; } + const xub_StrLen* GetColStart() const { return pColStart; } + const BYTE* GetColFormat() const { return pColFormat; } + long GetStartRow() const { return nStartRow; } LanguageType GetLanguage() const { return eLang; } - void SetCharSet( CharSet eNew ) { eCharSet = eNew; } - void SetCharSetSystem( BOOL bSet ) { bCharSetSystem = bSet; } - void SetFixedLen( BOOL bSet ) { bFixedLen = bSet; } - void SetFieldSeps( const String& rStr ) { aFieldSeps = rStr; } - void SetMergeSeps( BOOL bSet ) { bMergeFieldSeps = bSet; } + void SetCharSet( CharSet eNew ) { eCharSet = eNew; } + void SetCharSetSystem( BOOL bSet ) { bCharSetSystem = bSet; } + void SetFixedLen( BOOL bSet ) { bFixedLen = bSet; } + void SetFieldSeps( const String& rStr ) { aFieldSeps = rStr; } + void SetMergeSeps( BOOL bSet ) { bMergeFieldSeps = bSet; } void SetQuotedAsText(bool bSet) { bQuotedFieldAsText = bSet; } void SetDetectSpecialNumber(bool bSet) { bDetectSpecialNumber = bSet; } - void SetTextSep( sal_Unicode c ) { cTextSep = c; } - void SetStartRow( long nRow) { nStartRow= nRow; } + void SetTextSep( sal_Unicode c ) { cTextSep = c; } + void SetStartRow( long nRow) { nStartRow= nRow; } void SetLanguage(LanguageType e) { eLang = e; } - void SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat ); + void SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat ); void SetColumnInfo( const ScCsvExpDataVec& rDataVec ); }; diff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrc index f43c1cb30b86..5a2cb3af502c 100644 --- a/sc/source/ui/inc/attrdlg.hrc +++ b/sc/source/ui/inc/attrdlg.hrc @@ -1,7 +1,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 @@ -25,23 +25,23 @@ * ************************************************************************/ -#include "sc.hrc" // -> SC_DLG_ATTR +#include "sc.hrc" // -> SC_DLG_ATTR -#define TP_NUMBER 1 -#define TP_FONT 2 -#define TP_ALIGNMENT 3 -#define TP_BORDER 4 -#define TP_BACKGROUND 5 -#define TP_PROTECTION 6 -#define TP_FONTEFF 7 -#define TP_ASIAN 8 +#define TP_NUMBER 1 +#define TP_FONT 2 +#define TP_ALIGNMENT 3 +#define TP_BORDER 4 +#define TP_BACKGROUND 5 +#define TP_PROTECTION 6 +#define TP_FONTEFF 7 +#define TP_ASIAN 8 //================================================ // Zellschutz-TabPage: -#define BTN_PROTECTED 1 -#define BTN_HIDE_FORMULAR 2 -#define BTN_HIDE_ALL 3 +#define BTN_PROTECTED 1 +#define BTN_HIDE_FORMULAR 2 +#define BTN_HIDE_ALL 3 #define FT_HINT 4 #define FL_PROTECTION 5 #define BTN_HIDE_PRINT 6 diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 07a2ed16726e..10870234fb1b 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.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 @@ -49,13 +49,13 @@ class SfxItemSet; class ScAttrDlg : public SfxTabDialog { public: - ScAttrDlg( SfxViewFrame* pFrame, - Window* pParent, + ScAttrDlg( SfxViewFrame* pFrame, + Window* pParent, const SfxItemSet* pCellAttrs ); ~ScAttrDlg(); protected: - virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); + virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); private: DECL_LINK( OkHandler, void* ); // fuer DoppelClick-Beenden in TabPages diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx index 20d9702aeefa..2d5e9adb23cb 100644 --- a/sc/source/ui/inc/auditsh.hxx +++ b/sc/source/ui/inc/auditsh.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 @@ -39,8 +39,8 @@ class ScViewData; class ScAuditingShell : public SfxShell { private: - ScViewData* pViewData; - USHORT nFunction; + ScViewData* pViewData; + USHORT nFunction; public: TYPEINFO(); @@ -49,8 +49,8 @@ public: ScAuditingShell(ScViewData* pData); ~ScAuditingShell(); - void Execute(SfxRequest& rReq); - void GetState(SfxItemSet& rSet); + void Execute(SfxRequest& rReq); + void GetState(SfxItemSet& rSet); }; diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index d8952ee2cbf6..786c0fcadf2e 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.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 @@ -88,11 +88,11 @@ private: const String aStrSum; SvNumberFormatter* pNumFmt; //------------------------------------------- - SC_DLLPRIVATE void Init (); - SC_DLLPRIVATE void DoPaint ( const Rectangle& rRect ); - SC_DLLPRIVATE void CalcCellArray ( BOOL bFitWidth ); - SC_DLLPRIVATE void CalcLineMap (); - SC_DLLPRIVATE void PaintCells (); + SC_DLLPRIVATE void Init (); + SC_DLLPRIVATE void DoPaint ( const Rectangle& rRect ); + SC_DLLPRIVATE void CalcCellArray ( BOOL bFitWidth ); + SC_DLLPRIVATE void CalcLineMap (); + SC_DLLPRIVATE void PaintCells (); /* Usage of type size_t instead of SCCOL/SCROW is correct here - used in conjunction with class svx::frame::Array (svx/framelinkarray.hxx), which @@ -111,28 +111,28 @@ private: Font& rCJKFont, Font& rCTLFont ); - SC_DLLPRIVATE String MakeNumberString( String cellString, BOOL bAddDec ); - SC_DLLPRIVATE void DrawFrameLine ( const SvxBorderLine& rLineD, - Point from, - Point to, - BOOL bHorizontal, - const SvxBorderLine& rLineLT, - const SvxBorderLine& rLineL, - const SvxBorderLine& rLineLB, - const SvxBorderLine& rLineRT, - const SvxBorderLine& rLineR, - const SvxBorderLine& rLineRB ); - SC_DLLPRIVATE void CheckPriority ( USHORT nCurLine, - AutoFmtLine eLine, - SvxBorderLine& rLine ); - SC_DLLPRIVATE void GetLines ( USHORT nIndex, AutoFmtLine eLine, - SvxBorderLine& rLineD, - SvxBorderLine& rLineLT, - SvxBorderLine& rLineL, - SvxBorderLine& rLineLB, - SvxBorderLine& rLineRT, - SvxBorderLine& rLineR, - SvxBorderLine& rLineRB ); + SC_DLLPRIVATE String MakeNumberString( String cellString, BOOL bAddDec ); + SC_DLLPRIVATE void DrawFrameLine ( const SvxBorderLine& rLineD, + Point from, + Point to, + BOOL bHorizontal, + const SvxBorderLine& rLineLT, + const SvxBorderLine& rLineL, + const SvxBorderLine& rLineLB, + const SvxBorderLine& rLineRT, + const SvxBorderLine& rLineR, + const SvxBorderLine& rLineRB ); + SC_DLLPRIVATE void CheckPriority ( USHORT nCurLine, + AutoFmtLine eLine, + SvxBorderLine& rLine ); + SC_DLLPRIVATE void GetLines ( USHORT nIndex, AutoFmtLine eLine, + SvxBorderLine& rLineD, + SvxBorderLine& rLineLT, + SvxBorderLine& rLineL, + SvxBorderLine& rLineLB, + SvxBorderLine& rLineRT, + SvxBorderLine& rLineR, + SvxBorderLine& rLineRB ); }; #endif // SC_AUTOFMT_HXX diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index 859db2129a27..38345d1cbb5b 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.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 @@ -39,16 +39,16 @@ class ScRange; class ScAutoStyleList { private: - ScDocShell* pDocSh; - Timer aTimer; - Timer aInitTimer; - ULONG nTimerStart; - List aEntries; - List aInitials; + ScDocShell* pDocSh; + Timer aTimer; + Timer aInitTimer; + ULONG nTimerStart; + List aEntries; + List aInitials; - void ExecuteEntries(); - void AdjustEntries(ULONG nDiff); - void StartTimer(ULONG nNow); + void ExecuteEntries(); + void AdjustEntries(ULONG nDiff); + void StartTimer(ULONG nNow); DECL_LINK( TimerHdl, Timer* ); DECL_LINK( InitHdl, Timer* ); @@ -56,11 +56,11 @@ public: ScAutoStyleList(ScDocShell* pShell); ~ScAutoStyleList(); - void AddInitial( const ScRange& rRange, const String& rStyle1, + void AddInitial( const ScRange& rRange, const String& rStyle1, ULONG nTimeout, const String& rStyle2 ); - void AddEntry( ULONG nTimeout, const ScRange& rRange, const String& rStyle ); + void AddEntry( ULONG nTimeout, const ScRange& rRange, const String& rStyle ); - void ExecuteAllNow(); + void ExecuteAllNow(); }; diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx index b74fec6276ae..bdfd0b9de257 100644 --- a/sc/source/ui/inc/cbutton.hxx +++ b/sc/source/ui/inc/cbutton.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 @@ -47,36 +47,36 @@ public: void SetOutputDevice( OutputDevice* pOutputDevice ); - void Draw( const Point& rAt, - const Size& rSize, + void Draw( const Point& rAt, + const Size& rSize, BOOL bState, - BOOL bBtnIn = FALSE ); + BOOL bBtnIn = FALSE ); - void Draw( const Point& rAt, + void Draw( const Point& rAt, BOOL bState, - BOOL bBtnIn = FALSE ) + BOOL bBtnIn = FALSE ) { Draw( rAt, aBtnSize, bState, bBtnIn ); } void Draw( BOOL bState, BOOL bBtnIn = FALSE ) { Draw( aBtnPos, aBtnSize, bState, bBtnIn ); } - void SetOptSizePixel(); + void SetOptSizePixel(); - void SetPosPixel( const Point& rNewPos ) { aBtnPos = rNewPos; } - Point GetPosPixel() const { return aBtnPos; } + void SetPosPixel( const Point& rNewPos ) { aBtnPos = rNewPos; } + Point GetPosPixel() const { return aBtnPos; } - void SetSizePixel( const Size& rNewSize ) { aBtnSize = rNewSize; } - Size GetSizePixel() const { return aBtnSize; } + void SetSizePixel( const Size& rNewSize ) { aBtnSize = rNewSize; } + Size GetSizePixel() const { return aBtnSize; } private: - void ImpDrawArrow( const Rectangle& rRect, + void ImpDrawArrow( const Rectangle& rRect, BOOL bState ); protected: OutputDevice* pOut; - Point aBtnPos; - Size aBtnSize; + Point aBtnPos; + Size aBtnSize; }; diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index b5ab5d9abe06..7405692d95be 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.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 @@ -61,7 +61,7 @@ private: CellShell_Impl* pImpl; BOOL bPastePossible; - void GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ); + void GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ); void ExecuteExternalSource( const String& _rFile, const String& _rFilter, const String& _rOptions, const String& _rSource, ULONG _nRefresh, SfxRequest& _rRequest ); @@ -75,32 +75,32 @@ public: SFX_DECL_INTERFACE(SCID_CELL_SHELL) ScCellShell(ScViewData* pData); - virtual ~ScCellShell(); + virtual ~ScCellShell(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); - void ExecuteEdit( SfxRequest& rReq ); - void ExecuteTrans( SfxRequest& rReq ); + void ExecuteEdit( SfxRequest& rReq ); + void ExecuteTrans( SfxRequest& rReq ); - void GetBlockState( SfxItemSet& rSet ); - void GetCellState( SfxItemSet& rSet ); + void GetBlockState( SfxItemSet& rSet ); + void GetCellState( SfxItemSet& rSet ); - void ExecuteDB( SfxRequest& rReq ); - void GetDBState( SfxItemSet& rSet ); + void ExecuteDB( SfxRequest& rReq ); + void GetDBState( SfxItemSet& rSet ); - void ExecImageMap(SfxRequest& rReq); // ImageMap - void GetImageMapState(SfxItemSet& rSet); + void ExecImageMap(SfxRequest& rReq); // ImageMap + void GetImageMapState(SfxItemSet& rSet); - void GetClipState( SfxItemSet& rSet ); - void GetHLinkState( SfxItemSet& rSet ); + void GetClipState( SfxItemSet& rSet ); + void GetHLinkState( SfxItemSet& rSet ); - void ExecuteCursor( SfxRequest& rReq ); - void ExecuteCursorSel( SfxRequest& rReq ); - void ExecutePage( SfxRequest& rReq ); - void ExecutePageSel( SfxRequest& rReq ); - void ExecuteMove( SfxRequest& rReq ); - void GetStateCursor( SfxItemSet& rSet ); + void ExecuteCursor( SfxRequest& rReq ); + void ExecuteCursorSel( SfxRequest& rReq ); + void ExecutePage( SfxRequest& rReq ); + void ExecutePageSel( SfxRequest& rReq ); + void ExecuteMove( SfxRequest& rReq ); + void GetStateCursor( SfxItemSet& rSet ); static void PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog ); }; diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx index 0e09211ce346..5ede144c3c9f 100644 --- a/sc/source/ui/inc/chartsh.hxx +++ b/sc/source/ui/inc/chartsh.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 @@ -46,7 +46,7 @@ public: SFX_DECL_INTERFACE(SCID_CHART_SHELL) ScChartShell(ScViewData* pData); - virtual ~ScChartShell(); + virtual ~ScChartShell(); }; diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index ac39d6d386b5..da5f7db3b2f6 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.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 @@ -40,21 +40,21 @@ class SdrModel; class ScClient : public SfxInPlaceClient { private: - SdrModel* pModel; - SdrGrafObj* pGrafEdit; + SdrModel* pModel; + SdrGrafObj* pGrafEdit; virtual void ObjectAreaChanged(); virtual void RequestNewObjectArea( Rectangle& ); virtual void ViewChanged(); - virtual void MakeVisible(); + virtual void MakeVisible(); public: ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); - virtual ~ScClient(); + virtual ~ScClient(); - SdrGrafObj* GetGrafEdit() const { return pGrafEdit; } - void SetGrafEdit(SdrGrafObj* pNew) { pGrafEdit = pNew; } - SdrOle2Obj* GetDrawObj(); + SdrGrafObj* GetGrafEdit() const { return pGrafEdit; } + void SetGrafEdit(SdrGrafObj* pNew) { pGrafEdit = pNew; } + SdrOle2Obj* GetDrawObj(); }; diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index b4e1ba481ca0..b46bccbaffc8 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.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 @@ -40,9 +40,9 @@ class ScHeaderSelectionEngine; class ScColBar : public ScHeaderControl { - ScViewData* pViewData; - ScHSplitPos eWhich; - ScHeaderFunctionSet* pFuncSet; + ScViewData* pViewData; + ScHSplitPos eWhich; + ScHeaderFunctionSet* pFuncSet; ScHeaderSelectionEngine* pSelEngine; public: @@ -50,33 +50,33 @@ public: ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); ~ScColBar(); - virtual SCCOLROW GetPos(); - virtual USHORT GetEntrySize( SCCOLROW nEntryNo ); - virtual String GetEntryText( SCCOLROW nEntryNo ); + virtual SCCOLROW GetPos(); + virtual USHORT GetEntrySize( SCCOLROW nEntryNo ); + virtual String GetEntryText( SCCOLROW nEntryNo ); - virtual BOOL IsLayoutRTL(); // only for columns + virtual BOOL IsLayoutRTL(); // only for columns - virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize ); - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); + virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize ); + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); - virtual void SetMarking( BOOL bSet ); - virtual void SelectWindow(); - virtual BOOL IsDisabled(); - virtual BOOL ResizeAllowed(); + virtual void SetMarking( BOOL bSet ); + virtual void SelectWindow(); + virtual BOOL IsDisabled(); + virtual BOOL ResizeAllowed(); - virtual void DrawInvert( long nDragPos ); + virtual void DrawInvert( long nDragPos ); - virtual String GetDragHelp( long nVal ); + virtual String GetDragHelp( long nVal ); - BOOL UseNumericHeader() const; + BOOL UseNumericHeader() const; }; class ScRowBar : public ScHeaderControl { - ScViewData* pViewData; - ScVSplitPos eWhich; - ScHeaderFunctionSet* pFuncSet; + ScViewData* pViewData; + ScVSplitPos eWhich; + ScHeaderFunctionSet* pFuncSet; ScHeaderSelectionEngine* pSelEngine; public: @@ -84,24 +84,24 @@ public: ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); ~ScRowBar(); - virtual SCCOLROW GetPos(); - virtual USHORT GetEntrySize( SCCOLROW nEntryNo ); - virtual String GetEntryText( SCCOLROW nEntryNo ); + virtual SCCOLROW GetPos(); + virtual USHORT GetEntrySize( SCCOLROW nEntryNo ); + virtual String GetEntryText( SCCOLROW nEntryNo ); - virtual BOOL IsMirrored(); // only for columns - virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns + virtual BOOL IsMirrored(); // only for columns + virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns - virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize ); - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); + virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize ); + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); - virtual void SetMarking( BOOL bSet ); - virtual void SelectWindow(); - virtual BOOL IsDisabled(); - virtual BOOL ResizeAllowed(); + virtual void SetMarking( BOOL bSet ); + virtual void SelectWindow(); + virtual BOOL IsDisabled(); + virtual BOOL ResizeAllowed(); - virtual void DrawInvert( long nDragPos ); + virtual void DrawInvert( long nDragPos ); - virtual String GetDragHelp( long nVal ); + virtual String GetDragHelp( long nVal ); }; diff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrc index 099d82b2fa85..67d587cf8ec9 100644 --- a/sc/source/ui/inc/condfrmt.hrc +++ b/sc/source/ui/inc/condfrmt.hrc @@ -1,7 +1,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 @@ -27,45 +27,45 @@ #include "sc.hrc" // ->RID_SCDLG_SOLVER -#define CBX_COND1 1 -#define LB_COND1_1 2 -#define LB_COND1_2 3 -#define EDT_COND1_1 4 -#define RB_COND1_1 5 -#define FT_COND1_AND 6 -#define EDT_COND1_2 7 -#define RB_COND1_2 8 -#define FT_COND1_TEMPLATE 9 -#define LB_COND1_TEMPLATE 10 +#define CBX_COND1 1 +#define LB_COND1_1 2 +#define LB_COND1_2 3 +#define EDT_COND1_1 4 +#define RB_COND1_1 5 +#define FT_COND1_AND 6 +#define EDT_COND1_2 7 +#define RB_COND1_2 8 +#define FT_COND1_TEMPLATE 9 +#define LB_COND1_TEMPLATE 10 -#define CBX_COND2 11 -#define LB_COND2_1 12 -#define LB_COND2_2 13 -#define EDT_COND2_1 14 -#define RB_COND2_1 15 -#define FT_COND2_AND 16 -#define EDT_COND2_2 17 -#define RB_COND2_2 18 -#define FT_COND2_TEMPLATE 19 -#define LB_COND2_TEMPLATE 20 +#define CBX_COND2 11 +#define LB_COND2_1 12 +#define LB_COND2_2 13 +#define EDT_COND2_1 14 +#define RB_COND2_1 15 +#define FT_COND2_AND 16 +#define EDT_COND2_2 17 +#define RB_COND2_2 18 +#define FT_COND2_TEMPLATE 19 +#define LB_COND2_TEMPLATE 20 -#define CBX_COND3 21 -#define LB_COND3_1 22 -#define LB_COND3_2 23 -#define EDT_COND3_1 24 -#define RB_COND3_1 25 -#define FT_COND3_AND 26 -#define EDT_COND3_2 27 -#define RB_COND3_2 28 -#define FT_COND3_TEMPLATE 29 -#define LB_COND3_TEMPLATE 30 +#define CBX_COND3 21 +#define LB_COND3_1 22 +#define LB_COND3_2 23 +#define EDT_COND3_1 24 +#define RB_COND3_1 25 +#define FT_COND3_AND 26 +#define EDT_COND3_2 27 +#define RB_COND3_2 28 +#define FT_COND3_TEMPLATE 29 +#define LB_COND3_TEMPLATE 30 #define FL_SEP1 41 #define FL_SEP2 42 #define BTN_OK 31 -#define BTN_CANCEL 32 -#define BTN_HELP 33 +#define BTN_CANCEL 32 +#define BTN_HELP 33 #define BTN_COND1_NEW 34 #define BTN_COND2_NEW 35 diff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxx index 1cb7b8cc83b0..9b9d4ec980ed 100644 --- a/sc/source/ui/inc/condfrmt.hxx +++ b/sc/source/ui/inc/condfrmt.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 @@ -40,7 +40,7 @@ class ScConditionalFormat; //============================================================================ -// class ScConditionalFormat +// class ScConditionalFormat // // Dialog zum Festlegen von bedingten Formaten @@ -52,85 +52,85 @@ public: const ScConditionalFormat* pCurrentFormat ); ~ScConditionalFormatDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual void AddRefEntry(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void AddRefEntry(); virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual void SetActive(); + virtual BOOL Close(); private: - CheckBox aCbxCond1; - ListBox aLbCond11; - ListBox aLbCond12; - formula::RefEdit aEdtCond11; - formula::RefButton aRbCond11; - FixedText aFtCond1And; - formula::RefEdit aEdtCond12; - formula::RefButton aRbCond12; - FixedText aFtCond1Template; - ListBox aLbCond1Template; + CheckBox aCbxCond1; + ListBox aLbCond11; + ListBox aLbCond12; + formula::RefEdit aEdtCond11; + formula::RefButton aRbCond11; + FixedText aFtCond1And; + formula::RefEdit aEdtCond12; + formula::RefButton aRbCond12; + FixedText aFtCond1Template; + ListBox aLbCond1Template; PushButton aBtnNew1; FixedLine aFlSep1; CheckBox aCbxCond2; - ListBox aLbCond21; - ListBox aLbCond22; - formula::RefEdit aEdtCond21; - formula::RefButton aRbCond21; - FixedText aFtCond2And; - formula::RefEdit aEdtCond22; - formula::RefButton aRbCond22; - FixedText aFtCond2Template; - ListBox aLbCond2Template; + ListBox aLbCond21; + ListBox aLbCond22; + formula::RefEdit aEdtCond21; + formula::RefButton aRbCond21; + FixedText aFtCond2And; + formula::RefEdit aEdtCond22; + formula::RefButton aRbCond22; + FixedText aFtCond2Template; + ListBox aLbCond2Template; PushButton aBtnNew2; FixedLine aFlSep2; - CheckBox aCbxCond3; - ListBox aLbCond31; - ListBox aLbCond32; - formula::RefEdit aEdtCond31; - formula::RefButton aRbCond31; - FixedText aFtCond3And; - formula::RefEdit aEdtCond32; - formula::RefButton aRbCond32; - FixedText aFtCond3Template; - ListBox aLbCond3Template; + CheckBox aCbxCond3; + ListBox aLbCond31; + ListBox aLbCond32; + formula::RefEdit aEdtCond31; + formula::RefButton aRbCond31; + FixedText aFtCond3And; + formula::RefEdit aEdtCond32; + formula::RefButton aRbCond32; + FixedText aFtCond3Template; + ListBox aLbCond3Template; PushButton aBtnNew3; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - Point aCond1Pos1; - Point aCond1Pos2; - Point aRBtn1Pos1; - Point aRBtn1Pos2; - Size aCond1Size1; - Size aCond1Size2; - Size aCond1Size3; - - Point aCond2Pos1; - Point aCond2Pos2; - Point aRBtn2Pos1; - Point aRBtn2Pos2; - Size aCond2Size1; - Size aCond2Size2; - Size aCond2Size3; - - Point aCond3Pos1; - Point aCond3Pos2; - Point aRBtn3Pos1; - Point aRBtn3Pos2; - Size aCond3Size1; - Size aCond3Size2; - Size aCond3Size3; - - formula::RefEdit* pEdActive; - BOOL bDlgLostFocus; - ScDocument* pDoc; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + Point aCond1Pos1; + Point aCond1Pos2; + Point aRBtn1Pos1; + Point aRBtn1Pos2; + Size aCond1Size1; + Size aCond1Size2; + Size aCond1Size3; + + Point aCond2Pos1; + Point aCond2Pos2; + Point aRBtn2Pos1; + Point aRBtn2Pos2; + Size aCond2Size1; + Size aCond2Size2; + Size aCond2Size3; + + Point aCond3Pos1; + Point aCond3Pos2; + Point aRBtn3Pos1; + Point aRBtn3Pos2; + Size aCond3Size1; + Size aCond3Size2; + Size aCond3Size3; + + formula::RefEdit* pEdActive; + BOOL bDlgLostFocus; + ScDocument* pDoc; #ifdef _CONDFRMT_CXX - void GetConditionalFormat( ScConditionalFormat& rCndFmt ); + void GetConditionalFormat( ScConditionalFormat& rCndFmt ); DECL_LINK( ClickCond1Hdl, void * ); DECL_LINK( ChangeCond11Hdl, void * ); diff --git a/sc/source/ui/inc/conflictsdlg.hrc b/sc/source/ui/inc/conflictsdlg.hrc index 7935a6ee21d7..cfd864d5ec0a 100644 --- a/sc/source/ui/inc/conflictsdlg.hrc +++ b/sc/source/ui/inc/conflictsdlg.hrc @@ -1,7 +1,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/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index d7ba96ab526a..86e11e232c63 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.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/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index d90a871e8c36..128b8b23f82b 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.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 @@ -48,78 +48,78 @@ class ScConsolidateDlg : public ScAnyRefDlg { public: ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet& rArgSet ); ~ScConsolidateDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const { return TRUE; } - virtual void SetActive(); + virtual BOOL IsRefInputMode() const { return TRUE; } + virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL Close(); protected: - virtual void Deactivate(); + virtual void Deactivate(); private: - FixedText aFtFunc; - ListBox aLbFunc; + FixedText aFtFunc; + ListBox aLbFunc; - FixedText aFtConsAreas; - MultiListBox aLbConsAreas; + FixedText aFtConsAreas; + MultiListBox aLbConsAreas; - ListBox aLbDataArea; - FixedText aFtDataArea; - formula::RefEdit aEdDataArea; - formula::RefButton aRbDataArea; + ListBox aLbDataArea; + FixedText aFtDataArea; + formula::RefEdit aEdDataArea; + formula::RefButton aRbDataArea; - ListBox aLbDestArea; - FixedText aFtDestArea; - formula::RefEdit aEdDestArea; - formula::RefButton aRbDestArea; + ListBox aLbDestArea; + FixedText aFtDestArea; + formula::RefEdit aEdDestArea; + formula::RefButton aRbDestArea; FixedLine aFlConsBy; - CheckBox aBtnByRow; - CheckBox aBtnByCol; + CheckBox aBtnByRow; + CheckBox aBtnByCol; FixedLine aFlSep; FixedLine aFlOptions; - CheckBox aBtnRefs; + CheckBox aBtnRefs; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - MoreButton aBtnMore; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + MoreButton aBtnMore; - String aStrUndefined; + String aStrUndefined; - ScConsolidateParam theConsData; - ScViewData* pViewData; - ScDocument* pDoc; - ScRangeUtil* pRangeUtil; - ScAreaData* pAreaData; - USHORT nAreaDataCount; - USHORT nWhichCons; + ScConsolidateParam theConsData; + ScViewData* pViewData; + ScDocument* pDoc; + ScRangeUtil* pRangeUtil; + ScAreaData* pAreaData; + USHORT nAreaDataCount; + USHORT nWhichCons; - formula::RefEdit* pRefInputEdit; - BOOL bDlgLostFocus; + formula::RefEdit* pRefInputEdit; + BOOL bDlgLostFocus; #ifdef _CONSDLG_CXX private: - void Init (); - void FillAreaLists (); - BOOL VerifyEdit ( formula::RefEdit* pEd ); + void Init (); + void FillAreaLists (); + BOOL VerifyEdit ( formula::RefEdit* pEd ); - DECL_LINK( OkHdl, void* ); - DECL_LINK( ClickHdl, PushButton* ); + DECL_LINK( OkHdl, void* ); + DECL_LINK( ClickHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( ModifyHdl, formula::RefEdit* ); - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK( ModifyHdl, formula::RefEdit* ); + DECL_LINK( SelectHdl, ListBox* ); - ScSubTotalFunc LbPosToFunc( USHORT nPos ); - USHORT FuncToLbPos( ScSubTotalFunc eFunc ); + ScSubTotalFunc LbPosToFunc( USHORT nPos ); + USHORT FuncToLbPos( ScSubTotalFunc eFunc ); #endif // _CONSDLG_CXX }; diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 952215ffbdd6..15ef650afa59 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.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 @@ -40,61 +40,61 @@ class ScDocument; class ScDocShell; class ScAreaLink; -#define SC_CONTENT_ROOT 0 -#define SC_CONTENT_TABLE 1 -#define SC_CONTENT_RANGENAME 2 -#define SC_CONTENT_DBAREA 3 -#define SC_CONTENT_GRAPHIC 4 -#define SC_CONTENT_OLEOBJECT 5 -#define SC_CONTENT_NOTE 6 -#define SC_CONTENT_AREALINK 7 -#define SC_CONTENT_DRAWING 8 -#define SC_CONTENT_COUNT 9 +#define SC_CONTENT_ROOT 0 +#define SC_CONTENT_TABLE 1 +#define SC_CONTENT_RANGENAME 2 +#define SC_CONTENT_DBAREA 3 +#define SC_CONTENT_GRAPHIC 4 +#define SC_CONTENT_OLEOBJECT 5 +#define SC_CONTENT_NOTE 6 +#define SC_CONTENT_AREALINK 7 +#define SC_CONTENT_DRAWING 8 +#define SC_CONTENT_COUNT 9 const ULONG SC_CONTENT_NOCHILD = ~0UL; // -// TreeListBox fuer Inhalte +// TreeListBox fuer Inhalte // class ScContentTree : public SvTreeListBox { - ScNavigatorDlg* pParentWindow; - ImageList aEntryImages; - ImageList aHCEntryImages; - SvLBoxEntry* pRootNodes[SC_CONTENT_COUNT]; - USHORT nRootType; // als Root eingestellt - String aManualDoc; // im Navigator umgeschaltet (Title) - BOOL bHiddenDoc; // verstecktes aktiv? - String aHiddenName; // URL zum Laden - String aHiddenTitle; // fuer Anzeige - ScDocument* pHiddenDocument; // temporaer + ScNavigatorDlg* pParentWindow; + ImageList aEntryImages; + ImageList aHCEntryImages; + SvLBoxEntry* pRootNodes[SC_CONTENT_COUNT]; + USHORT nRootType; // als Root eingestellt + String aManualDoc; // im Navigator umgeschaltet (Title) + BOOL bHiddenDoc; // verstecktes aktiv? + String aHiddenName; // URL zum Laden + String aHiddenTitle; // fuer Anzeige + ScDocument* pHiddenDocument; // temporaer - USHORT pPosList[SC_CONTENT_COUNT]; // fuer die Reihenfolge + USHORT pPosList[SC_CONTENT_COUNT]; // fuer die Reihenfolge - static BOOL bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird + static BOOL bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird ScDocShell* GetManualOrCurrent(); - void InitRoot(USHORT nType); - void ClearType(USHORT nType); - void ClearAll(); - void InsertContent( USHORT nType, const String& rValue ); + void InitRoot(USHORT nType); + void ClearType(USHORT nType); + void ClearAll(); + void InsertContent( USHORT nType, const String& rValue ); void GetDrawNames( USHORT nType ); - void GetTableNames(); - void GetAreaNames(); - void GetDbNames(); - void GetLinkNames(); - void GetGraphicNames(); - void GetOleNames(); - void GetDrawingNames(); - void GetNoteStrings(); + void GetTableNames(); + void GetAreaNames(); + void GetDbNames(); + void GetLinkNames(); + void GetGraphicNames(); + void GetOleNames(); + void GetDrawingNames(); + void GetNoteStrings(); static bool IsPartOfType( USHORT nContentType, USHORT nObjIdentifier ); - BOOL DrawNamesChanged( USHORT nType ); - BOOL NoteStringsChanged(); + BOOL DrawNamesChanged( USHORT nType ); + BOOL NoteStringsChanged(); ScAddress GetNotePos( ULONG nIndex ); const ScAreaLink* GetLink( ULONG nIndex ); @@ -110,7 +110,7 @@ class ScContentTree : public SvTreeListBox @return Index of the entry inside its root or SC_CONTENT_NOCHILD if entry is root. */ ULONG GetChildIndex( SvLBoxEntry* pEntry ) const; - void DoDrag(); + void DoDrag(); ScDocument* GetSourceDocument(); @@ -118,18 +118,18 @@ class ScContentTree : public SvTreeListBox DECL_STATIC_LINK( ScContentTree, ExecDragHdl, void* ); protected: -// virtual BOOL Drop( const DropEvent& rEvt ); -// virtual BOOL QueryDrop( DropEvent& rEvt ); +// virtual BOOL Drop( const DropEvent& rEvt ); +// virtual BOOL QueryDrop( DropEvent& rEvt ); using SvTreeListBox::ExecuteDrop; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 nAction ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void DragFinished( sal_Int8 nAction ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); public: ScContentTree( Window* pParent, const ResId& rResId ); @@ -138,28 +138,28 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput( const KeyEvent& rKEvt ); - void InitWindowBits( BOOL bButtons ); + void InitWindowBits( BOOL bButtons ); void Refresh( USHORT nType = 0 ); - void ToggleRoot(); - void SetRootType( USHORT nNew ); - USHORT GetRootType() const { return nRootType; } + void ToggleRoot(); + void SetRootType( USHORT nNew ); + USHORT GetRootType() const { return nRootType; } - void ActiveDocChanged(); - void ResetManualDoc(); - void SetManualDoc(const String& rName); - BOOL LoadFile(const String& rUrl); - void SelectDoc(const String& rName); + void ActiveDocChanged(); + void ResetManualDoc(); + void SetManualDoc(const String& rName); + BOOL LoadFile(const String& rUrl); + void SelectDoc(const String& rName); - const String& GetHiddenTitle() const { return aHiddenTitle; } + const String& GetHiddenTitle() const { return aHiddenTitle; } /** Applies the navigator settings to the listbox. */ void ApplySettings(); /** Stores the current listbox state in the navigator settings. */ void StoreSettings() const; - static BOOL IsInDrag() { return bIsInDrag; } + static BOOL IsInDrag() { return bIsInDrag; } }; diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx index fcf692500351..33eb9c883d28 100644 --- a/sc/source/ui/inc/corodlg.hxx +++ b/sc/source/ui/inc/corodlg.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 @@ -46,9 +46,9 @@ public: BOOL bRow = FALSE ) : ModalDialog( pParent, ScResId( RID_SCDLG_CHARTCOLROW ) ), aFlColRow ( this, ScResId(6) ), - aBtnRow ( this, ScResId(2) ), - aBtnCol ( this, ScResId(1) ), - aBtnOk ( this, ScResId(3) ), + aBtnRow ( this, ScResId(2) ), + aBtnCol ( this, ScResId(1) ), + aBtnOk ( this, ScResId(3) ), aBtnCancel ( this, ScResId(4) ), aBtnHelp ( this, ScResId(5) ) { @@ -62,11 +62,11 @@ public: private: FixedLine aFlColRow; - CheckBox aBtnRow; - CheckBox aBtnCol; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + CheckBox aBtnRow; + CheckBox aBtnCol; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; }; diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index 544926756286..00ce4422ebae 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.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 @@ -40,19 +40,19 @@ class ScColOrRowDlg : public ModalDialog { public: - ScColOrRowDlg( Window* pParent, - const String& rStrTitle, - const String& rStrLabel, - BOOL bColDefault = TRUE ); + ScColOrRowDlg( Window* pParent, + const String& rStrTitle, + const String& rStrLabel, + BOOL bColDefault = TRUE ); ~ScColOrRowDlg(); private: FixedLine aFlFrame; - RadioButton aBtnRows; - RadioButton aBtnCols; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnRows; + RadioButton aBtnCols; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; DECL_LINK( OkHdl, OKButton * ); }; diff --git a/sc/source/ui/inc/crnrdlg.hrc b/sc/source/ui/inc/crnrdlg.hrc index 1d27531f9bc1..8e8de3fe32bd 100644 --- a/sc/source/ui/inc/crnrdlg.hrc +++ b/sc/source/ui/inc/crnrdlg.hrc @@ -1,7 +1,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 @@ -28,19 +28,19 @@ #include "sc.hrc" // -> RID_SCDLG_COLROWNAMERANGES #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_REMOVE 4 -#define BTN_HELP 5 +#define BTN_CANCEL 2 +#define BTN_ADD 3 +#define BTN_REMOVE 4 +#define BTN_HELP 5 // -#define LB_RANGE 11 +#define LB_RANGE 11 // #define FL_ASSIGN 12 -#define ED_AREA 13 -#define RB_AREA 14 -#define BTN_COLHEAD 15 -#define BTN_ROWHEAD 16 -#define ED_DATA 17 -#define RB_DATA 18 -#define FT_DATA_LABEL 19 +#define ED_AREA 13 +#define RB_AREA 14 +#define BTN_COLHEAD 15 +#define BTN_ROWHEAD 16 +#define ED_DATA 17 +#define RB_DATA 18 +#define FT_DATA_LABEL 19 // diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index bd0d974cd764..f09d05ed4c66 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.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 @@ -46,51 +46,51 @@ class ScColRowNameRangesDlg : public ScAnyRefDlg { public: ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ); + ScViewData* ptrViewData ); ~ScColRowNameRangesDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); + virtual BOOL Close(); private: FixedLine aFlAssign; - ListBox aLbRange; + ListBox aLbRange; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; - RadioButton aBtnColHead; - RadioButton aBtnRowHead; - FixedText aFtAssign2; - formula::RefEdit aEdAssign2; - formula::RefButton aRbAssign2; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; + RadioButton aBtnColHead; + RadioButton aBtnRowHead; + FixedText aFtAssign2; + formula::RefEdit aEdAssign2; + formula::RefButton aRbAssign2; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; - ScRange theCurArea; - ScRange theCurData; + ScRange theCurArea; + ScRange theCurData; - ScRangePairListRef xColNameRanges; - ScRangePairListRef xRowNameRanges; + ScRangePairListRef xColNameRanges; + ScRangePairListRef xRowNameRanges; typedef ::std::hash_map< String, ScRange, ScStringHashCode, ::std::equal_to<String> > NameRangeMap; NameRangeMap aRangeMap; - ScViewData* pViewData; - ScDocument* pDoc; - formula::RefEdit* pEdActive; - BOOL bDlgLostFocus; + ScViewData* pViewData; + ScDocument* pDoc; + formula::RefEdit* pEdActive; + BOOL bDlgLostFocus; #ifdef _CRNRDLG_CXX private: - void Init (); - void UpdateNames (); - void UpdateRangeData ( const ScRange& rRange, BOOL bColName ); + void Init (); + void UpdateNames (); + void UpdateRangeData ( const ScRange& rRange, BOOL bColName ); void SetColRowData( const ScRange& rLabelRange,BOOL bRef=FALSE); void AdjustColRowData( const ScRange& rDataRange,BOOL bRef=FALSE); DECL_LINK( CancelBtnHdl, void * ); diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 68a97150e8e4..e8fc6e51cd10 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.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/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index c5d5eb58649f..7b6e8d76e4bf 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.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/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index 3d2d01da8b0f..0ffd095ede86 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.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/inc/csvsplits.hxx b/sc/source/ui/inc/csvsplits.hxx index 42d38bcca803..7c7c48ea9db5 100644 --- a/sc/source/ui/inc/csvsplits.hxx +++ b/sc/source/ui/inc/csvsplits.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/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 7837c4519da2..b944bef0c909 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.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/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index 588ef43cf72a..5da8703ed08a 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.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 @@ -44,17 +44,17 @@ class ScDataPilotDatabaseDlg : public ModalDialog { private: FixedLine aFlFrame; - FixedText aFtDatabase; - ListBox aLbDatabase; - FixedText aFtObject; - ComboBox aCbObject; - FixedText aFtType; - ListBox aLbType; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtDatabase; + ListBox aLbDatabase; + FixedText aFtObject; + ComboBox aCbObject; + FixedText aFtType; + ListBox aLbType; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - void FillObjects(); + void FillObjects(); DECL_LINK( SelectHdl, ListBox* ); @@ -62,7 +62,7 @@ public: ScDataPilotDatabaseDlg( Window* pParent ); ~ScDataPilotDatabaseDlg(); - void GetValues( ScImportSourceDesc& rDesc ); + void GetValues( ScImportSourceDesc& rDesc ); }; diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 25b3453822e0..5d483cb560e9 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.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 @@ -42,19 +42,19 @@ class ScDataPilotSourceTypeDlg : public ModalDialog { private: FixedLine aFlFrame; - RadioButton aBtnSelection; - RadioButton aBtnDatabase; - RadioButton aBtnExternal; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnSelection; + RadioButton aBtnDatabase; + RadioButton aBtnExternal; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: ScDataPilotSourceTypeDlg( Window* pParent, BOOL bEnableExternal ); ~ScDataPilotSourceTypeDlg(); - BOOL IsDatabase() const; - BOOL IsExternal() const; + BOOL IsDatabase() const; + BOOL IsExternal() const; }; @@ -62,30 +62,30 @@ class ScDataPilotServiceDlg : public ModalDialog { private: FixedLine aFlFrame; - FixedText aFtService; - ListBox aLbService; - FixedText aFtSource; - Edit aEdSource; - FixedText aFtName; - Edit aEdName; - FixedText aFtUser; - Edit aEdUser; - FixedText aFtPasswd; - Edit aEdPasswd; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtService; + ListBox aLbService; + FixedText aFtSource; + Edit aEdSource; + FixedText aFtName; + Edit aEdName; + FixedText aFtUser; + Edit aEdUser; + FixedText aFtPasswd; + Edit aEdPasswd; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: ScDataPilotServiceDlg( Window* pParent, const com::sun::star::uno::Sequence<rtl::OUString>& rServices ); ~ScDataPilotServiceDlg(); - String GetServiceName() const; - String GetParSource() const; - String GetParName() const; - String GetParUser() const; - String GetParPass() const; + String GetServiceName() const; + String GetParSource() const; + String GetParName() const; + String GetParUser() const; + String GetParPass() const; }; diff --git a/sc/source/ui/inc/datafdlg.hrc b/sc/source/ui/inc/datafdlg.hrc index 577d6e000281..b32e0a9a267f 100644 --- a/sc/source/ui/inc/datafdlg.hrc +++ b/sc/source/ui/inc/datafdlg.hrc @@ -24,7 +24,7 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ -#include "sc.hrc" // -> RID_SCDLG_DATAFORM +#include "sc.hrc" // -> RID_SCDLG_DATAFORM //dataform #define BTN_DATAFORM_NEW 1001 diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index aad57b0502f1..97cc632e37ef 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.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 @@ -74,49 +74,49 @@ class ScDBDocFunc friend class ScDBFunc; private: - ScDocShell& rDocShell; + ScDocShell& rDocShell; public: ScDBDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {} ~ScDBDocFunc() {} - void UpdateImport( const String& rTarget, const String& rDBName, + void UpdateImport( const String& rTarget, const String& rDBName, const String& rTableName, const String& rStatement, BOOL bNative, BYTE nType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xResultSet, const SbaSelectionList* pSelection ); - BOOL DoImport( SCTAB nTab, const ScImportParam& rParam, + BOOL DoImport( SCTAB nTab, const ScImportParam& rParam, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xResultSet, const SbaSelectionList* pSelection, BOOL bRecord, BOOL bAddrInsert = FALSE ); - BOOL DoImportUno( const ScAddress& rPos, + BOOL DoImportUno( const ScAddress& rPos, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue>& aArgs ); - static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ); + static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ); - BOOL Sort( SCTAB nTab, const ScSortParam& rSortParam, + BOOL Sort( SCTAB nTab, const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint, BOOL bApi ); - SC_DLLPUBLIC BOOL Query( SCTAB nTab, const ScQueryParam& rQueryParam, + SC_DLLPUBLIC BOOL Query( SCTAB nTab, const ScQueryParam& rQueryParam, const ScRange* pAdvSource, BOOL bRecord, BOOL bApi ); - BOOL DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, + BOOL DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, const ScSortParam* pForceNewSort, BOOL bRecord, BOOL bApi ); - BOOL AddDBRange( const String& rName, const ScRange& rRange, BOOL bApi ); - BOOL DeleteDBRange( const String& rName, BOOL bApi ); - BOOL RenameDBRange( const String& rOld, const String& rNew, BOOL bApi ); - BOOL ModifyDBData( const ScDBData& rNewData, BOOL bApi ); // Name unveraendert + BOOL AddDBRange( const String& rName, const ScRange& rRange, BOOL bApi ); + BOOL DeleteDBRange( const String& rName, BOOL bApi ); + BOOL RenameDBRange( const String& rOld, const String& rNew, BOOL bApi ); + BOOL ModifyDBData( const ScDBData& rNewData, BOOL bApi ); // Name unveraendert - BOOL RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ); + BOOL RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ); - BOOL DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj, + BOOL DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj, BOOL bRecord, BOOL bApi, BOOL bAllowMove = FALSE ); }; diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 9f01774f24b7..5054f1fa10c7 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.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 @@ -53,39 +53,39 @@ private: public: ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); - virtual ~ScDBFunc(); + virtual ~ScDBFunc(); - // nur UISort wiederholt bei Bedarf die Teilergebnisse + // nur UISort wiederholt bei Bedarf die Teilergebnisse - void UISort( const ScSortParam& rSortParam, + void UISort( const ScSortParam& rSortParam, BOOL bRecord = TRUE ); - void Sort( const ScSortParam& rSortParam, + void Sort( const ScSortParam& rSortParam, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - SC_DLLPUBLIC void Query( const ScQueryParam& rQueryParam, + SC_DLLPUBLIC void Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, BOOL bRecord ); - void DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord = TRUE, + void DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord = TRUE, const ScSortParam* pForceNewSort = NULL ); - void ToggleAutoFilter(); - void HideAutoFilter(); + void ToggleAutoFilter(); + void HideAutoFilter(); - void RepeatDB( BOOL bRecord = TRUE ); + void RepeatDB( BOOL bRecord = TRUE ); - BOOL ImportData( const ScImportParam& rParam, BOOL bRecord = TRUE ); + BOOL ImportData( const ScImportParam& rParam, BOOL bRecord = TRUE ); - void GotoDBArea( const String& rDBName ); + void GotoDBArea( const String& rDBName ); // DB-Bereich vom Cursor - ScDBData* GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP, bool bShrinkToData = false, bool bExpandRows = false ); + ScDBData* GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP, bool bShrinkToData = false, bool bExpandRows = false ); - void NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList ); + void NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList ); - void Consolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE ); + void Consolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE ); bool MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, BOOL bNewTable, const ScDPObject& rSource, BOOL bApi = FALSE ); - void DeletePivotTable(); + void DeletePivotTable(); // Wang Xu Ming -- 2009-6-17 // DataPilot Migration ULONG RecalcPivotTable(); @@ -107,25 +107,25 @@ public: void ShowDataPilotSourceData( ScDPObject& rDPObj, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters ); - void MakeOutline( BOOL bColumns, BOOL bRecord = TRUE ); - void RemoveOutline( BOOL bColumns, BOOL bRecord = TRUE ); - void RemoveAllOutlines( BOOL bRecord = TRUE ); - void TestRemoveOutline( BOOL& rCol, BOOL& rRow ); + void MakeOutline( BOOL bColumns, BOOL bRecord = TRUE ); + void RemoveOutline( BOOL bColumns, BOOL bRecord = TRUE ); + void RemoveAllOutlines( BOOL bRecord = TRUE ); + void TestRemoveOutline( BOOL& rCol, BOOL& rRow ); - void AutoOutline( BOOL bRecord = TRUE ); + void AutoOutline( BOOL bRecord = TRUE ); - void SelectLevel( BOOL bColumns, USHORT nLevel, + void SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - void ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, + void ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - void HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, + void HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - void ShowMarkedOutlines( BOOL bRecord = TRUE ); - void HideMarkedOutlines( BOOL bRecord = TRUE ); - BOOL OutlinePossible(BOOL bHide); + void ShowMarkedOutlines( BOOL bRecord = TRUE ); + void HideMarkedOutlines( BOOL bRecord = TRUE ); + BOOL OutlinePossible(BOOL bHide); - void UpdateCharts(BOOL bAllCharts = FALSE); // Default: am Cursor + void UpdateCharts(BOOL bAllCharts = FALSE); // Default: am Cursor static USHORT DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCharts ); }; diff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrc index fd0205e3bbed..8062656a10c5 100644 --- a/sc/source/ui/inc/dbnamdlg.hrc +++ b/sc/source/ui/inc/dbnamdlg.hrc @@ -1,7 +1,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 @@ -28,15 +28,15 @@ #include "sc.hrc" // -> RID_SCDLG_DBNAMES #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_REMOVE 4 -#define BTN_HELP 5 +#define BTN_CANCEL 2 +#define BTN_ADD 3 +#define BTN_REMOVE 4 +#define BTN_HELP 5 #define FL_NAME 10 -#define ED_NAME 11 +#define ED_NAME 11 #define FL_ASSIGN 12 -#define ED_DBAREA 13 -#define RB_DBAREA 14 +#define ED_DBAREA 13 +#define RB_DBAREA 14 #define FL_OPTIONS 20 #define BTN_HEADER 21 #define BTN_SIZE 22 diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 8c6e61f60943..816a4e5c2b8b 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.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 @@ -48,64 +48,64 @@ class ScDbNameDlg : public ScAnyRefDlg { public: ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ); + ScViewData* ptrViewData ); ~ScDbNameDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); + virtual BOOL Close(); private: FixedLine aFlName; - ComboBox aEdName; + ComboBox aEdName; FixedLine aFlAssign; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; FixedLine aFlOptions; - CheckBox aBtnHeader; - CheckBox aBtnDoSize; - CheckBox aBtnKeepFmt; - CheckBox aBtnStripData; - ScExpandedFixedText aFTSource; //@18.09.97 erweiterter FixedText - FixedText aFTOperations; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - MoreButton aBtnMore; - - BOOL bSaved; - - - const String aStrAdd; // "Hinzufuegen" - const String aStrModify; // "Aendern" - const String aStrNoName; // "unbenannt" - const String aStrInvalid; - - String aStrSource; - String aStrOperations; - - ScViewData* pViewData; - ScDocument* pDoc; - BOOL bRefInputMode; + CheckBox aBtnHeader; + CheckBox aBtnDoSize; + CheckBox aBtnKeepFmt; + CheckBox aBtnStripData; + ScExpandedFixedText aFTSource; //@18.09.97 erweiterter FixedText + FixedText aFTOperations; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + MoreButton aBtnMore; + + BOOL bSaved; + + + const String aStrAdd; // "Hinzufuegen" + const String aStrModify; // "Aendern" + const String aStrNoName; // "unbenannt" + const String aStrInvalid; + + String aStrSource; + String aStrOperations; + + ScViewData* pViewData; + ScDocument* pDoc; + BOOL bRefInputMode; ScAddress::Details aAddrDetails; - ScDBCollection aLocalDbCol; - ScRange theCurArea; - List aRemoveList; + ScDBCollection aLocalDbCol; + ScRange theCurArea; + List aRemoveList; #ifdef _DBNAMDLG_CXX private: - void Init(); - void UpdateNames(); - void UpdateDBData( const String& rStrName ); - void SetInfoStrings( const ScDBData* pDBData ); + void Init(); + void UpdateNames(); + void UpdateDBData( const String& rStrName ); + void SetInfoStrings( const ScDBData* pDBData ); DECL_LINK( CancelBtnHdl, void * ); DECL_LINK( OkBtnHdl, void * ); diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index e1bbcc0f9b59..1bb78c3ec283 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.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 @@ -43,13 +43,13 @@ class ScDeleteCellDlg : public ModalDialog { private: FixedLine aFlFrame; - RadioButton aBtnCellsUp; - RadioButton aBtnCellsLeft; - RadioButton aBtnDelRows; - RadioButton aBtnDelCols; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnCellsUp; + RadioButton aBtnCellsLeft; + RadioButton aBtnDelRows; + RadioButton aBtnDelCols; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index 15050229b507..3180cb3cea48 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.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 @@ -40,22 +40,22 @@ class ScDeleteContentsDlg : public ModalDialog { private: FixedLine aFlFrame; - CheckBox aBtnDelAll; - CheckBox aBtnDelStrings; - CheckBox aBtnDelNumbers; - CheckBox aBtnDelDateTime; - CheckBox aBtnDelFormulas; - CheckBox aBtnDelNotes; - CheckBox aBtnDelAttrs; - CheckBox aBtnDelObjects; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + CheckBox aBtnDelAll; + CheckBox aBtnDelStrings; + CheckBox aBtnDelNumbers; + CheckBox aBtnDelDateTime; + CheckBox aBtnDelFormulas; + CheckBox aBtnDelNotes; + CheckBox aBtnDelAttrs; + CheckBox aBtnDelObjects; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - BOOL bObjectsDisabled; + BOOL bObjectsDisabled; - static BOOL bPreviousAllCheck; - static USHORT nPreviousChecks; + static BOOL bPreviousAllCheck; + static USHORT nPreviousChecks; void DisableChecks( BOOL bDelAllChecked = TRUE ); DECL_LINK( DelAllHdl, void * ); @@ -64,9 +64,9 @@ public: ScDeleteContentsDlg( Window* pParent, USHORT nCheckDefaults = 0 ); ~ScDeleteContentsDlg(); - void DisableObjects(); + void DisableObjects(); - USHORT GetDelContentsCmdBits() const; + USHORT GetDelContentsCmdBits() const; }; diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index d360750f1bbb..422a716c3add 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.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 @@ -168,7 +168,7 @@ public: double fStart, double fStep, double fMax, BOOL bRecord, BOOL bApi ); // FillAuto: rRange wird von Source-Range auf Dest-Range angepasst - SC_DLLPUBLIC BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, ULONG nCount, double fStep, double fMax, BOOL bRecord, BOOL bApi ); + SC_DLLPUBLIC BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, ULONG nCount, double fStep, double fMax, BOOL bRecord, BOOL bApi ); BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 6a1fa0ff5098..bf29914feb1d 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.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 @@ -95,49 +95,49 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener ScDocument aDocument; - String aDdeTextFmt; - String aConvFilterName; //@ #BugId 54198 + String aDdeTextFmt; + String aConvFilterName; //@ #BugId 54198 - double nPrtToScreenFactor; + double nPrtToScreenFactor; //! FontList* pFontList; DocShell_Impl* pImpl; - ScDocFunc* pDocFunc; - - //SfxObjectCreateMode eShellMode; - - BOOL bIsInplace; // wird von der View gesetzt - BOOL bHeaderOn; - BOOL bFooterOn; - BOOL bNoInformLost; - BOOL bIsEmpty; - BOOL bIsInUndo; - BOOL bDocumentModifiedPending; - USHORT nDocumentLock; + ScDocFunc* pDocFunc; + + //SfxObjectCreateMode eShellMode; + + BOOL bIsInplace; // wird von der View gesetzt + BOOL bHeaderOn; + BOOL bFooterOn; + BOOL bNoInformLost; + BOOL bIsEmpty; + BOOL bIsInUndo; + BOOL bDocumentModifiedPending; + USHORT nDocumentLock; sal_Int16 nCanUpdate; // stores the UpdateDocMode from loading a document till update links BOOL bUpdateEnabled; ScDBData* pOldAutoDBRange; - ScSbxDocHelper* pDocHelper; + ScSbxDocHelper* pDocHelper; - ScAutoStyleList* pAutoStyleList; - ScPaintLockData* pPaintLockData; - ScJobSetup* pOldJobSetup; + ScAutoStyleList* pAutoStyleList; + ScPaintLockData* pPaintLockData; + ScJobSetup* pOldJobSetup; ScOptSolverSave* pSolverSaveData; ScSheetSaveData* pSheetSaveData; ScDocShellModificator* pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading) - SC_DLLPRIVATE void InitItems(); - SC_DLLPRIVATE void DoEnterHandler(); + SC_DLLPRIVATE void InitItems(); + SC_DLLPRIVATE void DoEnterHandler(); SC_DLLPRIVATE void InitOptions(bool bForLoading); - SC_DLLPRIVATE void ResetDrawObjectShell(); + SC_DLLPRIVATE void ResetDrawObjectShell(); // SUNWS needs a forward declared friend, otherwise types and members // of the outer class are not accessible. class PrepareSaveGuard; friend class ScDocShell::PrepareSaveGuard; - /** Do things that need to be done before saving to our own format and + /** Do things that need to be done before saving to our own format and necessary clean ups in dtor. */ class PrepareSaveGuard { @@ -150,21 +150,21 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener SC_DLLPRIVATE BOOL LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); SC_DLLPRIVATE BOOL SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); - SC_DLLPRIVATE SCTAB GetSaveTab(); + SC_DLLPRIVATE SCTAB GetSaveTab(); - SC_DLLPRIVATE ULONG DBaseImport( const String& rFullFileName, CharSet eCharSet, + SC_DLLPRIVATE ULONG DBaseImport( const String& rFullFileName, CharSet eCharSet, ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc ); - SC_DLLPRIVATE ULONG DBaseExport( const String& rFullFileName, CharSet eCharSet, + SC_DLLPRIVATE ULONG DBaseExport( const String& rFullFileName, CharSet eCharSet, BOOL& bHasMemo ); - SC_DLLPRIVATE static BOOL MoveFile( const INetURLObject& rSource, const INetURLObject& rDest ); - SC_DLLPRIVATE static BOOL KillFile( const INetURLObject& rURL ); - SC_DLLPRIVATE static BOOL IsDocument( const INetURLObject& rURL ); + SC_DLLPRIVATE static BOOL MoveFile( const INetURLObject& rSource, const INetURLObject& rDest ); + SC_DLLPRIVATE static BOOL KillFile( const INetURLObject& rURL ); + SC_DLLPRIVATE static BOOL IsDocument( const INetURLObject& rURL ); - SC_DLLPRIVATE void LockPaint_Impl(BOOL bDoc); - SC_DLLPRIVATE void UnlockPaint_Impl(BOOL bDoc); - SC_DLLPRIVATE void LockDocument_Impl(USHORT nNew); - SC_DLLPRIVATE void UnlockDocument_Impl(USHORT nNew); + SC_DLLPRIVATE void LockPaint_Impl(BOOL bDoc); + SC_DLLPRIVATE void UnlockPaint_Impl(BOOL bDoc); + SC_DLLPRIVATE void LockDocument_Impl(USHORT nNew); + SC_DLLPRIVATE void UnlockDocument_Impl(USHORT nNew); SC_DLLPRIVATE void EnableSharedSettings( bool bEnable ); SC_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument(); @@ -195,7 +195,7 @@ public: virtual SfxUndoManager* GetUndoManager(); - virtual void FillClass( SvGlobalName * pClassName, + virtual void FillClass( SvGlobalName * pClassName, sal_uInt32 * pFormat, String * pAppName, String * pFullTypeName, @@ -210,19 +210,19 @@ public: virtual BOOL Save(); virtual BOOL SaveAs( SfxMedium& rMedium ); virtual BOOL ConvertTo( SfxMedium &rMedium ); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - virtual void PrepareReload(); - virtual BOOL IsInformationLost(); - virtual void LoadStyles( SfxObjectShell &rSource ); - virtual BOOL Insert( SfxObjectShell &rSource, + virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual void PrepareReload(); + virtual BOOL IsInformationLost(); + virtual void LoadStyles( SfxObjectShell &rSource ); + virtual BOOL Insert( SfxObjectShell &rSource, USHORT nSourceIdx1, USHORT nSourceIdx2, USHORT nSourceIdx3, USHORT &nIdx1, USHORT &nIdx2, USHORT &nIdx3, USHORT &rIdxDeleted ); virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); // SfxInPlaceObject - virtual BOOL DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell + virtual BOOL DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell virtual sal_Bool QuerySlotExecutable( USHORT nSlotId ); - virtual void Draw( OutputDevice *, const JobSetup & rSetup, + virtual void Draw( OutputDevice *, const JobSetup & rSetup, USHORT nAspect = ASPECT_CONTENT ); virtual void SetVisArea( const Rectangle & rVisArea ); @@ -232,44 +232,44 @@ public: virtual Printer* GetDocumentPrinter(); - virtual void SetModified( BOOL = TRUE ); + virtual void SetModified( BOOL = TRUE ); - void SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart ); + void SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart ); virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent, const SfxItemSet &rSet ); - void GetDocStat( ScDocStat& rDocStat ); + void GetDocStat( ScDocStat& rDocStat ); - ScDocument* GetDocument() { return &aDocument; } - ScDocFunc& GetDocFunc() { return *pDocFunc; } + ScDocument* GetDocument() { return &aDocument; } + ScDocFunc& GetDocFunc() { return *pDocFunc; } - SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE ); - USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL ); + SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE ); + USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL ); - void UpdateFontList(); + void UpdateFontList(); - String CreateObjectName( const String& rPrefix ); + String CreateObjectName( const String& rPrefix ); - ScDrawLayer* MakeDrawLayer(); + ScDrawLayer* MakeDrawLayer(); - void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); + void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); - void GetSbxState( SfxItemSet &rSet ); - void GetDrawObjState( SfxItemSet &rSet ); + void GetSbxState( SfxItemSet &rSet ); + void GetDrawObjState( SfxItemSet &rSet ); void Execute( SfxRequest& rReq ); void GetState( SfxItemSet &rSet ); - void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab ); - void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab ); + void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab ); + void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab ); - void CompareDocument( ScDocument& rOtherDoc ); + void CompareDocument( ScDocument& rOtherDoc ); void MergeDocument( ScDocument& rOtherDoc, bool bShared = false, bool bCheckDuplicates = false, ULONG nOffset = 0, ScChangeActionMergeMap* pMergeMap = NULL, bool bInverseMap = false ); bool MergeSharedDocument( ScDocShell* pSharedDocShell ); - ScChangeAction* GetChangeAction( const ScAddress& rPos ); - void SetChangeComment( ScChangeAction* pAction, const String& rComment ); - void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext=TRUE ); + ScChangeAction* GetChangeAction( const ScAddress& rPos ); + void SetChangeComment( ScChangeAction* pAction, const String& rComment ); + void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext=TRUE ); /// Protect/unprotect ChangeTrack and return <TRUE/> if /// protection was successfully changed. /// If bJustQueryIfProtected==TRUE protection is not @@ -277,59 +277,59 @@ public: /// password was entered correctly. BOOL ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQueryIfProtected = FALSE ); - void SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages ); - BOOL AdjustPrintZoom( const ScRange& rRange ); + void SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages ); + BOOL AdjustPrintZoom( const ScRange& rRange ); - void LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles ); + void LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles ); - void PageStyleModified( const String& rStyleName, BOOL bApi ); + void PageStyleModified( const String& rStyleName, BOOL bApi ); - void NotifyStyle( const SfxStyleSheetHint& rHint ); - void DoAutoStyle( const ScRange& rRange, const String& rStyle ); + void NotifyStyle( const SfxStyleSheetHint& rHint ); + void DoAutoStyle( const ScRange& rRange, const String& rStyle ); - Window* GetActiveDialogParent(); - void ErrorMessage( USHORT nGlobStrId ); - BOOL IsEditable() const; + Window* GetActiveDialogParent(); + void ErrorMessage( USHORT nGlobStrId ); + BOOL IsEditable() const; - BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ); + BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ); void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL ); void UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore = false ); - void RefreshPivotTables( const ScRange& rSource ); - void DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE ); - void UseScenario( SCTAB nTab, const String& rName, BOOL bRecord = TRUE ); - SCTAB MakeScenario( SCTAB nTab, const String& rName, const String& rComment, + void RefreshPivotTables( const ScRange& rSource ); + void DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE ); + void UseScenario( SCTAB nTab, const String& rName, BOOL bRecord = TRUE ); + SCTAB MakeScenario( SCTAB nTab, const String& rName, const String& rComment, const Color& rColor, USHORT nFlags, ScMarkData& rMark, BOOL bRecord = TRUE ); - void ModifyScenario( SCTAB nTab, const String& rName, const String& rComment, + void ModifyScenario( SCTAB nTab, const String& rName, const String& rComment, const Color& rColor, USHORT nFlags ); ULONG TransferTab( ScDocShell& rSrcDocShell, SCTAB nSrcPos, SCTAB nDestPos, BOOL bInsertNew, BOOL bNotifyAndPaint ); - BOOL MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRecord ); + BOOL MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRecord ); - void DoRecalc( BOOL bApi ); - void DoHardRecalc( BOOL bApi ); + void DoRecalc( BOOL bApi ); + void DoHardRecalc( BOOL bApi ); bool CheckPrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData, bool bForceSelected, bool bIsAPI ); - void PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData ); - void Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, + void PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData ); + void Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, ScMarkData* pMarkData, Window* pDialogParent, BOOL bForceSelected, BOOL bIsAPI ); - void UpdateOle( const ScViewData* pViewData, BOOL bSnapSize = FALSE ); - BOOL IsOle(); + void UpdateOle( const ScViewData* pViewData, BOOL bSnapSize = FALSE ); + BOOL IsOle(); - void DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); - ScDBData* GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel ); + void DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); + ScDBData* GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel ); ScDBData* GetOldAutoDBRange(); // has to be deleted by caller! void CancelAutoDBRange(); // called when dialog is cancelled virtual void ReconnectDdeLink(SfxObjectShell& rServer); - void UpdateLinks(); // Link-Eintraege aktuallisieren - BOOL ReloadTabLinks(); // Links ausfuehren (Inhalt aktualisieren) + void UpdateLinks(); // Link-Eintraege aktuallisieren + BOOL ReloadTabLinks(); // Links ausfuehren (Inhalt aktualisieren) virtual void CheckConfigOptions(); @@ -347,38 +347,38 @@ public: void PostDataChanged(); - void UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, + void UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab ); - void UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange ); + void UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange ); - void SetDocumentModified( BOOL bIsModified = TRUE ); - void SetDrawModified( BOOL bIsModified = TRUE ); + void SetDocumentModified( BOOL bIsModified = TRUE ); + void SetDrawModified( BOOL bIsModified = TRUE ); - void LockPaint(); - void UnlockPaint(); - USHORT GetLockCount() const; - void SetLockCount(USHORT nNew); + void LockPaint(); + void UnlockPaint(); + USHORT GetLockCount() const; + void SetLockCount(USHORT nNew); - void LockDocument(); - void UnlockDocument(); + void LockDocument(); + void UnlockDocument(); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); - virtual SfxStyleSheetBasePool* GetStyleSheetPool(); + virtual SfxStyleSheetBasePool* GetStyleSheetPool(); - void SetInplace( BOOL bInplace ); - BOOL IsEmpty() const; - void SetEmpty(BOOL bSet); + void SetInplace( BOOL bInplace ); + BOOL IsEmpty() const; + void SetEmpty(BOOL bSet); - BOOL IsInUndo() const { return bIsInUndo; } - void SetInUndo(BOOL bSet); + BOOL IsInUndo() const { return bIsInUndo; } + void SetInUndo(BOOL bSet); - void CalcOutputFactor(); - double GetOutputFactor() const; - void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, - SCTAB nCurTab, - BOOL& rbHeader, - BOOL& rbFooter ); + void CalcOutputFactor(); + double GetOutputFactor() const; + void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, + SCTAB nCurTab, + BOOL& rbHeader, + BOOL& rbFooter ); virtual long DdeGetData( const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any & rValue ); @@ -388,14 +388,14 @@ public: const String& GetDdeTextFmt() const { return aDdeTextFmt; } - SfxBindings* GetViewBindings(); + SfxBindings* GetViewBindings(); ScTabViewShell* GetBestViewShell( BOOL bOnlyVisible = TRUE ); ScSbxDocHelper* GetDocHelperObject() { return pDocHelper; } - void SetDocumentModifiedPending( BOOL bVal ) + void SetDocumentModifiedPending( BOOL bVal ) { bDocumentModifiedPending = bVal; } - BOOL IsDocumentModifiedPending() const + BOOL IsDocumentModifiedPending() const { return bDocumentModifiedPending; } BOOL IsUpdateEnabled() const @@ -403,20 +403,20 @@ public: void SetUpdateEnabled(BOOL bValue) { bUpdateEnabled = bValue; } - OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice... + OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice... static ScViewData* GetViewData(); - static SCTAB GetCurTab(); + static SCTAB GetCurTab(); static ScDocShell* GetShellByNum( USHORT nDocNo ); - static String GetOwnFilterName(); + static String GetOwnFilterName(); static String GetHtmlFilterName(); - static String GetWebQueryFilterName(); - static String GetAsciiFilterName(); - static String GetLotusFilterName(); - static String GetDBaseFilterName(); - static String GetDifFilterName(); - static BOOL HasAutomaticTableName( const String& rFilter ); + static String GetWebQueryFilterName(); + static String GetAsciiFilterName(); + static String GetLotusFilterName(); + static String GetDBaseFilterName(); + static String GetDifFilterName(); + static BOOL HasAutomaticTableName( const String& rFilter ); DECL_LINK( RefreshDBDataHdl, ScRefreshTimer* ); @@ -428,7 +428,7 @@ public: const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null void SetSolverSaveData( const ScOptSolverSave& rData ); //<!--Added by PengYunQuan for Validity Cell Range Picker - sal_Bool AcceptStateUpdate() const; + sal_Bool AcceptStateUpdate() const; //-->Added by PengYunQuan for Validity Cell Range Picker ScSheetSaveData* GetSheetSaveData(); @@ -460,19 +460,19 @@ SO2_IMPL_REF(ScDocShell) // bAutoCalcShellDisabled nicht gesetzt ist ein SetDocumentModified gerufen. class SC_DLLPUBLIC ScDocShellModificator { - ScDocShell& rDocShell; - ScRefreshTimerProtector aProtector; - BOOL bAutoCalcShellDisabled; - BOOL bIdleDisabled; + ScDocShell& rDocShell; + ScRefreshTimerProtector aProtector; + BOOL bAutoCalcShellDisabled; + BOOL bIdleDisabled; // not implemented ScDocShellModificator( const ScDocShellModificator& ); - ScDocShellModificator& operator=( const ScDocShellModificator& ); + ScDocShellModificator& operator=( const ScDocShellModificator& ); public: ScDocShellModificator( ScDocShell& ); ~ScDocShellModificator(); - void SetDocumentModified(); + void SetDocumentModified(); }; diff --git a/sc/source/ui/inc/dpcontrol.hrc b/sc/source/ui/inc/dpcontrol.hrc index 687f999970ad..9cea30e99d4f 100644 --- a/sc/source/ui/inc/dpcontrol.hrc +++ b/sc/source/ui/inc/dpcontrol.hrc @@ -1,7 +1,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/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx index 5c5bcc49982e..912f05058916 100644 --- a/sc/source/ui/inc/dpcontrol.hxx +++ b/sc/source/ui/inc/dpcontrol.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 @@ -58,9 +58,9 @@ class Window; class ScDocument; class ScAccessibleFilterMenu; -/** - * This class takes care of physically drawing field button controls inside - * data pilot tables. +/** + * This class takes care of physically drawing field button controls inside + * data pilot tables. */ class ScDPFieldButton { @@ -105,9 +105,9 @@ class ScMenuFloatingWindow : public PopupMenuFloatingWindow { public: static size_t MENU_NOT_SELECTED; - /** - * Action to perform when an event takes place. Create a sub-class of - * this to implement the desired action. + /** + * Action to perform when an event takes place. Create a sub-class of + * this to implement the desired action. */ class Action { @@ -170,34 +170,34 @@ private: size_t getEnclosingMenuItem(const Point& rPos) const; size_t getSubMenuPos(ScMenuFloatingWindow* pSubMenu); - /** - * Fire a menu highlight event since the accessibility framework needs - * this to track focus on menu items. + /** + * Fire a menu highlight event since the accessibility framework needs + * this to track focus on menu items. */ - void fireMenuHighlightedEvent(); + void fireMenuHighlightedEvent(); - /** - * Make sure that the specified submenu is permanently up, the submenu - * close timer is not active, and the correct menu item associated with + /** + * Make sure that the specified submenu is permanently up, the submenu + * close timer is not active, and the correct menu item associated with * the submenu is highlighted. */ void setSubMenuFocused(ScMenuFloatingWindow* pSubMenu); - /** - * When a menu item of an invisible submenu is selected, we need to make - * sure that all its parent menu(s) are visible, with the right menu item - * highlighted in each of the parents. Calling this method ensures it. + /** + * When a menu item of an invisible submenu is selected, we need to make + * sure that all its parent menu(s) are visible, with the right menu item + * highlighted in each of the parents. Calling this method ensures it. */ void ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu); - /** - * Dismiss any visible child submenus when a menu item of a parent menu is + /** + * Dismiss any visible child submenus when a menu item of a parent menu is * selected. */ void ensureSubMenuNotVisible(); - /** - * Dismiss all visible popup menus and set focus back to the application + /** + * Dismiss all visible popup menus and set focus back to the application * window. This method is called e.g. when a menu action is fired. */ void terminateAllPopupMenus(); @@ -254,17 +254,17 @@ private: // ============================================================================ -/** - * This class implements a popup window for field button, for quick access - * of hide-item list, and possibly more stuff related to field options. +/** + * This class implements a popup window for field button, for quick access + * of hide-item list, and possibly more stuff related to field options. */ class ScDPFieldPopupWindow : public ScMenuFloatingWindow { public: - /** - * Extended data that the client code may need to store. Create a - * sub-class of this and store data there. - */ + /** + * Extended data that the client code may need to store. Create a + * sub-class of this and store data there. + */ struct ExtendedData {}; explicit ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc); @@ -285,14 +285,14 @@ public: void getResult(::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult); void close(bool bOK); - /** - * Set auxiliary data that the client code might need. Note that this - * popup window class manages its life time; no explicit deletion of the + /** + * Set auxiliary data that the client code might need. Note that this + * popup window class manages its life time; no explicit deletion of the * instance is needed in the client code. */ void setExtendedData(ExtendedData* p); - /** + /** * Get the store auxiliary data, or NULL if no such data is stored. */ ExtendedData* getExtendedData(); diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 7a1770ab6844..75c98fa6cd88 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.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/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index e0a9ee9674eb..39db423f44dd 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.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 @@ -41,14 +41,14 @@ class ScDrawView; class ScDrawShell : public SfxShell { - ScViewData* pViewData; + ScViewData* pViewData; DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* ); void SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk ); protected: - ScViewData* GetViewData() { return pViewData; } + ScViewData* GetViewData() { return pViewData; } public: TYPEINFO(); @@ -57,33 +57,33 @@ public: ScDrawShell(ScViewData* pData); ~ScDrawShell(); - void StateDisableItems( SfxItemSet &rSet ); + void StateDisableItems( SfxItemSet &rSet ); - void ExecDrawAttr(SfxRequest& rReq); - void GetDrawAttrState(SfxItemSet &rSet); - void GetAttrFuncState(SfxItemSet &rSet); + void ExecDrawAttr(SfxRequest& rReq); + void GetDrawAttrState(SfxItemSet &rSet); + void GetAttrFuncState(SfxItemSet &rSet); - void ExecDrawFunc(SfxRequest& rReq); - void GetDrawFuncState(SfxItemSet &rSet); - void GetState(SfxItemSet &rSet); + void ExecDrawFunc(SfxRequest& rReq); + void GetDrawFuncState(SfxItemSet &rSet); + void GetState(SfxItemSet &rSet); - void ExecFormText(SfxRequest& rReq); // StarFontWork - void GetFormTextState(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq); // StarFontWork + void GetFormTextState(SfxItemSet& rSet); - void ExecuteHLink(SfxRequest& rReq); // Hyperlink - void GetHLinkState(SfxItemSet& rSet); + void ExecuteHLink(SfxRequest& rReq); // Hyperlink + void GetHLinkState(SfxItemSet& rSet); void ExecFormatPaintbrush(SfxRequest& rReq); void StateFormatPaintbrush(SfxItemSet& rSet); void ExecuteMacroAssign( SdrObject* pObj, Window* pWin ); - void ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); - void ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); - void ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); + void ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); + void ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); + void ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); ScDrawView* GetDrawView(); - BOOL AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark); + BOOL AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark); }; diff --git a/sc/source/ui/inc/drawutil.hxx b/sc/source/ui/inc/drawutil.hxx index d6bd314e4ef7..88c49d77bc8e 100644 --- a/sc/source/ui/inc/drawutil.hxx +++ b/sc/source/ui/inc/drawutil.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 @@ -39,7 +39,7 @@ class ScDocument; class ScDrawUtil { public: - static void CalcScale( ScDocument* pDoc, SCTAB nTab, + static void CalcScale( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, OutputDevice* pDev, const Fraction& rZoomX, const Fraction& rZoomY, double nPPTX, double nPPTY, diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 408cbe4668b2..5a18babbb0fa 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.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 @@ -41,22 +41,22 @@ class ScDrawObjData; class ScDrawView: public FmFormView { - ScViewData* pViewData; - OutputDevice* pDev; //! noetig ? - ScDocument* pDoc; - SCTAB nTab; - Fraction aScaleX; // Faktor fuer Drawing-MapMode - Fraction aScaleY; - SdrDropMarkerOverlay* pDropMarker; - SdrObject* pDropMarkObj; - BOOL bInConstruct; - //HMHBOOL bDisableHdl; - - void Construct(); - void UpdateBrowser(); + ScViewData* pViewData; + OutputDevice* pDev; //! noetig ? + ScDocument* pDoc; + SCTAB nTab; + Fraction aScaleX; // Faktor fuer Drawing-MapMode + Fraction aScaleY; + SdrDropMarkerOverlay* pDropMarker; + SdrObject* pDropMarkObj; + BOOL bInConstruct; + //HMHBOOL bDisableHdl; + + void Construct(); + void UpdateBrowser(); protected: - virtual void ModelHasChanged(); + virtual void ModelHasChanged(); // add custom handles (used by other apps, e.g. AnchorPos) virtual void AddCustomHdl(); @@ -65,53 +65,53 @@ protected: public: ScDrawView( OutputDevice* pOut, ScViewData* pData ); - virtual ~ScDrawView(); + virtual ~ScDrawView(); - virtual void MarkListHasChanged(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void MarkListHasChanged(); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void DoConnect(SdrOle2Obj* pOleObj); - virtual void MakeVisible( const Rectangle& rRect, Window& rWin ); + virtual void MakeVisible( const Rectangle& rRect, Window& rWin ); virtual void DeleteMarked(); - void DrawMarks( OutputDevice* pOut ) const; + void DrawMarks( OutputDevice* pOut ) const; - void MarkDropObj( SdrObject* pObj ); + void MarkDropObj( SdrObject* pObj ); - //HMHBOOL IsDisableHdl() const { return bDisableHdl; } + //HMHBOOL IsDisableHdl() const { return bDisableHdl; } - void SetMarkedToLayer( BYTE nLayerNo ); + void SetMarkedToLayer( BYTE nLayerNo ); - void InvalidateAttribs(); - void InvalidateDrawTextAttrs(); + void InvalidateAttribs(); + void InvalidateDrawTextAttrs(); - BOOL BeginDrag( Window* pWindow, const Point& rStartPos ); - void DoCut(); - void DoCopy(); + BOOL BeginDrag( Window* pWindow, const Point& rStartPos ); + void DoCut(); + void DoCopy(); - void GetScale( Fraction& rFractX, Fraction& rFractY ) const; - void RecalcScale(); - void UpdateWorkArea(); - SCTAB GetTab() const { return nTab; } + void GetScale( Fraction& rFractX, Fraction& rFractY ) const; + void RecalcScale(); + void UpdateWorkArea(); + SCTAB GetTab() const { return nTab; } - void CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const; + void CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const; - void SetAnchor( ScAnchorType ); - ScAnchorType GetAnchor() const; + void SetAnchor( ScAnchorType ); + ScAnchorType GetAnchor() const; - void VCAddWin( Window* pWin ); - void VCRemoveWin( Window* pWin ); + void VCAddWin( Window* pWin ); + void VCRemoveWin( Window* pWin ); - void UpdateIMap( SdrObject* pObj ); + void UpdateIMap( SdrObject* pObj ); - USHORT GetPopupMenuId(); - void UpdateUserViewOptions(); + USHORT GetPopupMenuId(); + void UpdateUserViewOptions(); - void SetMarkedOriginalSize(); + void SetMarkedOriginalSize(); - BOOL SelectObject( const String& rName ); + BOOL SelectObject( const String& rName ); bool HasMarkedControl() const; bool HasMarkedInternal() const; @@ -139,7 +139,7 @@ public: /** Unlocks the internal layer that contains caption objects of cell notes. */ inline void UnlockInternalLayer() { LockInternalLayer( false ); } - SdrEndTextEditKind ScEndTextEdit(); // ruft SetDrawTextUndo(0) + SdrEndTextEditKind ScEndTextEdit(); // ruft SetDrawTextUndo(0) ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable(); }; diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx index ec32afef4d62..de53dc2a74e6 100644 --- a/sc/source/ui/inc/drformsh.hxx +++ b/sc/source/ui/inc/drformsh.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 @@ -47,10 +47,10 @@ public: SFX_DECL_INTERFACE(SCID_FORM_SHELL) ScDrawFormShell(ScViewData* pData); - virtual ~ScDrawFormShell(); + virtual ~ScDrawFormShell(); -// void Execute(SfxRequest &); -// void GetState(SfxItemSet &); +// void Execute(SfxRequest &); +// void GetState(SfxItemSet &); }; #endif diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index d159ab0ad669..49d0b3badddd 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.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 @@ -38,7 +38,7 @@ #include "shellids.hxx" -USHORT ScGetFontWorkId(); // statt SvxFontWorkChildWindow::GetChildWindowId() +USHORT ScGetFontWorkId(); // statt SvxFontWorkChildWindow::GetChildWindowId() class ScViewData; class TransferableDataHelper; @@ -46,9 +46,9 @@ class TransferableClipboardListener; class ScDrawTextObjectBar : public SfxShell { - ScViewData* pViewData; + ScViewData* pViewData; TransferableClipboardListener* pClipEvtLstnr; - BOOL bPastePossible; + BOOL bPastePossible; DECL_LINK( ClipboardChanged, TransferableDataHelper* ); @@ -74,11 +74,11 @@ public: BOOL ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet ); void ExecuteExtra( SfxRequest &rReq ); - void ExecFormText(SfxRequest& rReq); // StarFontWork + void ExecFormText(SfxRequest& rReq); // StarFontWork void GetFormTextState(SfxItemSet& rSet); private: - void ExecuteGlobal( SfxRequest &rReq ); // von Execute gerufen fuer ganze Objekte + void ExecuteGlobal( SfxRequest &rReq ); // von Execute gerufen fuer ganze Objekte void GetGlobalClipState( SfxItemSet& rSet ); void ExecutePasteContents( SfxRequest &rReq ); BOOL IsNoteEdit(); diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index de256909fcf7..4e9088c4e4be 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.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 @@ -48,31 +48,31 @@ class SdrOle2Obj; class ScDrawTransferObj : public TransferableHelper { private: - SdrModel* pModel; - TransferableDataHelper aOleData; - TransferableObjectDescriptor aObjDesc; -//REMOVE SvEmbeddedObjectRef aDocShellRef; -//REMOVE SvEmbeddedObjectRef aDrawPersistRef; - SfxObjectShellRef aDocShellRef; - SfxObjectShellRef aDrawPersistRef; + SdrModel* pModel; + TransferableDataHelper aOleData; + TransferableObjectDescriptor aObjDesc; +//REMOVE SvEmbeddedObjectRef aDocShellRef; +//REMOVE SvEmbeddedObjectRef aDrawPersistRef; + SfxObjectShellRef aDocShellRef; + SfxObjectShellRef aDrawPersistRef; // extracted from model in ctor: - Size aSrcSize; - INetBookmark* pBookmark; - BOOL bGraphic; - BOOL bGrIsBit; - BOOL bOleObj; + Size aSrcSize; + INetBookmark* pBookmark; + BOOL bGraphic; + BOOL bGrIsBit; + BOOL bOleObj; // source information for drag&drop: // (view is needed to handle drawing obejcts) - SdrView* pDragSourceView; - USHORT nDragSourceFlags; - BOOL bDragWasInternal; + SdrView* pDragSourceView; + USHORT nDragSourceFlags; + BOOL bDragWasInternal; sal_uInt32 nSourceDocID; - void InitDocShell(); -//REMOVE SvInPlaceObjectRef GetSingleObject(); + void InitDocShell(); +//REMOVE SvInPlaceObjectRef GetSingleObject(); SdrOle2Obj* GetSingleObject(); public: @@ -80,23 +80,23 @@ public: const TransferableObjectDescriptor& rDesc ); virtual ~ScDrawTransferObj(); - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); + virtual void DragFinished( sal_Int8 nDropAction ); - SdrModel* GetModel() { return pModel; } + SdrModel* GetModel() { return pModel; } - void SetDrawPersist( const SfxObjectShellRef& rRef ); - void SetDragSource( ScDrawView* pView ); - void SetDragSourceObj( SdrObject* pObj, SCTAB nTab ); - void SetDragSourceFlags( USHORT nFlags ); - void SetDragWasInternal(); + void SetDrawPersist( const SfxObjectShellRef& rRef ); + void SetDragSource( ScDrawView* pView ); + void SetDragSourceObj( SdrObject* pObj, SCTAB nTab ); + void SetDragSourceFlags( USHORT nFlags ); + void SetDragWasInternal(); - SdrView* GetDragSourceView() { return pDragSourceView; } - USHORT GetDragSourceFlags() const { return nDragSourceFlags; } + SdrView* GetDragSourceView() { return pDragSourceView; } + USHORT GetDragSourceFlags() const { return nDragSourceFlags; } void SetSourceDocID( sal_uInt32 nVal ) { nSourceDocID = nVal; } diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 097a67dd02b4..6522e335854e 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.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 @@ -39,11 +39,11 @@ #include <vcl/combobox.hxx> #include "anyrefdg.hxx" -#include "global.hxx" // ScAddress +#include "global.hxx" // ScAddress #include "privsplt.hxx" #include "funcdesc.hxx" -#ifndef LRU_MAX +#ifndef LRU_MAX #define LRU_MAX 10 #endif /************************************************************************* @@ -71,44 +71,44 @@ class ScFunctionDockWin : public SfxDockingWindow, public SfxListener { private: - Timer aTimer; - ScPrivatSplit aPrivatSplit; - ListBox aCatBox; - ListBox aFuncList; - ListBox aDDFuncList; - ListBox* pAllFuncList; - - SfxChildAlignment eSfxNewAlignment; - SfxChildAlignment eSfxOldAlignment; - ImageButton aInsertButton; - FixedText aFiFuncDesc; - USHORT nLeftSlot; - USHORT nRightSlot; - ULONG nMinWidth; - ULONG nMinHeight; - Size aOldSize; - BOOL bSizeFlag; - BOOL bInit; - short nDockMode; - Point aSplitterInitPos; - const ScFuncDesc* pFuncDesc; - USHORT nArgs; - String** pArgArr; + Timer aTimer; + ScPrivatSplit aPrivatSplit; + ListBox aCatBox; + ListBox aFuncList; + ListBox aDDFuncList; + ListBox* pAllFuncList; + + SfxChildAlignment eSfxNewAlignment; + SfxChildAlignment eSfxOldAlignment; + ImageButton aInsertButton; + FixedText aFiFuncDesc; + USHORT nLeftSlot; + USHORT nRightSlot; + ULONG nMinWidth; + ULONG nMinHeight; + Size aOldSize; + BOOL bSizeFlag; + BOOL bInit; + short nDockMode; + Point aSplitterInitPos; + const ScFuncDesc* pFuncDesc; + USHORT nArgs; + String** pArgArr; const ScFuncDesc* aLRUList[LRU_MAX]; - void UpdateFunctionList(); - void UpdateLRUList(); - void DoEnter(BOOL bOk); //@@ ??? - void SetDescription(); - void SetLeftRightSize(); - void SetTopBottonSize(); - void SetMyWidthLeRi(Size &aNewSize); - void SetMyHeightLeRi(Size &aNewSize); - void SetMyWidthToBo(Size &aNewSize); - void SetMyHeightToBo(Size &aNewSize); - void UseSplitterInitPos(); + void UpdateFunctionList(); + void UpdateLRUList(); + void DoEnter(BOOL bOk); //@@ ??? + void SetDescription(); + void SetLeftRightSize(); + void SetTopBottonSize(); + void SetMyWidthLeRi(Size &aNewSize); + void SetMyHeightLeRi(Size &aNewSize); + void SetMyWidthToBo(Size &aNewSize); + void SetMyHeightToBo(Size &aNewSize); + void UseSplitterInitPos(); DECL_LINK( SetSelectionHdl, void* ); DECL_LINK( SelHdl, ListBox* ); @@ -117,19 +117,19 @@ private: protected: - virtual BOOL Close(); - virtual void Resize(); - virtual void Resizing( Size& rSize ); - virtual void SetSize(); - virtual void ToggleFloatingMode(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual BOOL Close(); + virtual void Resize(); + virtual void Resizing( Size& rSize ); + virtual void SetSize(); + virtual void ToggleFloatingMode(); + virtual void StateChanged( StateChangedType nStateChange ); virtual SfxChildAlignment CheckAlignment(SfxChildAlignment, SfxChildAlignment eAlign); public: - ScFunctionDockWin( SfxBindings* pBindings, + ScFunctionDockWin( SfxBindings* pBindings, SfxChildWindow *pCW, Window* pParent, const ResId& rResId ); @@ -137,14 +137,14 @@ public: ~ScFunctionDockWin(); using SfxDockingWindow::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void SetSlotIDs( USHORT nLeft, USHORT nRight ) + void SetSlotIDs( USHORT nLeft, USHORT nRight ) { nLeftSlot = nLeft; nRightSlot = nRight; } - void InitLRUList(); - - void Initialize (SfxChildWinInfo* pInfo); + void InitLRUList(); + + void Initialize (SfxChildWinInfo* pInfo); virtual void FillInfo(SfxChildWinInfo&) const; }; diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx index a0519be1b788..d09a9bc54322 100644 --- a/sc/source/ui/inc/editable.hxx +++ b/sc/source/ui/inc/editable.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 @@ -40,8 +40,8 @@ class ScRange; class ScEditableTester { - BOOL bIsEditable; - BOOL bOnlyMatrix; + BOOL bIsEditable; + BOOL bOnlyMatrix; public: // no test in ctor @@ -52,7 +52,7 @@ public: SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); // calls TestSelectedBlock - ScEditableTester( ScDocument* pDoc, + ScEditableTester( ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ); @@ -69,18 +69,18 @@ public: // Several calls to the Test... methods check if *all* of the ranges // are editable. For several independent checks, Reset() has to be used. - void TestBlock( ScDocument* pDoc, SCTAB nTab, + void TestBlock( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void TestSelectedBlock( ScDocument* pDoc, + void TestSelectedBlock( ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ); - void TestRange( ScDocument* pDoc, const ScRange& rRange ); - void TestSelection( ScDocument* pDoc, const ScMarkData& rMark ); - void TestView( ScViewFunc* pView ); + void TestRange( ScDocument* pDoc, const ScRange& rRange ); + void TestSelection( ScDocument* pDoc, const ScMarkData& rMark ); + void TestView( ScViewFunc* pView ); - BOOL IsEditable() const { return bIsEditable; } - BOOL IsFormatEditable() const { return bIsEditable || bOnlyMatrix; } - USHORT GetMessageId() const; + BOOL IsEditable() const { return bIsEditable; } + BOOL IsFormatEditable() const { return bIsEditable || bOnlyMatrix; } + USHORT GetMessageId() const; }; #endif diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index bfae24f4fd9f..f48fb48eaaed 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.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/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx index 5e915aa2a89e..a90967cb3804 100644 --- a/sc/source/ui/inc/editsh.hxx +++ b/sc/source/ui/inc/editsh.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 @@ -46,11 +46,11 @@ class TransferableClipboardListener; class ScEditShell : public SfxShell { private: - EditView* pEditView; - ScViewData* pViewData; + EditView* pEditView; + ScViewData* pViewData; TransferableClipboardListener* pClipEvtLstnr; - BOOL bPastePossible; - BOOL bIsInsertMode; + BOOL bPastePossible; + BOOL bIsInsertMode; const SvxURLField* GetURLField(); ScInputHandler* GetMyInputHdl(); @@ -64,19 +64,19 @@ public: ScEditShell(EditView* pView, ScViewData* pData); ~ScEditShell(); - void SetEditView(EditView* pView); + void SetEditView(EditView* pView); EditView* GetEditView() {return pEditView;} - void Execute(SfxRequest& rReq); - void ExecuteTrans(SfxRequest& rReq); - void GetState(SfxItemSet &rSet); - void GetClipState(SfxItemSet& rSet); + void Execute(SfxRequest& rReq); + void ExecuteTrans(SfxRequest& rReq); + void GetState(SfxItemSet &rSet); + void GetClipState(SfxItemSet& rSet); - void ExecuteAttr(SfxRequest& rReq); - void GetAttrState(SfxItemSet &rSet); + void ExecuteAttr(SfxRequest& rReq); + void GetAttrState(SfxItemSet &rSet); - void ExecuteUndo(SfxRequest& rReq); - void GetUndoState(SfxItemSet &rSet); + void ExecuteUndo(SfxRequest& rReq); + void GetUndoState(SfxItemSet &rSet); String GetSelectionText( BOOL bWholeWord ); }; diff --git a/sc/source/ui/inc/expftext.hxx b/sc/source/ui/inc/expftext.hxx index e0d7717037fe..2fec3026780b 100644 --- a/sc/source/ui/inc/expftext.hxx +++ b/sc/source/ui/inc/expftext.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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _SC_EXPFTEXT_HXX -#define _SC_EXPFTEXT_HXX +#define _SC_EXPFTEXT_HXX #include <vcl/fixed.hxx> #include "scdllapi.h" diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index bc7ccfe135cc..bcad1a4d2e4c 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.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/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index ddd5621c558f..e32a17659029 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.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 @@ -45,75 +45,75 @@ class ScDocument; class ScFillSeriesDlg : public ModalDialog { public: - ScFillSeriesDlg( Window* pParent, - ScDocument& rDocument, - FillDir eFillDir, - FillCmd eFillCmd, - FillDateCmd eFillDateCmd, - String aStartStr, - double fStep, - double fMax, - USHORT nPossDir ); + ScFillSeriesDlg( Window* pParent, + ScDocument& rDocument, + FillDir eFillDir, + FillCmd eFillCmd, + FillDateCmd eFillDateCmd, + String aStartStr, + double fStep, + double fMax, + USHORT nPossDir ); ~ScFillSeriesDlg(); - FillDir GetFillDir() const { return theFillDir; } - FillCmd GetFillCmd() const { return theFillCmd; } - FillDateCmd GetFillDateCmd() const { return theFillDateCmd; } - double GetStart() const { return fStartVal; } - double GetStep() const { return fIncrement; } - double GetMax() const { return fEndVal; } + FillDir GetFillDir() const { return theFillDir; } + FillCmd GetFillCmd() const { return theFillCmd; } + FillDateCmd GetFillDateCmd() const { return theFillDateCmd; } + double GetStart() const { return fStartVal; } + double GetStep() const { return fIncrement; } + double GetMax() const { return fEndVal; } - String GetStartStr() const { return aEdStartVal.GetText(); } + String GetStartStr() const { return aEdStartVal.GetText(); } - void SetEdStartValEnabled(BOOL bFlag=FALSE); + void SetEdStartValEnabled(BOOL bFlag=FALSE); private: FixedLine aFlDirection; - RadioButton aBtnDown; - RadioButton aBtnRight; - RadioButton aBtnUp; - RadioButton aBtnLeft; + RadioButton aBtnDown; + RadioButton aBtnRight; + RadioButton aBtnUp; + RadioButton aBtnLeft; FixedLine aFlSep1; FixedLine aFlType; - RadioButton aBtnArithmetic; - RadioButton aBtnGeometric; - RadioButton aBtnDate; - RadioButton aBtnAutoFill; + RadioButton aBtnArithmetic; + RadioButton aBtnGeometric; + RadioButton aBtnDate; + RadioButton aBtnAutoFill; FixedLine aFlSep2; FixedLine aFlTimeUnit; - RadioButton aBtnDay; - RadioButton aBtnDayOfWeek; - RadioButton aBtnMonth; - RadioButton aBtnYear; + RadioButton aBtnDay; + RadioButton aBtnDayOfWeek; + RadioButton aBtnMonth; + RadioButton aBtnYear; - BOOL bStartValFlag; - FixedText aFtStartVal; - Edit aEdStartVal; - String aStartStrVal; + BOOL bStartValFlag; + FixedText aFtStartVal; + Edit aEdStartVal; + String aStartStrVal; - FixedText aFtEndVal; - Edit aEdEndVal; + FixedText aFtEndVal; + Edit aEdEndVal; - FixedText aFtIncrement; - Edit aEdIncrement; + FixedText aFtIncrement; + Edit aEdIncrement; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - const String errMsgInvalidVal; + const String errMsgInvalidVal; //---------------------------------------------------------- - ScDocument& rDoc; - FillDir theFillDir; - FillCmd theFillCmd; - FillDateCmd theFillDateCmd; - double fStartVal; - double fIncrement; - double fEndVal; + ScDocument& rDoc; + FillDir theFillDir; + FillCmd theFillCmd; + FillDateCmd theFillDateCmd; + double fStartVal; + double fIncrement; + double fEndVal; #ifdef _FILLDLG_CXX private: diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 44ea68f8e9c9..1088de59fa00 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.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 @@ -51,37 +51,37 @@ class TypedScStrCollection; // Gemeinsame Resource-Objekte: #define _COMMON_FILTER_RSCOBJS \ - CheckBox aBtnCase; \ - CheckBox aBtnRegExp; \ - CheckBox aBtnHeader; \ - CheckBox aBtnUnique; \ - CheckBox aBtnCopyResult; \ - ListBox aLbCopyArea; \ - formula::RefEdit aEdCopyArea; \ - formula::RefButton aRbCopyArea; \ - CheckBox aBtnDestPers; \ - FixedText aFtDbAreaLabel; \ - FixedInfo aFtDbArea; \ - const String aStrUndefined; \ - const String aStrNoName; \ - const String aStrNone; + CheckBox aBtnCase; \ + CheckBox aBtnRegExp; \ + CheckBox aBtnHeader; \ + CheckBox aBtnUnique; \ + CheckBox aBtnCopyResult; \ + ListBox aLbCopyArea; \ + formula::RefEdit aEdCopyArea; \ + formula::RefButton aRbCopyArea; \ + CheckBox aBtnDestPers; \ + FixedText aFtDbAreaLabel; \ + FixedInfo aFtDbArea; \ + const String aStrUndefined; \ + const String aStrNoName; \ + const String aStrNone; #define _INIT_COMMON_FILTER_RSCOBJS \ - aBtnCase ( this, ScResId( BTN_CASE ) ), \ - aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \ - aBtnHeader ( this, ScResId( BTN_HEADER ) ), \ - aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \ - aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \ - aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \ + aBtnCase ( this, ScResId( BTN_CASE ) ), \ + aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \ + aBtnHeader ( this, ScResId( BTN_HEADER ) ), \ + aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \ + aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \ + aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \ aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ), \ - aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \ - aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \ - aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \ - aFtDbArea ( this, ScResId( FT_DBAREA ) ), \ - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), \ - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), \ - aStrNone ( ScResId( SCSTR_NONE ) ), + aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \ + aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \ + aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \ + aFtDbArea ( this, ScResId( FT_DBAREA ) ), \ + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), \ + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), \ + aStrNone ( ScResId( SCSTR_NONE ) ), //============================================================================ @@ -89,46 +89,46 @@ class ScFilterDlg : public ScAnyRefDlg { public: ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet& rArgSet ); ~ScFilterDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); - virtual BOOL Close(); - void SliderMoved(); - USHORT GetSliderPos(); - void RefreshEditRow( USHORT nOffset ); + virtual BOOL Close(); + void SliderMoved(); + USHORT GetSliderPos(); + void RefreshEditRow( USHORT nOffset ); private: FixedLine aFlCriteria; //---------------------------- - ListBox aLbConnect1; - ListBox aLbField1; - ListBox aLbCond1; - ComboBox aEdVal1; + ListBox aLbConnect1; + ListBox aLbField1; + ListBox aLbCond1; + ComboBox aEdVal1; //---------------------------- - ListBox aLbConnect2; - ListBox aLbField2; - ListBox aLbCond2; - ComboBox aEdVal2; + ListBox aLbConnect2; + ListBox aLbField2; + ListBox aLbCond2; + ComboBox aEdVal2; //---------------------------- - ListBox aLbConnect3; - ListBox aLbField3; - ListBox aLbCond3; - ComboBox aEdVal3; + ListBox aLbConnect3; + ListBox aLbField3; + ListBox aLbCond3; + ComboBox aEdVal3; //---------------------------- - ListBox aLbConnect4; - ListBox aLbField4; - ListBox aLbCond4; - ComboBox aEdVal4; + ListBox aLbConnect4; + ListBox aLbField4; + ListBox aLbCond4; + ComboBox aEdVal4; //---------------------------- - FixedText aFtConnect; - FixedText aFtField; - FixedText aFtCond; - FixedText aFtVal; + FixedText aFtConnect; + FixedText aFtField; + FixedText aFtCond; + FixedText aFtVal; FixedLine aFlSeparator; ScrollBar aScrollBar; @@ -141,56 +141,56 @@ private: _COMMON_FILTER_RSCOBJS - const String aStrEmpty; - const String aStrNotEmpty; - const String aStrRow; - const String aStrColumn; + const String aStrEmpty; + const String aStrNotEmpty; + const String aStrRow; + const String aStrColumn; - ScFilterOptionsMgr* pOptionsMgr; + ScFilterOptionsMgr* pOptionsMgr; - const USHORT nWhichQuery; - const ScQueryParam theQueryData; - ScQueryItem* pOutItem; - ScViewData* pViewData; - ScDocument* pDoc; - SCTAB nSrcTab; + const USHORT nWhichQuery; + const ScQueryParam theQueryData; + ScQueryItem* pOutItem; + ScViewData* pViewData; + ScDocument* pDoc; + SCTAB nSrcTab; - ComboBox* aValueEdArr[4]; - ListBox* aFieldLbArr[4]; - ListBox* aCondLbArr[4]; - ListBox* aConnLbArr[4]; + ComboBox* aValueEdArr[4]; + ListBox* aFieldLbArr[4]; + ListBox* aCondLbArr[4]; + ListBox* aConnLbArr[4]; bool mbHasDates[MAXQUERY]; BOOL bRefreshExceptQuery[MAXQUERY]; - USHORT nFieldCount; - BOOL bRefInputMode; + USHORT nFieldCount; + BOOL bRefInputMode; - TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; - USHORT nHeaderPos[MAXCOLCOUNT]; + TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; + USHORT nHeaderPos[MAXCOLCOUNT]; // Hack: RefInput-Kontrolle - Timer* pTimer; + Timer* pTimer; #ifdef _FILTDLG_CXX private: - void Init ( const SfxItemSet& rArgSet ); - void FillFieldLists (); - void FillAreaList (); - void UpdateValueList ( USHORT nList ); - void UpdateHdrInValueList( USHORT nList ); - void ClearValueList ( USHORT nList ); - USHORT GetFieldSelPos ( SCCOL nField ); - ScQueryItem* GetOutputItem (); + void Init ( const SfxItemSet& rArgSet ); + void FillFieldLists (); + void FillAreaList (); + void UpdateValueList ( USHORT nList ); + void UpdateHdrInValueList( USHORT nList ); + void ClearValueList ( USHORT nList ); + USHORT GetFieldSelPos ( SCCOL nField ); + ScQueryItem* GetOutputItem (); // Handler: - DECL_LINK( LbSelectHdl, ListBox* ); + DECL_LINK( LbSelectHdl, ListBox* ); DECL_LINK( ValModifyHdl, ComboBox* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK( CheckBoxHdl, CheckBox* ); + DECL_LINK( EndDlgHdl, Button* ); DECL_LINK( MoreClickHdl, MoreButton* ); DECL_LINK( ScrollHdl, ScrollBar* ); // Hack: RefInput-Kontrolle - DECL_LINK( TimeOutHdl, Timer* ); + DECL_LINK( TimeOutHdl, Timer* ); #endif }; @@ -200,21 +200,21 @@ class ScSpecialFilterDlg : public ScAnyRefDlg { public: ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet& rArgSet ); ~ScSpecialFilterDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL Close(); private: - ListBox aLbFilterArea; - FixedText aFtFilterArea; - formula::RefEdit aEdFilterArea; - formula::RefButton aRbFilterArea; + ListBox aLbFilterArea; + FixedText aFtFilterArea; + formula::RefEdit aEdFilterArea; + formula::RefButton aRbFilterArea; FixedLine aFlOptions; @@ -225,34 +225,34 @@ private: HelpButton aBtnHelp; MoreButton aBtnMore; - ScFilterOptionsMgr* pOptionsMgr; + ScFilterOptionsMgr* pOptionsMgr; - const USHORT nWhichQuery; - const ScQueryParam theQueryData; - ScQueryItem* pOutItem; - ScViewData* pViewData; - ScDocument* pDoc; + const USHORT nWhichQuery; + const ScQueryParam theQueryData; + ScQueryItem* pOutItem; + ScViewData* pViewData; + ScDocument* pDoc; - formula::RefEdit* pRefInputEdit; - BOOL bRefInputMode; + formula::RefEdit* pRefInputEdit; + BOOL bRefInputMode; // Hack: RefInput-Kontrolle - Timer* pTimer; + Timer* pTimer; #ifdef _SFILTDLG_CXX private: - void Init( const SfxItemSet& rArgSet ); - ScQueryItem* GetOutputItem( const ScQueryParam& rParam, + void Init( const SfxItemSet& rArgSet ); + ScQueryItem* GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ); // Handler DECL_LINK( FilterAreaSelHdl, ListBox* ); DECL_LINK( FilterAreaModHdl, formula::RefEdit* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK( EndDlgHdl, Button* ); DECL_LINK( ScrollHdl, ScrollBar* ); // Hack: RefInput-Kontrolle - DECL_LINK( TimeOutHdl, Timer* ); + DECL_LINK( TimeOutHdl, Timer* ); #endif }; diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc index 508c5af9aab5..9d708c9799c5 100644 --- a/sc/source/ui/inc/filter.hrc +++ b/sc/source/ui/inc/filter.hrc @@ -1,7 +1,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 @@ -24,59 +24,59 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "sc.hrc" // -> RID_SCDLG_FILTER +#include "sc.hrc" // -> RID_SCDLG_FILTER // -> RID_SCDLG_SPEC_FILTER // -> RID_SCDLG_PIVOTFILTER // allgemein -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 #define BTN_MORE 1 -#define BTN_UNIQUE 1 -#define BTN_CASE 2 -#define BTN_REGEXP 3 -#define BTN_HEADER 4 -#define BTN_COPY_RESULT 5 -#define LB_COPY_AREA 6 -#define ED_COPY_AREA 7 -#define RB_COPY_AREA 8 +#define BTN_UNIQUE 1 +#define BTN_CASE 2 +#define BTN_REGEXP 3 +#define BTN_HEADER 4 +#define BTN_COPY_RESULT 5 +#define LB_COPY_AREA 6 +#define ED_COPY_AREA 7 +#define RB_COPY_AREA 8 #define FL_OPTIONS 9 -#define FT_DBAREA_LABEL 10 -#define FT_DBAREA 11 -#define BTN_DEST_PERS 12 +#define FT_DBAREA_LABEL 10 +#define FT_DBAREA 11 +#define BTN_DEST_PERS 12 // Filter: -#define FT_OP 20 -#define FT_FIELD 21 -#define FT_COND 22 -#define FT_VAL 23 -#define LB_FIELD1 24 -#define LB_FIELD2 25 -#define LB_FIELD3 26 -#define LB_OP1 27 -#define LB_OP2 28 -#define LB_COND1 29 -#define LB_COND2 30 -#define LB_COND3 31 -#define ED_VAL1 32 -#define ED_VAL2 33 -#define ED_VAL3 34 +#define FT_OP 20 +#define FT_FIELD 21 +#define FT_COND 22 +#define FT_VAL 23 +#define LB_FIELD1 24 +#define LB_FIELD2 25 +#define LB_FIELD3 26 +#define LB_OP1 27 +#define LB_OP2 28 +#define LB_COND1 29 +#define LB_COND2 30 +#define LB_COND3 31 +#define ED_VAL1 32 +#define ED_VAL2 33 +#define ED_VAL3 34 #define FL_CRITERIA 35 #define FL_SEPARATOR 36 -#define LB_OP3 37 -#define LB_FIELD4 38 -#define LB_COND4 39 -#define ED_VAL4 40 +#define LB_OP3 37 +#define LB_FIELD4 38 +#define LB_COND4 39 +#define ED_VAL4 40 #define LB_SCROLL 41 -#define LB_OP4 42 +#define LB_OP4 42 // Spezialfilter -#define FT_CRITERIA_AREA 50 -#define LB_CRITERIA_AREA 51 -#define ED_CRITERIA_AREA 52 -#define RB_CRITERIA_AREA 53 +#define FT_CRITERIA_AREA 50 +#define LB_CRITERIA_AREA 51 +#define ED_CRITERIA_AREA 52 +#define RB_CRITERIA_AREA 53 diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 18164f1b7d35..55387daa5763 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.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 @@ -52,60 +52,60 @@ class ScViewData; class ScFilterOptionsMgr { public: - ScFilterOptionsMgr( Dialog* ptrDlg, - ScViewData* ptrViewData, - const ScQueryParam& refQueryData, - MoreButton& refBtnMore, - CheckBox& refBtnCase, - CheckBox& refBtnRegExp, - CheckBox& refBtnHeader, - CheckBox& refBtnUnique, - CheckBox& refBtnCopyResult, - CheckBox& refBtnDestPers, - ListBox& refLbCopyArea, - Edit& refEdCopyArea, - formula::RefButton& refRbCopyArea, - FixedText& refFtDbAreaLabel, - FixedInfo& refFtDbArea, + ScFilterOptionsMgr( Dialog* ptrDlg, + ScViewData* ptrViewData, + const ScQueryParam& refQueryData, + MoreButton& refBtnMore, + CheckBox& refBtnCase, + CheckBox& refBtnRegExp, + CheckBox& refBtnHeader, + CheckBox& refBtnUnique, + CheckBox& refBtnCopyResult, + CheckBox& refBtnDestPers, + ListBox& refLbCopyArea, + Edit& refEdCopyArea, + formula::RefButton& refRbCopyArea, + FixedText& refFtDbAreaLabel, + FixedInfo& refFtDbArea, FixedLine& refFlOptions, - const String& refStrNoName, - const String& refStrUndefined ); + const String& refStrNoName, + const String& refStrUndefined ); ~ScFilterOptionsMgr(); - BOOL VerifyPosStr ( const String& rPosStr ) const; + BOOL VerifyPosStr ( const String& rPosStr ) const; private: - Dialog* pDlg; - ScViewData* pViewData; - ScDocument* pDoc; - - MoreButton& rBtnMore; - CheckBox& rBtnCase; - CheckBox& rBtnRegExp; - CheckBox& rBtnHeader; - CheckBox& rBtnUnique; - CheckBox& rBtnCopyResult; - CheckBox& rBtnDestPers; - ListBox& rLbCopyPos; - Edit& rEdCopyPos; - formula::RefButton& rRbCopyPos; - FixedText& rFtDbAreaLabel; - FixedInfo& rFtDbArea; + Dialog* pDlg; + ScViewData* pViewData; + ScDocument* pDoc; + + MoreButton& rBtnMore; + CheckBox& rBtnCase; + CheckBox& rBtnRegExp; + CheckBox& rBtnHeader; + CheckBox& rBtnUnique; + CheckBox& rBtnCopyResult; + CheckBox& rBtnDestPers; + ListBox& rLbCopyPos; + Edit& rEdCopyPos; + formula::RefButton& rRbCopyPos; + FixedText& rFtDbAreaLabel; + FixedInfo& rFtDbArea; FixedLine& rFlOptions; - const String& rStrNoName; - const String& rStrUndefined; + const String& rStrNoName; + const String& rStrUndefined; - const ScQueryParam& rQueryData; + const ScQueryParam& rQueryData; #ifdef _FOPTMGR_CXX private: void Init(); // Handler: - DECL_LINK( EdPosModifyHdl, Edit* ); - DECL_LINK( LbPosSelHdl, ListBox* ); - DECL_LINK( BtnCopyResultHdl, CheckBox* ); + DECL_LINK( EdPosModifyHdl, Edit* ); + DECL_LINK( LbPosSelHdl, ListBox* ); + DECL_LINK( BtnCopyResultHdl, CheckBox* ); #endif }; diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx index 7dc1919ea30e..890e25158dfd 100644 --- a/sc/source/ui/inc/formatsh.hxx +++ b/sc/source/ui/inc/formatsh.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 @@ -42,7 +42,7 @@ class ScFormatShell: public SfxShell protected: - ScViewData* GetViewData(){return pViewData;} + ScViewData* GetViewData(){return pViewData;} const ScViewData* GetViewData() const {return pViewData;} public: @@ -51,24 +51,24 @@ public: SFX_DECL_INTERFACE(SCID_FORMAT_SHELL) ScFormatShell(ScViewData* pData); - virtual ~ScFormatShell(); + virtual ~ScFormatShell(); - void ExecuteNumFormat( SfxRequest& rReq ); - void GetNumFormatState( SfxItemSet& rSet ); + void ExecuteNumFormat( SfxRequest& rReq ); + void GetNumFormatState( SfxItemSet& rSet ); - void ExecuteAttr( SfxRequest& rReq ); - void GetAttrState( SfxItemSet& rSet ); + void ExecuteAttr( SfxRequest& rReq ); + void GetAttrState( SfxItemSet& rSet ); - void ExecuteAlignment( SfxRequest& rReq ); + void ExecuteAlignment( SfxRequest& rReq ); - void ExecuteTextAttr( SfxRequest& rReq ); - void GetTextAttrState( SfxItemSet& rSet ); + void ExecuteTextAttr( SfxRequest& rReq ); + void GetTextAttrState( SfxItemSet& rSet ); - void GetAlignState( SfxItemSet& rSet ); - void GetBorderState( SfxItemSet& rSet ); + void GetAlignState( SfxItemSet& rSet ); + void GetBorderState( SfxItemSet& rSet ); - void ExecuteStyle( SfxRequest& rReq ); - void GetStyleState( SfxItemSet& rSet ); + void ExecuteStyle( SfxRequest& rReq ); + void GetStyleState( SfxItemSet& rSet ); void ExecuteTextDirection( SfxRequest& rReq ); void GetTextDirectionState( SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 395809357763..f5abbf80bccb 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.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 @@ -43,22 +43,22 @@ public: ScFormEditData(); virtual ~ScFormEditData(); - ScInputHandler* GetInputHandler() { return pInputHandler;} - ScDocShell* GetDocShell() { return pScDocShell;} + ScInputHandler* GetInputHandler() { return pInputHandler;} + ScDocShell* GetDocShell() { return pScDocShell;} - void SetInputHandler(ScInputHandler* pHdl) { pInputHandler=pHdl;} - void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;} + void SetInputHandler(ScInputHandler* pHdl) { pInputHandler=pHdl;} + void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;} - virtual void SaveValues(); + virtual void SaveValues(); private: ScFormEditData( const ScFormEditData& ); -// const ScFormEditData& operator=( const ScFormEditData& r ); +// const ScFormEditData& operator=( const ScFormEditData& r ); - ScInputHandler* pInputHandler; - ScDocShell* pScDocShell; + ScInputHandler* pInputHandler; + ScDocShell* pScDocShell; }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index ea8298bea0ef..168c07bccb90 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.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 @@ -30,7 +30,7 @@ #define SC_FORMULA_HXX #include "anyrefdg.hxx" -#include "global.hxx" // ScAddress +#include "global.hxx" // ScAddress #include <svtools/stdctrl.hxx> #include <vcl/lstbox.hxx> #include <vcl/group.hxx> @@ -67,12 +67,12 @@ class ScFormulaDlg : public formula::FormulaDlg, public formula::IFormulaEditorHelper { ScFormulaReferenceHelper m_aHelper; - ScFormulaCell* pCell; + ScFormulaCell* pCell; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> m_xParser; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; - static ScDocument* pDoc; - static ScAddress aCursorPos; + static ScDocument* pDoc; + static ScAddress aCursorPos; public: ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* pViewData ,formula::IFunctionManager* _pFunctionMgr); @@ -83,7 +83,7 @@ public: virtual void fill(); virtual bool calculateValue(const String& _sExpression,String& _rResult); virtual void doClose(BOOL _bOk); - virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); + virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); virtual void showReference(const String& _sFormula); virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked); virtual void setDispatcherLock( BOOL bLock ); @@ -103,7 +103,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const; virtual ::com::sun::star::table::CellAddress getReferencePosition() const; - virtual BOOL Close(); + virtual BOOL Close(); // sc::IAnyRefDialog virtual void ShowReference(const String& _sRef); @@ -123,9 +123,9 @@ public: protected: virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - ULONG FindFocusWin(Window *pWin); - void SaveLRUEntry(const ScFuncDesc* pFuncDesc); - void HighlightFunctionParas(const String& aFormula); + ULONG FindFocusWin(Window *pWin); + void SaveLRUEntry(const ScFuncDesc* pFuncDesc); + void HighlightFunctionParas(const String& aFormula); BOOL IsInputHdl(ScInputHandler* pHdl); ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index 29a058d5196b..40ebb26b241a 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.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 @@ -50,8 +50,8 @@ class FuConstArc : public FuConstruct virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -59,6 +59,6 @@ class FuConstArc : public FuConstruct -#endif // _SD_FUCONARC_HXX +#endif // _SD_FUCONARC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 0a64a8a91aab..e01242eae2b2 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.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 @@ -48,8 +48,8 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject( const sal_uInt16 nID, const Rectangle& rRectangle ); diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index caf92263c394..95ad7b6af87a 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.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 @@ -52,14 +52,14 @@ class FuConstPolygon : public FuConstruct virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); }; -#endif // _FUCONPOL_HXX +#endif // _FUCONPOL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index b447bc846c0a..724cf4fd6550 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.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 @@ -50,8 +50,8 @@ class FuConstRectangle : public FuConstruct virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -59,6 +59,6 @@ class FuConstRectangle : public FuConstruct -#endif // _SD_FUCONREC_HXX +#endif // _SD_FUCONREC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 66c55a981caf..bda74eec7753 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.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 @@ -34,7 +34,7 @@ /************************************************************************/ -#define MIN_FREEHAND_DISTANCE 10 +#define MIN_FREEHAND_DISTANCE 10 /************************************************************************* @@ -59,12 +59,12 @@ class FuConstruct : public FuDraw BOOL SimpleMouseButtonUp(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; -#endif // _SD_FUCONSTR_HXX +#endif // _SD_FUCONSTR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 3e1c90924e16..bc68a5825eb2 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.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 @@ -55,8 +55,8 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -64,6 +64,6 @@ public: -#endif // _SD_FUCONCTL_HXX +#endif // _SD_FUCONCTL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 5c0ac0c204c4..7ab6415cef42 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.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 @@ -69,12 +69,12 @@ class FuDraw : public FuPoor BOOL IsSizingOrMovingNote( const MouseEvent& rMEvt ) const; private: - void DoModifiers(const MouseEvent& rMEvt); - void ResetModifiers(); + void DoModifiers(const MouseEvent& rMEvt); + void ResetModifiers(); }; -#endif // _SD_FUDRAW_HXX +#endif // _SD_FUDRAW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuedipo.hxx b/sc/source/ui/inc/fuedipo.hxx index 3b27834f7a56..8e3bed4150b6 100644 --- a/sc/source/ui/inc/fuedipo.hxx +++ b/sc/source/ui/inc/fuedipo.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 @@ -51,12 +51,12 @@ class FuEditPoints : public FuDraw virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; -#endif // _SD_FUEDIPO_HXX +#endif // _SD_FUEDIPO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index 2964971244d6..009096a5d4e2 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.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 @@ -39,8 +39,8 @@ class FuInsertGraphic : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertGraphic(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; /************************************************************************/ @@ -52,8 +52,8 @@ class FuInsertOLE : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertOLE(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; /************************************************************************/ @@ -65,8 +65,8 @@ class FuInsertChart : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertChart(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; /************************************************************************/ @@ -78,10 +78,10 @@ class FuInsertMedia : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertMedia(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; -#endif // _SD_FUINSERT_HXX +#endif // _SD_FUINSERT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx index 61d287ea30f4..25b2ec84def5 100644 --- a/sc/source/ui/inc/fumark.hxx +++ b/sc/source/ui/inc/fumark.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 @@ -30,7 +30,7 @@ #define SC_FUMARK_HXX #include "fupoor.hxx" -#include "rangelst.hxx" // ScRangeListRef +#include "rangelst.hxx" // ScRangeListRef /************************************************************************* @@ -42,11 +42,11 @@ class FuMarkRect : public FuPoor { protected: - Point aBeginPos; - Rectangle aZoomRect; - BOOL bVisible; - BOOL bStartDrag; - ScRangeListRef aSourceRange; + Point aBeginPos; + Rectangle aZoomRect; + BOOL bVisible; + BOOL bStartDrag; + ScRangeListRef aSourceRange; public: FuMarkRect(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 799f5e260645..45198a31a3a2 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.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 @@ -30,7 +30,7 @@ #define SC_FUNCPAGE_HXX #include "funcutl.hxx" -#include "global.hxx" // ScAddress +#include "global.hxx" // ScAddress #include <svtools/stdctrl.hxx> #include <vcl/lstbox.hxx> #include <vcl/group.hxx> @@ -64,8 +64,8 @@ class ScListBox : public ListBox { protected: - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); public: ScListBox( Window* pParent, const ResId& rResId ); @@ -79,15 +79,15 @@ class ScFuncPage : public TabPage { private: - Link aDoubleClickLink; - Link aSelectionLink; - FixedText aFtCategory; - ListBox aLbCategory; - FixedText aFtFunction; - ScListBox aLbFunction; - ImageButton aIBFunction; + Link aDoubleClickLink; + Link aSelectionLink; + FixedText aFtCategory; + ListBox aLbCategory; + FixedText aFtFunction; + ScListBox aLbFunction; + ImageButton aIBFunction; - const ScFuncDesc* aLRUList[LRU_MAX]; + const ScFuncDesc* aLRUList[LRU_MAX]; DECL_LINK( SelHdl, ListBox* ); @@ -95,24 +95,24 @@ private: protected: - void UpdateFunctionList(); - void InitLRUList(); + void UpdateFunctionList(); + void InitLRUList(); public: ScFuncPage( Window* pParent); - void SetCategory(USHORT nCat); - void SetFunction(USHORT nFunc); - void SetFocus(); - USHORT GetCategory(); - USHORT GetFunction(); - USHORT GetFunctionEntryCount(); + void SetCategory(USHORT nCat); + void SetFunction(USHORT nFunc); + void SetFocus(); + USHORT GetCategory(); + USHORT GetFunction(); + USHORT GetFunctionEntryCount(); - USHORT GetFuncPos(const ScFuncDesc*); - const ScFuncDesc* GetFuncDesc( USHORT nPos ) const; - String GetSelFunctionName() const; + USHORT GetFuncPos(const ScFuncDesc*); + const ScFuncDesc* GetFuncDesc( USHORT nPos ) const; + String GetSelFunctionName() const; void SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; } const Link& GetDoubleClickHdl() const { return aDoubleClickLink; } diff --git a/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxx index afa8e1f5c853..76c168ccabae 100644 --- a/sc/source/ui/inc/funcutl.hxx +++ b/sc/source/ui/inc/funcutl.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 @@ -32,7 +32,7 @@ #include <vcl/scrbar.hxx> #include <vcl/fixed.hxx> #include <svtools/svmedit.hxx> -#include "anyrefdg.hxx" // formula::RefButton +#include "anyrefdg.hxx" // formula::RefButton //============================================================================ @@ -43,14 +43,14 @@ class ValWnd : public Window public: ValWnd( Window* pParent, const ResId& rId ); - void SetValue( const String& rStrVal ); + void SetValue( const String& rStrVal ); protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); private: - String aStrValue; - Rectangle aRectOut; + String aStrValue; + Rectangle aRectOut; }; @@ -61,18 +61,18 @@ class ScEditBox : public Control { private: - MultiLineEdit* pMEdit; - Link aSelChangedLink; - Selection aOldSel; - BOOL bMouseFlag; + MultiLineEdit* pMEdit; + Link aSelChangedLink; + Selection aOldSel; + BOOL bMouseFlag; DECL_LINK( ChangedHdl, ScEditBox* ); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void SelectionChanged(); - virtual void Resize(); - virtual void GetFocus(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void SelectionChanged(); + virtual void Resize(); + virtual void GetFocus(); public: @@ -80,12 +80,12 @@ public: ~ScEditBox(); - MultiLineEdit* GetEdit() {return pMEdit;} + MultiLineEdit* GetEdit() {return pMEdit;} void SetSelChangedHdl( const Link& rLink ) { aSelChangedLink = rLink; } const Link& GetSelChangedHdl() const { return aSelChangedLink; } - void UpdateOldSel(); + void UpdateOldSel(); }; @@ -98,17 +98,17 @@ class ArgEdit : public formula::RefEdit public: ArgEdit( Window* pParent, const ResId& rResId ); - void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, + void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, ScrollBar& rArgSlider, USHORT nArgCount ); protected: - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); private: - ArgEdit* pEdPrev; - ArgEdit* pEdNext; - ScrollBar* pSlider; - USHORT nArgs; + ArgEdit* pEdPrev; + ArgEdit* pEdNext; + ScrollBar* pSlider; + USHORT nArgs; }; @@ -119,53 +119,53 @@ class ArgInput { private: - Link aFxClickLink; - Link aRefClickLink; - Link aFxFocusLink; - Link aRefFocusLink; - Link aEdFocusLink; - Link aEdModifyLink; - - FixedText* pFtArg; - ImageButton* pBtnFx; - ArgEdit* pEdArg; - formula::RefButton* pRefBtn; - - DECL_LINK( FxBtnClickHdl, ImageButton* ); - DECL_LINK( RefBtnClickHdl,formula::RefButton* ); - DECL_LINK( FxBtnFocusHdl, ImageButton* ); - DECL_LINK( RefBtnFocusHdl,formula::RefButton* ); - DECL_LINK( EdFocusHdl, ArgEdit* ); - DECL_LINK( EdModifyHdl,ArgEdit* ); + Link aFxClickLink; + Link aRefClickLink; + Link aFxFocusLink; + Link aRefFocusLink; + Link aEdFocusLink; + Link aEdModifyLink; + + FixedText* pFtArg; + ImageButton* pBtnFx; + ArgEdit* pEdArg; + formula::RefButton* pRefBtn; + + DECL_LINK( FxBtnClickHdl, ImageButton* ); + DECL_LINK( RefBtnClickHdl,formula::RefButton* ); + DECL_LINK( FxBtnFocusHdl, ImageButton* ); + DECL_LINK( RefBtnFocusHdl,formula::RefButton* ); + DECL_LINK( EdFocusHdl, ArgEdit* ); + DECL_LINK( EdModifyHdl,ArgEdit* ); protected: - virtual void FxClick(); - virtual void RefClick(); - virtual void FxFocus(); - virtual void RefFocus(); - virtual void EdFocus(); - virtual void EdModify(); + virtual void FxClick(); + virtual void RefClick(); + virtual void FxFocus(); + virtual void RefFocus(); + virtual void EdFocus(); + virtual void EdModify(); public: ArgInput(); - void InitArgInput ( FixedText* pftArg, - ImageButton* pbtnFx, - ArgEdit* pedArg, - formula::RefButton* prefBtn); + void InitArgInput ( FixedText* pftArg, + ImageButton* pbtnFx, + ArgEdit* pedArg, + formula::RefButton* prefBtn); - void SetArgName(const String &aArg); - String GetArgName(); - void SetArgNameFont(const Font&); + void SetArgName(const String &aArg); + String GetArgName(); + void SetArgNameFont(const Font&); - void SetArgVal(const String &aVal); - String GetArgVal(); + void SetArgVal(const String &aVal); + String GetArgVal(); - void SetArgSelection (const Selection& rSel ); + void SetArgSelection (const Selection& rSel ); - ArgEdit* GetArgEdPtr() {return pEdArg;} + ArgEdit* GetArgEdPtr() {return pEdArg;} void SetFxClickHdl( const Link& rLink ) { aFxClickLink = rLink; } diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 279d6e1873cf..a0939828e67c 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.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 @@ -42,10 +42,10 @@ class Dialog; // #98185# Create default drawing objects via keyboard class SdrObject; -// Return-Werte fuer Command -#define SC_CMD_NONE 0 -#define SC_CMD_USED 1 -#define SC_CMD_IGNORE 2 +// Return-Werte fuer Command +#define SC_CMD_NONE 0 +#define SC_CMD_USED 1 +#define SC_CMD_IGNORE 2 /************************************************************************* |* @@ -56,28 +56,28 @@ class SdrObject; class FuPoor { protected: - ScDrawView* pView; - ScTabViewShell* pViewShell; - Window* pWindow; - SdrModel* pDrDoc; + ScDrawView* pView; + ScTabViewShell* pViewShell; + Window* pWindow; + SdrModel* pDrDoc; - SfxRequest aSfxRequest; - Dialog* pDialog; + SfxRequest aSfxRequest; + Dialog* pDialog; - Timer aScrollTimer; // fuer Autoscrolling + Timer aScrollTimer; // fuer Autoscrolling DECL_LINK( ScrollHdl, Timer * ); void ForceScroll(const Point& aPixPos); - Timer aDragTimer; // fuer Drag&Drop + Timer aDragTimer; // fuer Drag&Drop DECL_LINK( DragTimerHdl, Timer * ); DECL_LINK( DragHdl, void * ); - BOOL bIsInDragMode; - Point aMDPos; // Position von MouseButtonDown + BOOL bIsInDragMode; + Point aMDPos; // Position von MouseButtonDown // #95491# member to hold state of the mouse buttons for creation // of own MouseEvents (like in ScrollHdl) private: - sal_uInt16 mnCode; + sal_uInt16 mnCode; public: FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, @@ -106,19 +106,19 @@ public: virtual BYTE Command(const CommandEvent& rCEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren - virtual void ScrollStart() {} // diese Funktionen werden von - virtual void ScrollEnd() {} // ForceScroll aufgerufen + virtual void ScrollStart() {} // diese Funktionen werden von + virtual void ScrollEnd() {} // ForceScroll aufgerufen void SetWindow(Window* pWin) { pWindow = pWin; } USHORT GetSlotID() const { return( aSfxRequest.GetSlot() ); } - BOOL IsDetectiveHit( const Point& rLogicPos ); + BOOL IsDetectiveHit( const Point& rLogicPos ); - void StopDragTimer(); + void StopDragTimer(); // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -133,6 +133,6 @@ public: -#endif // _SD_FUPOOR_HXX +#endif // _SD_FUPOOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 20887a6d151a..993275a39207 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.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 @@ -59,18 +59,18 @@ public: virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); virtual BYTE Command(const CommandEvent& rCEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren void ActivateNoteHandles(SdrObject* pObj); protected: -// Outliner* pOutliner; -// OutlinerView* pOutlinerView; - BOOL bVCAction; +// Outliner* pOutliner; +// OutlinerView* pOutlinerView; + BOOL bVCAction; private: - BOOL TestDetective( SdrPageView* pPV, const Point& rPos ); // -> fusel2 + BOOL TestDetective( SdrPageView* pPV, const Point& rPos ); // -> fusel2 bool IsNoteCaptionMarked() const; bool IsNoteCaptionClicked( const Point& rPos ) const; @@ -78,6 +78,6 @@ private: -#endif // _SD_FUSEL_HXX +#endif // _SD_FUSEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index aa1290ae28e1..273ba41cb41c 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.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 @@ -43,8 +43,8 @@ class SdrOutliner; class FuText : public FuConstruct { protected: -// USHORT nOldObjectBar; - SdrTextObj* pTextObj; +// USHORT nOldObjectBar; + SdrTextObj* pTextObj; public: FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, @@ -57,17 +57,17 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren virtual void ForcePointer(const MouseEvent* pMEvt); virtual void SelectionHasChanged(); - void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL, + void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL, BOOL bCursorToEnd = FALSE, const KeyEvent* pInitialKey = NULL ); - void StopEditMode(BOOL bTextDirection = FALSE); - void StopDragMode(SdrObject* pObject); + void StopEditMode(BOOL bTextDirection = FALSE); + void StopDragMode(SdrObject* pObject); // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx index 64c3e053368b..76899f235cba 100644 --- a/sc/source/ui/inc/graphsh.hxx +++ b/sc/source/ui/inc/graphsh.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 @@ -46,13 +46,13 @@ public: SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL) ScGraphicShell(ScViewData* pData); - virtual ~ScGraphicShell(); + virtual ~ScGraphicShell(); - void Execute(SfxRequest& rReq); - void GetAttrState(SfxItemSet &rSet); + void Execute(SfxRequest& rReq); + void GetAttrState(SfxItemSet &rSet); - void ExecuteFilter(SfxRequest& rReq); - void GetFilterState(SfxItemSet &rSet); + void ExecuteFilter(SfxRequest& rReq); + void GetFilterState(SfxItemSet &rSet); }; #endif diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx index d8cd2d16b7b4..bc95f05abce0 100644 --- a/sc/source/ui/inc/gridmerg.hxx +++ b/sc/source/ui/inc/gridmerg.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 @@ -36,26 +36,26 @@ class OutputDevice; class ScGridMerger { private: - OutputDevice* pDev; - long nOneX; - long nOneY; - long nFixStart; - long nFixEnd; - long nVarStart; - long nVarDiff; - long nCount; - BOOL bVertical; - BOOL bOptimize; + OutputDevice* pDev; + long nOneX; + long nOneY; + long nFixStart; + long nFixEnd; + long nVarStart; + long nVarDiff; + long nCount; + BOOL bVertical; + BOOL bOptimize; - void AddLine( long nStart, long nEnd, long nPos ); + void AddLine( long nStart, long nEnd, long nPos ); public: ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePixelY ); ~ScGridMerger(); - void AddHorLine( long nX1, long nX2, long nY ); - void AddVerLine( long nX, long nY1, long nY2 ); - void Flush(); + void AddHorLine( long nX1, long nX2, long nY ); + void AddVerLine( long nX, long nY1, long nY2 ); + void Flush(); }; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 294287aada3e..4bd6cede84ef 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.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 @@ -60,36 +60,36 @@ class SdrHdlList; class ScTransferObj; struct SpellCallbackInfo; - // Maus-Status (nMouseStatus) + // Maus-Status (nMouseStatus) -#define SC_GM_NONE 0 -#define SC_GM_TABDOWN 1 -#define SC_GM_DBLDOWN 2 -#define SC_GM_FILTER 3 -#define SC_GM_IGNORE 4 -#define SC_GM_WATERUNDO 5 -#define SC_GM_URLDOWN 6 +#define SC_GM_NONE 0 +#define SC_GM_TABDOWN 1 +#define SC_GM_DBLDOWN 2 +#define SC_GM_FILTER 3 +#define SC_GM_IGNORE 4 +#define SC_GM_WATERUNDO 5 +#define SC_GM_URLDOWN 6 - // Page-Drag-Modus + // Page-Drag-Modus -#define SC_PD_NONE 0 -#define SC_PD_RANGE_L 1 -#define SC_PD_RANGE_R 2 -#define SC_PD_RANGE_T 4 -#define SC_PD_RANGE_B 8 -#define SC_PD_RANGE_TL (SC_PD_RANGE_T|SC_PD_RANGE_L) -#define SC_PD_RANGE_TR (SC_PD_RANGE_T|SC_PD_RANGE_R) -#define SC_PD_RANGE_BL (SC_PD_RANGE_B|SC_PD_RANGE_L) -#define SC_PD_RANGE_BR (SC_PD_RANGE_B|SC_PD_RANGE_R) -#define SC_PD_BREAK_H 16 -#define SC_PD_BREAK_V 32 +#define SC_PD_NONE 0 +#define SC_PD_RANGE_L 1 +#define SC_PD_RANGE_R 2 +#define SC_PD_RANGE_T 4 +#define SC_PD_RANGE_B 8 +#define SC_PD_RANGE_TL (SC_PD_RANGE_T|SC_PD_RANGE_L) +#define SC_PD_RANGE_TR (SC_PD_RANGE_T|SC_PD_RANGE_R) +#define SC_PD_RANGE_BL (SC_PD_RANGE_B|SC_PD_RANGE_L) +#define SC_PD_RANGE_BR (SC_PD_RANGE_B|SC_PD_RANGE_R) +#define SC_PD_BREAK_H 16 +#define SC_PD_BREAK_V 32 class ScHideTextCursor { private: - ScViewData* pViewData; - ScSplitPos eWhich; + ScViewData* pViewData; + ScSplitPos eWhich; public: ScHideTextCursor( ScViewData* pData, ScSplitPos eW ); @@ -102,12 +102,12 @@ namespace sdr { namespace overlay { class OverlayObjectList; }} class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHelper { - // ScFilterListBox wird immer fuer Auswahlliste benutzt + // ScFilterListBox wird immer fuer Auswahlliste benutzt friend class ScFilterListBox; private: // #114409# - ::sdr::overlay::OverlayObjectList* mpOOCursors; + ::sdr::overlay::OverlayObjectList* mpOOCursors; ::sdr::overlay::OverlayObjectList* mpOOSelection; ::sdr::overlay::OverlayObjectList* mpOOSelectionBorder; ::sdr::overlay::OverlayObjectList* mpOOAutoFill; @@ -117,9 +117,9 @@ private: ::boost::shared_ptr<Rectangle> mpAutoFillRect; - /** - * Stores current visible column and row ranges, used to avoid expensive - * operations on objects that are outside visible area. + /** + * Stores current visible column and row ranges, used to avoid expensive + * operations on objects that are outside visible area. */ struct VisibleRange { @@ -135,185 +135,185 @@ private: VisibleRange maVisibleRange; private: - ScViewData* pViewData; - ScSplitPos eWhich; - ScHSplitPos eHWhich; - ScVSplitPos eVWhich; + ScViewData* pViewData; + ScSplitPos eWhich; + ScHSplitPos eHWhich; + ScVSplitPos eVWhich; - ScNoteMarker* pNoteMarker; + ScNoteMarker* pNoteMarker; - ScFilterListBox* pFilterBox; - FloatingWindow* pFilterFloat; + ScFilterListBox* pFilterBox; + FloatingWindow* pFilterFloat; ::std::auto_ptr<ScDPFieldPopupWindow> mpDPFieldPopup; ::std::auto_ptr<ScDPFieldButton> mpFilterButton; - USHORT nCursorHideCount; + USHORT nCursorHideCount; - BOOL bMarking; + BOOL bMarking; - USHORT nButtonDown; - BOOL bEEMouse; // Edit-Engine hat Maus - BYTE nMouseStatus; + USHORT nButtonDown; + BOOL bEEMouse; // Edit-Engine hat Maus + BYTE nMouseStatus; BYTE nNestedButtonState; // track nested button up/down calls - BOOL bDPMouse; // DataPilot-D&D (neue Pivottabellen) - long nDPField; - ScDPObject* pDragDPObj; //! name? - - BOOL bRFMouse; // RangeFinder-Drag - BOOL bRFSize; - USHORT nRFIndex; - SCsCOL nRFAddX; - SCsROW nRFAddY; - - USHORT nPagebreakMouse; // Pagebreak-Modus Drag - SCCOLROW nPagebreakBreak; - SCCOLROW nPagebreakPrev; - ScRange aPagebreakSource; - ScRange aPagebreakDrag; - BOOL bPagebreakDrawn; - - BYTE nPageScript; - - long nLastClickX; - long nLastClickY; - - BOOL bDragRect; - SCCOL nDragStartX; - SCROW nDragStartY; - SCCOL nDragEndX; - SCROW nDragEndY; + BOOL bDPMouse; // DataPilot-D&D (neue Pivottabellen) + long nDPField; + ScDPObject* pDragDPObj; //! name? + + BOOL bRFMouse; // RangeFinder-Drag + BOOL bRFSize; + USHORT nRFIndex; + SCsCOL nRFAddX; + SCsROW nRFAddY; + + USHORT nPagebreakMouse; // Pagebreak-Modus Drag + SCCOLROW nPagebreakBreak; + SCCOLROW nPagebreakPrev; + ScRange aPagebreakSource; + ScRange aPagebreakDrag; + BOOL bPagebreakDrawn; + + BYTE nPageScript; + + long nLastClickX; + long nLastClickY; + + BOOL bDragRect; + SCCOL nDragStartX; + SCROW nDragStartY; + SCCOL nDragEndX; + SCROW nDragEndY; InsCellCmd meDragInsertMode; - USHORT nCurrentPointer; + USHORT nCurrentPointer; - BOOL bIsInScroll; - BOOL bIsInPaint; + BOOL bIsInScroll; + BOOL bIsInPaint; - ScDDComboBoxButton aComboButton; + ScDDComboBoxButton aComboButton; - Point aCurMousePos; + Point aCurMousePos; - USHORT nPaintCount; - Rectangle aRepaintPixel; - BOOL bNeedsRepaint; + USHORT nPaintCount; + Rectangle aRepaintPixel; + BOOL bNeedsRepaint; - BOOL bAutoMarkVisible; - ScAddress aAutoMarkPos; + BOOL bAutoMarkVisible; + ScAddress aAutoMarkPos; - BOOL bListValButton; - ScAddress aListValPos; + BOOL bListValButton; + ScAddress aListValPos; - Rectangle aInvertRect; + Rectangle aInvertRect; DECL_LINK( PopupModeEndHdl, FloatingWindow* ); DECL_LINK( PopupSpellingHdl, SpellCallbackInfo* ); - BOOL TestMouse( const MouseEvent& rMEvt, BOOL bAction ); + BOOL TestMouse( const MouseEvent& rMEvt, BOOL bAction ); - BOOL DoPageFieldSelection( SCCOL nCol, SCROW nRow ); + BOOL DoPageFieldSelection( SCCOL nCol, SCROW nRow ); bool DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ); - void DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ); + void DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ); - void DPMouseMove( const MouseEvent& rMEvt ); - void DPMouseButtonUp( const MouseEvent& rMEvt ); - void DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ); + void DPMouseMove( const MouseEvent& rMEvt ); + void DPMouseButtonUp( const MouseEvent& rMEvt ); + void DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ); - /** - * Check if the mouse click is on a field popup button. - * - * @return bool true if the field popup menu has been launched and no + /** + * Check if the mouse click is on a field popup button. + * + * @return bool true if the field popup menu has been launched and no * further mouse event handling is necessary, false otherwise. */ bool DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj); void DPLaunchFieldPopupMenu( const Point& rScrPos, const Size& rScrSize, const ScAddress& rPos, ScDPObject* pDPObj); - void RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ); + void RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ); - void PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ); + void PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ); - void UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect ); + void UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect ); - BOOL IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ); - void ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow, + BOOL IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ); + void ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow, const String& aValue, bool bCheckForDates ); - void FilterSelect( ULONG nSel ); + void FilterSelect( ULONG nSel ); - void ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr ); + void ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr ); - void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr ); + void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr ); - BOOL HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange ); + BOOL HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange ); - BOOL DropScroll( const Point& rMousePos ); + BOOL DropScroll( const Point& rMousePos ); - sal_Int8 AcceptPrivateDrop( const AcceptDropEvent& rEvt ); - sal_Int8 ExecutePrivateDrop( const ExecuteDropEvent& rEvt ); - sal_Int8 DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPosX, SCROW nDestPosY, + sal_Int8 AcceptPrivateDrop( const AcceptDropEvent& rEvt ); + sal_Int8 ExecutePrivateDrop( const ExecuteDropEvent& rEvt ); + sal_Int8 DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPosX, SCROW nDestPosY, const Point& rLogicPos, sal_Int8 nDndAction ); void HandleMouseButtonDown( const MouseEvent& rMEvt ); - BOOL DrawMouseButtonDown(const MouseEvent& rMEvt); - BOOL DrawMouseButtonUp(const MouseEvent& rMEvt); - BOOL DrawMouseMove(const MouseEvent& rMEvt); - BOOL DrawKeyInput(const KeyEvent& rKEvt); - BOOL DrawCommand(const CommandEvent& rCEvt); - BOOL DrawHasMarkedObj(); - void DrawEndAction(); - void DrawMarkDropObj( SdrObject* pObj ); - SdrObject* GetEditObject(); - BOOL IsMyModel(SdrEditView* pSdrView); - //void DrawStartTimer(); - - void DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, ULONG nLayer ); + BOOL DrawMouseButtonDown(const MouseEvent& rMEvt); + BOOL DrawMouseButtonUp(const MouseEvent& rMEvt); + BOOL DrawMouseMove(const MouseEvent& rMEvt); + BOOL DrawKeyInput(const KeyEvent& rKEvt); + BOOL DrawCommand(const CommandEvent& rCEvt); + BOOL DrawHasMarkedObj(); + void DrawEndAction(); + void DrawMarkDropObj( SdrObject* pObj ); + SdrObject* GetEditObject(); + BOOL IsMyModel(SdrEditView* pSdrView); + //void DrawStartTimer(); + + void DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, ULONG nLayer ); void DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev ); - //BOOL DrawBeforeScroll(); - void DrawAfterScroll(/*BOOL bVal*/); - //void DrawMarks(); - //BOOL NeedDrawMarks(); - void DrawComboButton( const Point& rCellPos, - long nCellSizeX, - long nCellSizeY, + //BOOL DrawBeforeScroll(); + void DrawAfterScroll(/*BOOL bVal*/); + //void DrawMarks(); + //BOOL NeedDrawMarks(); + void DrawComboButton( const Point& rCellPos, + long nCellSizeX, + long nCellSizeY, BOOL bArrowState, - BOOL bBtnIn = FALSE ); - Rectangle GetListValButtonRect( const ScAddress& rButtonPos ); + BOOL bBtnIn = FALSE ); + Rectangle GetListValButtonRect( const ScAddress& rButtonPos ); void DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, OutputDevice* pContentDev ); - BOOL GetEditUrl( const Point& rPos, + BOOL GetEditUrl( const Point& rPos, String* pName=0, String* pUrl=0, String* pTarget=0 ); - BOOL GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, + BOOL GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, String* pName=0, String* pUrl=0, String* pTarget=0 ); - BOOL HitRangeFinder( const Point& rMouse, BOOL& rCorner, USHORT* pIndex = NULL, + BOOL HitRangeFinder( const Point& rMouse, BOOL& rCorner, USHORT* pIndex = NULL, SCsCOL* pAddX = NULL, SCsROW* pAddY = NULL ); - USHORT HitPageBreak( const Point& rMouse, ScRange* pSource = NULL, + USHORT HitPageBreak( const Point& rMouse, ScRange* pSource = NULL, SCCOLROW* pBreak = NULL, SCCOLROW* pPrev = NULL ); - void PasteSelection( const Point& rPosPixel ); + void PasteSelection( const Point& rPosPixel ); - void SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY ); + void SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY ); void GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ); protected: using Window::Resize; - virtual void Resize( const Size& rSize ); - virtual void PrePaint(); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Resize( const Size& rSize ); + virtual void PrePaint(); + virtual void Paint( const Rectangle& rRect ); + virtual void KeyInput(const KeyEvent& rKEvt); + virtual void GetFocus(); + virtual void LoseFocus(); - virtual void RequestHelp( const HelpEvent& rEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void RequestHelp( const HelpEvent& rEvt ); + virtual void Command( const CommandEvent& rCEvt ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); public: ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ); @@ -323,75 +323,75 @@ public: ::sdr::overlay::OverlayManager* getOverlayManager(); void flushOverlayManager(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - void FakeButtonUp(); + void FakeButtonUp(); - Point GetMousePosPixel() const; - void UpdateStatusPosSize(); + Point GetMousePosPixel() const; + void UpdateStatusPosSize(); - void ClickExtern(); + void ClickExtern(); - void SetPointer( const Pointer& rPointer ); + void SetPointer( const Pointer& rPointer ); - void MoveMouseStatus( ScGridWindow &rDestWin ); + void MoveMouseStatus( ScGridWindow &rDestWin ); - void ScrollPixel( long nDifX, long nDifY ); - void UpdateEditViewPos(); + void ScrollPixel( long nDifX, long nDifY ); + void UpdateEditViewPos(); - void UpdateFormulas(); + void UpdateFormulas(); - void DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ); - void DoScenarioMenue( const ScRange& rScenRange ); + void DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ); + void DoScenarioMenue( const ScRange& rScenRange ); void LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ); void LaunchDPFieldMenu( SCCOL nCol, SCROW nRow ); ::com::sun::star::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const; - void DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScTableInfo& rTabInfo, OutputDevice* pContentDev ); using Window::Draw; - void Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode = SC_UPDATE_ALL ); - void InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bTestMerge = FALSE, BOOL bRepeat = FALSE ); - void CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress); + void CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress); - void HideCursor(); - void ShowCursor(); - void DrawCursor(); - void DrawAutoFillMark(); - void UpdateAutoFillMark(BOOL bMarked, const ScRange& rMarkRange); + void HideCursor(); + void ShowCursor(); + void DrawCursor(); + void DrawAutoFillMark(); + void UpdateAutoFillMark(BOOL bMarked, const ScRange& rMarkRange); - void UpdateListValPos( BOOL bVisible, const ScAddress& rPos ); + void UpdateListValPos( BOOL bVisible, const ScAddress& rPos ); - BOOL ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ); - void HideNoteMarker(); + BOOL ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ); + void HideNoteMarker(); - MapMode GetDrawMapMode( BOOL bForce = FALSE ); + MapMode GetDrawMapMode( BOOL bForce = FALSE ); - void ContinueDrag(); + void ContinueDrag(); - void StopMarking(); - void UpdateInputContext(); + void StopMarking(); + void UpdateInputContext(); - void CheckInverted() { if (nPaintCount) bNeedsRepaint = TRUE; } + void CheckInverted() { if (nPaintCount) bNeedsRepaint = TRUE; } - void DoInvertRect( const Rectangle& rPixel ); + void DoInvertRect( const Rectangle& rPixel ); - void CheckNeedsRepaint(); + void CheckNeedsRepaint(); void UpdateDPFromFieldPopupMenu(); void UpdateVisibleRange(); diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 557044f16a3e..f77b827c0ad8 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.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 @@ -40,20 +40,20 @@ class ScGroupDlg : public ModalDialog { public: ScGroupDlg( Window* pParent, - USHORT nResId, - BOOL bUnGroup = FALSE, - BOOL bRows = TRUE ); + USHORT nResId, + BOOL bUnGroup = FALSE, + BOOL bRows = TRUE ); ~ScGroupDlg(); BOOL GetColsChecked() const; private: FixedLine aFlFrame; - RadioButton aBtnRows; - RadioButton aBtnCols; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnRows; + RadioButton aBtnCols; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; }; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index c4cc590fc7ed..10eb08c92496 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.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 @@ -36,102 +36,102 @@ // --------------------------------------------------------------------------- -#define HDR_HORIZONTAL 0 -#define HDR_VERTICAL 1 +#define HDR_HORIZONTAL 0 +#define HDR_VERTICAL 1 -#define HDR_SIZE_OPTIMUM 0xFFFF +#define HDR_SIZE_OPTIMUM 0xFFFF // Groesse des Sliders -#define HDR_SLIDERSIZE 2 +#define HDR_SLIDERSIZE 2 class ScHeaderControl : public Window { private: - SelectionEngine* pSelEngine; - Font aNormFont; - Font aBoldFont; - BOOL bBoldSet; + SelectionEngine* pSelEngine; + Font aNormFont; + Font aBoldFont; + BOOL bBoldSet; - USHORT nFlags; - BOOL bVertical; // Vertikal = Zeilenheader + USHORT nFlags; + BOOL bVertical; // Vertikal = Zeilenheader - long nWidth; - long nSmallWidth; - long nBigWidth; + long nWidth; + long nSmallWidth; + long nBigWidth; - SCCOLROW nSize; + SCCOLROW nSize; - SCCOLROW nMarkStart; - SCCOLROW nMarkEnd; - BOOL bMarkRange; + SCCOLROW nMarkStart; + SCCOLROW nMarkEnd; + BOOL bMarkRange; - BOOL bDragging; // Groessen aendern - SCCOLROW nDragNo; - long nDragStart; - long nDragPos; - BOOL bDragMoved; + BOOL bDragging; // Groessen aendern + SCCOLROW nDragNo; + long nDragStart; + long nDragPos; + BOOL bDragMoved; - BOOL bIgnoreMove; + BOOL bIgnoreMove; - long GetScrPos( SCCOLROW nEntryNo ); - SCCOLROW GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder ); + long GetScrPos( SCCOLROW nEntryNo ); + SCCOLROW GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder ); bool IsSelectionAllowed(SCCOLROW nPos) const; - void ShowDragHelp(); + void ShowDragHelp(); - void DoPaint( SCCOLROW nStart, SCCOLROW nEnd ); + void DoPaint( SCCOLROW nStart, SCCOLROW nEnd ); void DrawShadedRect( long nStart, long nEnd, const Color& rBaseColor ); protected: - // von Window ueberladen + // von Window ueberladen - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); - // neue Methoden + // neue Methoden - virtual SCCOLROW GetPos() = 0; // aktuelle Position (Scrolling) - virtual USHORT GetEntrySize( SCCOLROW nEntryNo ) = 0; // Breite / Hoehe (Pixel) - virtual String GetEntryText( SCCOLROW nEntryNo ) = 0; + virtual SCCOLROW GetPos() = 0; // aktuelle Position (Scrolling) + virtual USHORT GetEntrySize( SCCOLROW nEntryNo ) = 0; // Breite / Hoehe (Pixel) + virtual String GetEntryText( SCCOLROW nEntryNo ) = 0; virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo ); - virtual BOOL IsLayoutRTL(); - virtual BOOL IsMirrored(); + virtual BOOL IsLayoutRTL(); + virtual BOOL IsMirrored(); - virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewWidth ) = 0; - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0; + virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewWidth ) = 0; + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0; - virtual void SetMarking( BOOL bSet ); - virtual void SelectWindow(); - virtual BOOL IsDisabled(); - virtual BOOL ResizeAllowed(); - virtual String GetDragHelp( long nVal ); + virtual void SetMarking( BOOL bSet ); + virtual void SelectWindow(); + virtual BOOL IsDisabled(); + virtual BOOL ResizeAllowed(); + virtual String GetDragHelp( long nVal ); - virtual void DrawInvert( long nDragPos ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void DrawInvert( long nDragPos ); + virtual void Command( const CommandEvent& rCEvt ); public: ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, SCCOLROW nNewSize, USHORT nNewFlags ); ~ScHeaderControl(); - void SetIgnoreMove(BOOL bSet) { bIgnoreMove = bSet; } + void SetIgnoreMove(BOOL bSet) { bIgnoreMove = bSet; } - void StopMarking(); + void StopMarking(); - void SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd ); + void SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd ); - long GetWidth() const { return nWidth; } - long GetSmallWidth() const { return nSmallWidth; } - long GetBigWidth() const { return nBigWidth; } - void SetWidth( long nNew ); + long GetWidth() const { return nWidth; } + long GetSmallWidth() const { return nSmallWidth; } + long GetBigWidth() const { return nBigWidth; } + void SetWidth( long nNew ); }; diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 335fe9618b50..b4eb019a85db 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.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 @@ -42,11 +42,11 @@ class ScHFEditDlg : public SfxTabDialog { SvxNumType eNumType; public: - ScHFEditDlg( SfxViewFrame* pFrame, - Window* pParent, - const SfxItemSet& rCoreSet, - const String& rPageStyle, - USHORT nResId = RID_SCDLG_HFEDIT ); + ScHFEditDlg( SfxViewFrame* pFrame, + Window* pParent, + const SfxItemSet& rCoreSet, + const String& rPageStyle, + USHORT nResId = RID_SCDLG_HFEDIT ); ~ScHFEditDlg(); diff --git a/sc/source/ui/inc/highred.hrc b/sc/source/ui/inc/highred.hrc index 426c9ba29ee2..726c9a870fb8 100644 --- a/sc/source/ui/inc/highred.hrc +++ b/sc/source/ui/inc/highred.hrc @@ -1,7 +1,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 @@ -27,22 +27,22 @@ #include "sc.hrc" // -> RID_SCDLG_CHANGES -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 5 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 5 -#define CB_HIGHLIGHT_ACCEPT 6 -#define CB_HIGHLIGHT_REJECT 7 +#define CB_HIGHLIGHT_ACCEPT 6 +#define CB_HIGHLIGHT_REJECT 7 // #define FL_FILTER 10 -#define TP_FILTER 11 -#define TP_VIEW 12 -#define CB_HIGHLIGHT 13 +#define TP_FILTER 11 +#define TP_VIEW 12 +#define CB_HIGHLIGHT 13 -#define FT_ASSIGN 14 -#define ED_ASSIGN 15 -#define RB_ASSIGN 16 +#define FT_ASSIGN 14 +#define ED_ASSIGN 15 +#define RB_ASSIGN 16 @@ -51,20 +51,20 @@ #define STR_INSERT_COLS 20 -#define STR_INSERT_ROWS 21 -#define STR_INSERT_TABS 22 -#define STR_DELETE_COLS 23 -#define STR_DELETE_ROWS 24 -#define STR_DELETE_TABS 25 -#define STR_MOVE 26 -#define STR_CONTENT 27 -#define STR_REJECT 28 +#define STR_INSERT_ROWS 21 +#define STR_INSERT_TABS 22 +#define STR_DELETE_COLS 23 +#define STR_DELETE_ROWS 24 +#define STR_DELETE_TABS 25 +#define STR_MOVE 26 +#define STR_CONTENT 27 +#define STR_REJECT 28 // Bitmaps -#define BMP_STR_CLOSE 31 -#define BMP_STR_OPEN 32 -#define BMP_STR_END 33 -#define BMP_STR_ERROR 34 +#define BMP_STR_CLOSE 31 +#define BMP_STR_OPEN 32 +#define BMP_STR_END 33 +#define BMP_STR_ERROR 34 // diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 090905c481e8..48192bb6db36 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.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 @@ -50,13 +50,13 @@ class ScViewData; class ScDocument; -#ifndef FLT_DATE_BEFORE -#define FLT_DATE_BEFORE 0 -#define FLT_DATE_SINCE 1 -#define FLT_DATE_EQUAL 2 -#define FLT_DATE_NOTEQUAL 3 -#define FLT_DATE_BETWEEN 4 -#define FLT_DATE_SAVE 5 +#ifndef FLT_DATE_BEFORE +#define FLT_DATE_BEFORE 0 +#define FLT_DATE_SINCE 1 +#define FLT_DATE_EQUAL 2 +#define FLT_DATE_NOTEQUAL 3 +#define FLT_DATE_BETWEEN 4 +#define FLT_DATE_SAVE 5 #endif //================================================================== @@ -65,28 +65,28 @@ class ScHighlightChgDlg : public ScAnyRefDlg { private: - CheckBox aHighlightBox; + CheckBox aHighlightBox; FixedLine aFlFilter; - SvxTPFilter aFilterCtr; - CheckBox aCbAccept; - CheckBox aCbReject; + SvxTPFilter aFilterCtr; + CheckBox aCbAccept; + CheckBox aCbReject; - OKButton aOkButton; - CancelButton aCancelButton; - HelpButton aHelpButton; + OKButton aOkButton; + CancelButton aCancelButton; + HelpButton aHelpButton; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; - ScViewData* pViewData; - ScDocument* pDoc; - ScRangeName aLocalRangeName; - Selection theCurSel; - Size MinSize; - ScRangeList aRangeList; - ScChangeViewSettings aChangeViewSet; + ScViewData* pViewData; + ScDocument* pDoc; + ScRangeName aLocalRangeName; + Selection theCurSel; + Size MinSize; + ScRangeList aRangeList; + ScChangeViewSettings aChangeViewSet; - void Init(); + void Init(); DECL_LINK( RefHandle, SvxTPFilter* ); DECL_LINK(HighLightHandle, CheckBox*); @@ -95,18 +95,18 @@ private: protected: - virtual void RefInputDone( BOOL bForced = FALSE ); + virtual void RefInputDone( BOOL bForced = FALSE ); public: ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData); + ScViewData* ptrViewData); ~ScHighlightChgDlg(); - virtual void SetActive(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL Close(); - virtual BOOL IsRefInputMode() const; + virtual void SetActive(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual BOOL Close(); + virtual BOOL IsRefInputMode() const; }; diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx index f199698178bc..ab514a95d9dc 100644 --- a/sc/source/ui/inc/hintwin.hxx +++ b/sc/source/ui/inc/hintwin.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 @@ -34,15 +34,15 @@ class ScHintWindow : public Window { private: - String aTitle; - String aMessage; - Point aTextStart; - long nTextHeight; - Font aTextFont; - Font aHeadFont; + String aTitle; + String aMessage; + Point aTextStart; + long nTextHeight; + Font aTextFont; + Font aHeadFont; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); public: ScHintWindow( Window* pParent, const String& rTit, const String& rMsg ); diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index a79bfad079c4..84c70d1a52a8 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.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 @@ -37,8 +37,8 @@ struct ScHighlightEntry { - ScRange aRef; - Color aColor; + ScRange aRef; + Color aColor; ScHighlightEntry( const ScRange& rR, const Color& rC ) : aRef(rR), aColor(rC) {} @@ -46,14 +46,14 @@ struct ScHighlightEntry class ScHighlightRanges { - List aEntries; + List aEntries; public: ScHighlightRanges(); ~ScHighlightRanges(); - ULONG Count() const { return aEntries.Count(); } - void Insert( ScHighlightEntry* pNew ) { aEntries.Insert(pNew, LIST_APPEND); } + ULONG Count() const { return aEntries.Count(); } + void Insert( ScHighlightEntry* pNew ) { aEntries.Insert(pNew, LIST_APPEND); } ScHighlightEntry* GetObject( ULONG nIndex ) const { return (ScHighlightEntry*)aEntries.GetObject(nIndex); } }; diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx index 49f574bbf055..576409598f9d 100644 --- a/sc/source/ui/inc/imoptdlg.hxx +++ b/sc/source/ui/inc/imoptdlg.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 @@ -61,38 +61,38 @@ public: { SetTextEncoding( nEnc ); } ScImportOptions( const ScImportOptions& rCpy ) - : nFieldSepCode (rCpy.nFieldSepCode), - nTextSepCode (rCpy.nTextSepCode), - aStrFont (rCpy.aStrFont), - eCharSet (rCpy.eCharSet), - bFixedWidth (rCpy.bFixedWidth), - bSaveAsShown (rCpy.bSaveAsShown) + : nFieldSepCode (rCpy.nFieldSepCode), + nTextSepCode (rCpy.nTextSepCode), + aStrFont (rCpy.aStrFont), + eCharSet (rCpy.eCharSet), + bFixedWidth (rCpy.bFixedWidth), + bSaveAsShown (rCpy.bSaveAsShown) {} ScImportOptions& operator=( const ScImportOptions& rCpy ) { - nFieldSepCode = rCpy.nFieldSepCode; - nTextSepCode = rCpy.nTextSepCode; - aStrFont = rCpy.aStrFont; - eCharSet = rCpy.eCharSet; - bFixedWidth = rCpy.bFixedWidth; + nFieldSepCode = rCpy.nFieldSepCode; + nTextSepCode = rCpy.nTextSepCode; + aStrFont = rCpy.aStrFont; + eCharSet = rCpy.eCharSet; + bFixedWidth = rCpy.bFixedWidth; bSaveAsShown = rCpy.bSaveAsShown; return *this; } - BOOL operator==( const ScImportOptions& rCmp ) + BOOL operator==( const ScImportOptions& rCmp ) { return - nFieldSepCode == rCmp.nFieldSepCode - && nTextSepCode == rCmp.nTextSepCode - && eCharSet == rCmp.eCharSet - && aStrFont == rCmp.aStrFont - && bFixedWidth == rCmp.bFixedWidth + nFieldSepCode == rCmp.nFieldSepCode + && nTextSepCode == rCmp.nTextSepCode + && eCharSet == rCmp.eCharSet + && aStrFont == rCmp.aStrFont + && bFixedWidth == rCmp.bFixedWidth && bSaveAsShown == rCmp.bSaveAsShown; } - String BuildString() const; + String BuildString() const; - void SetTextEncoding( rtl_TextEncoding nEnc ); + void SetTextEncoding( rtl_TextEncoding nEnc ); sal_Unicode nFieldSepCode; sal_Unicode nTextSepCode; diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 31ffe717817b..63452795bbec 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.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 @@ -43,7 +43,7 @@ class ScAsciiOptions; struct ScExportTextOptions { enum NewlineConversion { ToSystem, ToSpace, None }; - ScExportTextOptions( NewlineConversion eNewlineConversion = ToSystem, sal_Unicode cSeparatorConvertTo = 0, bool bAddQuotes = false ) : + ScExportTextOptions( NewlineConversion eNewlineConversion = ToSystem, sal_Unicode cSeparatorConvertTo = 0, bool bAddQuotes = false ) : meNewlineConversion( eNewlineConversion ), mcSeparatorConvertTo( cSeparatorConvertTo ), mbAddQuotes( bAddQuotes ) {} NewlineConversion meNewlineConversion; @@ -57,24 +57,24 @@ class SC_DLLPUBLIC ScImportExport ScDocument* pDoc; ScDocument* pUndoDoc; ScRange aRange; - String aStreamPath; + String aStreamPath; String aNonConvertibleChars; - ULONG nSizeLimit; - sal_Unicode cSep; // Separator - sal_Unicode cStr; // String Delimiter - BOOL bFormulas; // Formeln im Text? - BOOL bIncludeFiltered; // include filtered rows? (default true) - BOOL bAll; // keine Selektion - BOOL bSingle; // Einfachselektion - BOOL bUndo; // Mit Undo? - BOOL bOverflow; // zuviele Zeilen/Spalten + ULONG nSizeLimit; + sal_Unicode cSep; // Separator + sal_Unicode cStr; // String Delimiter + BOOL bFormulas; // Formeln im Text? + BOOL bIncludeFiltered; // include filtered rows? (default true) + BOOL bAll; // keine Selektion + BOOL bSingle; // Einfachselektion + BOOL bUndo; // Mit Undo? + BOOL bOverflow; // zuviele Zeilen/Spalten bool mbApi; ScExportTextOptions mExportTextOptions; - ScAsciiOptions* pExtOptions; // erweiterte Optionen + ScAsciiOptions* pExtOptions; // erweiterte Optionen - BOOL StartPaste(); // Protect-Check, Undo einrichten - void EndPaste(); // Undo/Redo-Aktionen, Repaint + BOOL StartPaste(); // Protect-Check, Undo einrichten + void EndPaste(); // Undo/Redo-Aktionen, Repaint BOOL Doc2Text( SvStream& ); BOOL Text2Doc( SvStream& ); BOOL Doc2Sylk( SvStream& ); @@ -83,13 +83,13 @@ class SC_DLLPUBLIC ScImportExport BOOL Doc2RTF( SvStream& ); BOOL Doc2Dif( SvStream& ); BOOL Dif2Doc( SvStream& ); - BOOL ExtText2Doc( SvStream& ); // mit pExtOptions + BOOL ExtText2Doc( SvStream& ); // mit pExtOptions BOOL RTF2Doc( SvStream&, const String& rBaseURL ); BOOL HTML2Doc( SvStream&, const String& rBaseURL ); public: - ScImportExport( ScDocument* ); // Gesamtdokument - ScImportExport( ScDocument*, const String& ); // Bereichs/Zellangabe + ScImportExport( ScDocument* ); // Gesamtdokument + ScImportExport( ScDocument*, const String& ); // Bereichs/Zellangabe ScImportExport( ScDocument*, const ScAddress& ); ScImportExport( ScDocument*, const ScRange& ); ~ScImportExport(); @@ -98,20 +98,20 @@ public: BOOL IsDoubleRef() const { return BOOL( !( bAll || bSingle ) ); } BOOL IsSingleRef() const { return bSingle; } - BOOL IsNoRef() const { return bAll; } - BOOL IsRef() const { return BOOL( !bAll ); } + BOOL IsNoRef() const { return bAll; } + BOOL IsRef() const { return BOOL( !bAll ); } const ScRange& GetRange() const { return aRange; } - BOOL IsUndo() const { return bUndo; } - void SetUndo( BOOL b ) { bUndo = b; } + BOOL IsUndo() const { return bUndo; } + void SetUndo( BOOL b ) { bUndo = b; } static BOOL IsFormatSupported( ULONG nFormat ); static const sal_Unicode* ScanNextFieldFromString( const sal_Unicode* p, String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted ); - static void WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero = FALSE ); - static void WriteUnicodeOrByteEndl( SvStream& rStrm ); - static inline BOOL IsEndianSwap( const SvStream& rStrm ); + static void WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero = FALSE ); + static void WriteUnicodeOrByteEndl( SvStream& rStrm ); + static inline BOOL IsEndianSwap( const SvStream& rStrm ); //! only if stream is only used in own (!) memory static inline void SetNoEndianSwap( SvStream& rStrm ); @@ -125,10 +125,10 @@ public: BOOL IsIncludeFiltered() const { return bIncludeFiltered; } void SetIncludeFiltered( BOOL b ) { bIncludeFiltered = b; } - void SetSizeLimit( ULONG nNew ) { nSizeLimit = nNew; } // momentan nur fuer Ascii + void SetSizeLimit( ULONG nNew ) { nSizeLimit = nNew; } // momentan nur fuer Ascii - void SetStreamPath( const String& rPath ) { aStreamPath = rPath; } - const String& GetStreamPath() const { return aStreamPath; } + void SetStreamPath( const String& rPath ) { aStreamPath = rPath; } + const String& GetStreamPath() const { return aStreamPath; } BOOL ImportString( const ::rtl::OUString&, ULONG=FORMAT_STRING ); BOOL ExportString( ::rtl::OUString&, ULONG=FORMAT_STRING ); @@ -142,7 +142,7 @@ public: BOOL ExportData( const String& rMimeType, ::com::sun::star::uno::Any & rValue ); - BOOL IsOverflow() const { return bOverflow; } // nach dem Importieren + BOOL IsOverflow() const { return bOverflow; } // nach dem Importieren const String& GetNonConvertibleChars() const { return aNonConvertibleChars; } diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index b6fb5eead65a..d3a30b018bbe 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -54,78 +54,78 @@ class CommandEvent; struct ESelection; //======================================================================== -// ScInputHandler +// ScInputHandler //======================================================================== class ScInputHandler { private: - ScInputWindow* pInputWin; - - ScEditEngineDefaulter* pEngine; // editierte Daten in der Tabelle - EditView* pTableView; // aktive EditView dazu - EditView* pTopView; // EditView in der Eingabezeile - - TypedScStrCollection* pColumnData; - TypedScStrCollection* pFormulaData; - TypedScStrCollection* pFormulaDataPara; - Window* pTipVisibleParent; - ULONG nTipVisible; - Window* pTipVisibleSecParent; + ScInputWindow* pInputWin; + + ScEditEngineDefaulter* pEngine; // editierte Daten in der Tabelle + EditView* pTableView; // aktive EditView dazu + EditView* pTopView; // EditView in der Eingabezeile + + TypedScStrCollection* pColumnData; + TypedScStrCollection* pFormulaData; + TypedScStrCollection* pFormulaDataPara; + Window* pTipVisibleParent; + ULONG nTipVisible; + Window* pTipVisibleSecParent; ULONG nTipVisibleSec; - String aManualTip; - String aAutoSearch; - USHORT nAutoPos; - BOOL bUseTab; // Blaettern moeglich - - BOOL bTextValid; // Text noch nicht in Edit-Engine - String aCurrentText; - - String aFormText; // fuer Funktions-Autopilot - xub_StrLen nFormSelStart; // Selektion fuer Funktions-Autopilot - xub_StrLen nFormSelEnd; - - USHORT nAutoPar; // autom.parentheses than can be overwritten - - ScAddress aCursorPos; - ScInputMode eMode; - BOOL bModified; - BOOL bSelIsRef; - BOOL bFormulaMode; - BOOL bInRangeUpdate; - BOOL bParenthesisShown; - BOOL bCreatingFuncView; - BOOL bInEnterHandler; - BOOL bCommandErrorShown; - BOOL bInOwnChange; - - BOOL bProtected; - BOOL bCellHasPercentFormat; - ULONG nValidation; + String aManualTip; + String aAutoSearch; + USHORT nAutoPos; + BOOL bUseTab; // Blaettern moeglich + + BOOL bTextValid; // Text noch nicht in Edit-Engine + String aCurrentText; + + String aFormText; // fuer Funktions-Autopilot + xub_StrLen nFormSelStart; // Selektion fuer Funktions-Autopilot + xub_StrLen nFormSelEnd; + + USHORT nAutoPar; // autom.parentheses than can be overwritten + + ScAddress aCursorPos; + ScInputMode eMode; + BOOL bModified; + BOOL bSelIsRef; + BOOL bFormulaMode; + BOOL bInRangeUpdate; + BOOL bParenthesisShown; + BOOL bCreatingFuncView; + BOOL bInEnterHandler; + BOOL bCommandErrorShown; + BOOL bInOwnChange; + + BOOL bProtected; + BOOL bCellHasPercentFormat; + ULONG nValidation; SvxCellHorJustify eAttrAdjust; - Fraction aScaleX; // fuer Ref-MapMode - Fraction aScaleY; + Fraction aScaleX; // fuer Ref-MapMode + Fraction aScaleY; - ScTabViewShell* pRefViewSh; - ScTabViewShell* pActiveViewSh; + ScTabViewShell* pRefViewSh; + ScTabViewShell* pActiveViewSh; - const ScPatternAttr* pLastPattern; - SfxItemSet* pEditDefaults; - BOOL bLastIsSymbol; + const ScPatternAttr* pLastPattern; + SfxItemSet* pEditDefaults; + BOOL bLastIsSymbol; - ScInputHdlState* pLastState; - Timer* pDelayTimer; + ScInputHdlState* pLastState; + Timer* pDelayTimer; - ScRangeFindList* pRangeFindList; + ScRangeFindList* pRangeFindList; - static BOOL bAutoComplete; // aus App-Optionen - static BOOL bOptLoaded; + static BOOL bAutoComplete; // aus App-Optionen + static BOOL bOptLoaded; #ifdef _INPUTHDL_CXX private: - void UpdateActiveView(); - void SyncViews( EditView* pSourceView = NULL ); + void UpdateActiveView(); + void SyncViews( EditView* pSourceView = NULL ); /** * @param cTyped typed character. If 0, look at existing document content * for text or number. @@ -134,30 +134,30 @@ private: * @return true if the new edit mode has been started. */ bool StartTable( sal_Unicode cTyped, bool bFromCommand, bool bInputActivated ); - void RemoveSelection(); - void UpdateFormulaMode(); - void InvalidateAttribs(); - void ImplCreateEditEngine(); - DECL_LINK( DelayTimer, Timer* ); - void GetColData(); - void UseColData(); - void NextAutoEntry( BOOL bBack ); - void UpdateAdjust( sal_Unicode cTyped ); - void GetFormulaData(); - void UseFormulaData(); - void NextFormulaEntry( BOOL bBack ); - void PasteFunctionData(); - void PasteManualTip(); - EditView* GetFuncEditView(); - void RemoveAdjust(); - void RemoveRangeFinder(); - void DeleteRangeFinder(); - void UpdateParenthesis(); - void UpdateAutoCorrFlag(); - void ResetAutoPar(); - void AutoParAdded(); - BOOL CursorAtClosingPar(); - void SkipClosingPar(); + void RemoveSelection(); + void UpdateFormulaMode(); + void InvalidateAttribs(); + void ImplCreateEditEngine(); + DECL_LINK( DelayTimer, Timer* ); + void GetColData(); + void UseColData(); + void NextAutoEntry( BOOL bBack ); + void UpdateAdjust( sal_Unicode cTyped ); + void GetFormulaData(); + void UseFormulaData(); + void NextFormulaEntry( BOOL bBack ); + void PasteFunctionData(); + void PasteManualTip(); + EditView* GetFuncEditView(); + void RemoveAdjust(); + void RemoveRangeFinder(); + void DeleteRangeFinder(); + void UpdateParenthesis(); + void UpdateAutoCorrFlag(); + void ResetAutoPar(); + void AutoParAdded(); + BOOL CursorAtClosingPar(); + void SkipClosingPar(); DECL_LINK( ModifyHdl, void* ); DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent* ); DECL_LINK( ShowHideTipVisibleSecParentListener, VclWindowEvent* ); @@ -165,104 +165,104 @@ private: public: ScInputHandler(); - virtual ~ScInputHandler(); + virtual ~ScInputHandler(); - void SetMode( ScInputMode eNewMode ); - BOOL IsInputMode() const { return (eMode != SC_INPUT_NONE); } - BOOL IsEditMode() const { return (eMode != SC_INPUT_NONE && + void SetMode( ScInputMode eNewMode ); + BOOL IsInputMode() const { return (eMode != SC_INPUT_NONE); } + BOOL IsEditMode() const { return (eMode != SC_INPUT_NONE && eMode != SC_INPUT_TYPE); } - BOOL IsTopMode() const { return (eMode == SC_INPUT_TOP); } + BOOL IsTopMode() const { return (eMode == SC_INPUT_TOP); } - const String& GetEditString(); - const String& GetFormString() const { return aFormText; } + const String& GetEditString(); + const String& GetFormString() const { return aFormText; } - BOOL GetTextAndFields( ScEditEngineDefaulter& rDestEngine ); + BOOL GetTextAndFields( ScEditEngineDefaulter& rDestEngine ); - BOOL KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE ); - void EnterHandler( BYTE nBlockMode = 0 ); - void CancelHandler(); - void SetReference( const ScRange& rRef, ScDocument* pDoc ); - void AddRefEntry(); + BOOL KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE ); + void EnterHandler( BYTE nBlockMode = 0 ); + void CancelHandler(); + void SetReference( const ScRange& rRef, ScDocument* pDoc ); + void AddRefEntry(); - BOOL InputCommand( const CommandEvent& rCEvt, BOOL bForce ); + BOOL InputCommand( const CommandEvent& rCEvt, BOOL bForce ); - void InsertFunction( const String& rFuncName, BOOL bAddPar = TRUE ); - void ClearText(); + void InsertFunction( const String& rFuncName, BOOL bAddPar = TRUE ); + void ClearText(); - void InputSelection( EditView* pView ); - void InputChanged( EditView* pView, BOOL bFromNotify = FALSE ); + void InputSelection( EditView* pView ); + void InputChanged( EditView* pView, BOOL bFromNotify = FALSE ); - void ViewShellGone(ScTabViewShell* pViewSh); - void SetRefViewShell(ScTabViewShell* pRefVsh) {pRefViewSh=pRefVsh;} + void ViewShellGone(ScTabViewShell* pViewSh); + void SetRefViewShell(ScTabViewShell* pRefVsh) {pRefViewSh=pRefVsh;} - void NotifyChange( const ScInputHdlState* pState, BOOL bForce = FALSE, + void NotifyChange( const ScInputHdlState* pState, BOOL bForce = FALSE, ScTabViewShell* pSourceSh = NULL, BOOL bStopEditing = TRUE); void UpdateCellAdjust( SvxCellHorJustify eJust ); - void ResetDelayTimer(); //BugId 54702 + void ResetDelayTimer(); //BugId 54702 - void HideTip(); + void HideTip(); void HideTipBelow(); void ShowTipCursor(); - void ShowTip( const String& rText ); // am Cursor - void ShowTipBelow( const String& rText ); + void ShowTip( const String& rText ); // am Cursor + void ShowTipBelow( const String& rText ); - void SetRefScale( const Fraction& rX, const Fraction& rY ); - void UpdateRefDevice(); + void SetRefScale( const Fraction& rX, const Fraction& rY ); + void UpdateRefDevice(); - EditView* GetActiveView(); - EditView* GetTableView() { return pTableView; } - EditView* GetTopView() { return pTopView; } + EditView* GetActiveView(); + EditView* GetTableView() { return pTableView; } + EditView* GetTopView() { return pTopView; } - BOOL DataChanging( sal_Unicode cTyped = 0, BOOL bFromCommand = FALSE ); - void DataChanged( BOOL bFromTopNotify = FALSE ); + BOOL DataChanging( sal_Unicode cTyped = 0, BOOL bFromCommand = FALSE ); + void DataChanged( BOOL bFromTopNotify = FALSE ); - BOOL TakesReturn() const { return ( nTipVisible != 0 ); } + BOOL TakesReturn() const { return ( nTipVisible != 0 ); } - void SetModified() { bModified = TRUE; } + void SetModified() { bModified = TRUE; } - BOOL GetSelIsRef() const { return bSelIsRef; } - void SetSelIsRef(BOOL bSet) { bSelIsRef = bSet; } + BOOL GetSelIsRef() const { return bSelIsRef; } + void SetSelIsRef(BOOL bSet) { bSelIsRef = bSet; } - void ShowRefFrame(); + void ShowRefFrame(); - ScRangeFindList* GetRangeFindList() { return pRangeFindList; } + ScRangeFindList* GetRangeFindList() { return pRangeFindList; } - void UpdateRange( USHORT nIndex, const ScRange& rNew ); + void UpdateRange( USHORT nIndex, const ScRange& rNew ); // Kommunikation mit Funktionsautopilot - void InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd ); - void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd ); - void InputReplaceSelection ( const String& rStr ); - String InputGetFormulaStr (); + void InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd ); + void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd ); + void InputReplaceSelection ( const String& rStr ); + String InputGetFormulaStr (); - BOOL IsFormulaMode() const { return bFormulaMode; } - ScInputWindow* GetInputWindow() { return pInputWin; } - void SetInputWindow( ScInputWindow* pNew ) { pInputWin = pNew; } - void StopInputWinEngine( BOOL bAll ); + BOOL IsFormulaMode() const { return bFormulaMode; } + ScInputWindow* GetInputWindow() { return pInputWin; } + void SetInputWindow( ScInputWindow* pNew ) { pInputWin = pNew; } + void StopInputWinEngine( BOOL bAll ); - BOOL IsInEnterHandler() const { return bInEnterHandler; } - BOOL IsInOwnChange() const { return bInOwnChange; } + BOOL IsInEnterHandler() const { return bInEnterHandler; } + BOOL IsInOwnChange() const { return bInOwnChange; } - BOOL IsModalMode( SfxObjectShell* pDocSh ); + BOOL IsModalMode( SfxObjectShell* pDocSh ); - void ForgetLastPattern(); + void ForgetLastPattern(); - void UpdateSpellSettings( BOOL bFromStartTab = FALSE ); + void UpdateSpellSettings( BOOL bFromStartTab = FALSE ); - void FormulaPreview(); + void FormulaPreview(); - Size GetTextSize(); // in 1/100mm + Size GetTextSize(); // in 1/100mm // eigentlich private, fuer SID_INPUT_SUM public - void InitRangeFinder( const String& rFormula ); + void InitRangeFinder( const String& rFormula ); - static void SetAutoComplete(BOOL bSet) { bAutoComplete = bSet; } + static void SetAutoComplete(BOOL bSet) { bAutoComplete = bSet; } }; //======================================================================== -// ScInputHdlState +// ScInputHdlState //======================================================================== class ScInputHdlState { @@ -277,22 +277,22 @@ public: ScInputHdlState( const ScInputHdlState& rCpy ); ~ScInputHdlState(); - ScInputHdlState& operator= ( const ScInputHdlState& r ); - int operator==( const ScInputHdlState& r ) const; - int operator!=( const ScInputHdlState& r ) const + ScInputHdlState& operator= ( const ScInputHdlState& r ); + int operator==( const ScInputHdlState& r ) const; + int operator!=( const ScInputHdlState& r ) const { return !operator==( r ); } - const ScAddress& GetPos() const { return aCursorPos; } - const ScAddress& GetStartPos() const { return aStartPos; } - const ScAddress& GetEndPos() const { return aEndPos; } - const String& GetString() const { return aString; } - const EditTextObject* GetEditData() const { return pEditData; } + const ScAddress& GetPos() const { return aCursorPos; } + const ScAddress& GetStartPos() const { return aStartPos; } + const ScAddress& GetEndPos() const { return aEndPos; } + const String& GetString() const { return aString; } + const EditTextObject* GetEditData() const { return pEditData; } private: - ScAddress aCursorPos; - ScAddress aStartPos; - ScAddress aEndPos; - String aString; + ScAddress aCursorPos; + ScAddress aStartPos; + ScAddress aEndPos; + String aString; EditTextObject* pEditData; }; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 46dbe9eb920a..5d7dcf781696 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.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 @@ -47,27 +47,27 @@ class ScRangeList; //======================================================================== -class ScTextWnd : public Window, public DragSourceHelper // edit window +class ScTextWnd : public Window, public DragSourceHelper // edit window { public: ScTextWnd( Window* pParent ); - virtual ~ScTextWnd(); + virtual ~ScTextWnd(); - void SetTextString( const String& rString ); - const String& GetTextString() const; + void SetTextString( const String& rString ); + const String& GetTextString() const; - BOOL IsInputActive(); - EditView* GetEditView(); + BOOL IsInputActive(); + EditView* GetEditView(); // fuer FunktionsAutopiloten - void MakeDialogEditView(); + void MakeDialogEditView(); - void StartEditEngine(); - void StopEditEngine( BOOL bAll ); + void StartEditEngine(); + void StopEditEngine( BOOL bAll ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SetFormulaMode( BOOL bSet ); + void SetFormulaMode( BOOL bSet ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); @@ -77,36 +77,36 @@ public: DECL_LINK( NotifyHdl, EENotify* ); protected: - virtual void Paint( const Rectangle& rRec ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRec ); + virtual void Resize(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void KeyInput(const KeyEvent& rKEvt); + virtual void GetFocus(); + virtual void LoseFocus(); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual String GetText() const; + virtual String GetText() const; private: - void ImplInitSettings(); - void UpdateAutoCorrFlag(); + void ImplInitSettings(); + void UpdateAutoCorrFlag(); private: typedef ::std::vector< ScAccessibleEditLineTextData* > AccTextDataVector; - String aString; - Font aTextFont; - ScEditEngineDefaulter* pEditEngine; // erst bei Bedarf angelegt - EditView* pEditView; + String aString; + Font aTextFont; + ScEditEngineDefaulter* pEditEngine; // erst bei Bedarf angelegt + EditView* pEditView; AccTextDataVector maAccTextDatas; // #i105267# text datas may be cloned, remember all copies - BOOL bIsRTL; - BOOL bIsInsertMode; - BOOL bFormulaMode; + BOOL bIsRTL; + BOOL bIsInsertMode; + BOOL bFormulaMode; // #102710#; this flag should be true if a key input or a command is handled // it prevents the call of InputChanged in the ModifyHandler of the EditEngine @@ -115,98 +115,98 @@ private: //======================================================================== -class ScPosWnd : public ComboBox, public SfxListener // Positionsanzeige +class ScPosWnd : public ComboBox, public SfxListener // Positionsanzeige { private: - String aPosStr; - Accelerator* pAccel; + String aPosStr; + Accelerator* pAccel; ULONG nTipVisible; - BOOL bFormulaMode; - BOOL bTopHadFocus; + BOOL bFormulaMode; + BOOL bTopHadFocus; public: ScPosWnd( Window* pParent ); - virtual ~ScPosWnd(); + virtual ~ScPosWnd(); - void SetPos( const String& rPosStr ); // angezeigter Text - void SetFormulaMode( BOOL bSet ); + void SetPos( const String& rPosStr ); // angezeigter Text + void SetFormulaMode( BOOL bSet ); protected: - virtual void Select(); + virtual void Select(); virtual void Modify(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual long Notify( NotifyEvent& rNEvt ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); private: - void FillRangeNames(); - void FillFunctions(); - void DoEnter(); + void FillRangeNames(); + void FillFunctions(); + void DoEnter(); void HideTip(); - void ReleaseFocus_Impl(); + void ReleaseFocus_Impl(); }; //======================================================================== -class ScInputWindow : public ToolBox // Parent-Toolbox +class ScInputWindow : public ToolBox // Parent-Toolbox { public: ScInputWindow( Window* pParent, SfxBindings* pBind ); - virtual ~ScInputWindow(); + virtual ~ScInputWindow(); - virtual void Resize(); + virtual void Resize(); virtual void Select(); - void SetFuncString( const String& rString, BOOL bDoEdit = TRUE ); - void SetPosString( const String& rStr ); - void SetTextString( const String& rString ); + void SetFuncString( const String& rString, BOOL bDoEdit = TRUE ); + void SetPosString( const String& rStr ); + void SetTextString( const String& rString ); - void SetOkCancelMode(); - void SetSumAssignMode(); - void EnableButtons( BOOL bEnable = TRUE ); + void SetOkCancelMode(); + void SetSumAssignMode(); + void EnableButtons( BOOL bEnable = TRUE ); - void SetFormulaMode( BOOL bSet ); + void SetFormulaMode( BOOL bSet ); - BOOL IsInputActive(); - EditView* GetEditView(); + BOOL IsInputActive(); + EditView* GetEditView(); - void TextGrabFocus(); - void TextInvalidate(); - void SwitchToTextWin(); + void TextGrabFocus(); + void TextInvalidate(); + void SwitchToTextWin(); - void PosGrabFocus(); + void PosGrabFocus(); // Fuer FunktionsAutopiloten - void MakeDialogEditView(); + void MakeDialogEditView(); - void StopEditEngine( BOOL bAll ); + void StopEditEngine( BOOL bAll ); - void SetInputHandler( ScInputHandler* pNew ); + void SetInputHandler( ScInputHandler* pNew ); - ScInputHandler* GetInputHandler(){ return pInputHdl;} + ScInputHandler* GetInputHandler(){ return pInputHdl;} - void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); protected: - virtual void SetText( const String& rString ); - virtual String GetText() const; + virtual void SetText( const String& rString ); + virtual String GetText() const; sal_Bool UseSubTotal( ScRangeList* pRangeList ) const; private: - ScPosWnd aWndPos; - ScTextWnd aTextWindow; - ScInputHandler* pInputHdl; + ScPosWnd aWndPos; + ScTextWnd aTextWindow; + ScInputHandler* pInputHdl; SfxBindings* pBindings; - String aTextOk; - String aTextCancel; - String aTextSum; - String aTextEqual; - BOOL bIsOkCancelMode; + String aTextOk; + String aTextCancel; + String aTextSum; + String aTextEqual; + BOOL bIsOkCancelMode; }; //================================================================== @@ -214,10 +214,10 @@ private: class ScInputWindowWrapper : public SfxChildWindow { public: - ScInputWindowWrapper( Window* pParent, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo ); + ScInputWindowWrapper( Window* pParent, + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(ScInputWindowWrapper); }; diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index 7c3965ef981c..cadebb76358f 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.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 @@ -42,13 +42,13 @@ class ScInsertCellDlg : public ModalDialog { private: FixedLine aFlFrame; - RadioButton aBtnCellsDown; - RadioButton aBtnCellsRight; - RadioButton aBtnInsRows; - RadioButton aBtnInsCols; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnCellsDown; + RadioButton aBtnCellsRight; + RadioButton aBtnInsRows; + RadioButton aBtnInsCols; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: ScInsertCellDlg( Window* pParent,BOOL bDisallowCellMove = FALSE ); diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 5888c1e72209..877e36330c66 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.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 @@ -40,68 +40,68 @@ class ScInsertContentsDlg : public ModalDialog { public: - ScInsertContentsDlg( Window* pParent, - USHORT nCheckDefaults = 0, - const String* pStrTitle = NULL ); + ScInsertContentsDlg( Window* pParent, + USHORT nCheckDefaults = 0, + const String* pStrTitle = NULL ); ~ScInsertContentsDlg(); - USHORT GetInsContentsCmdBits() const; - USHORT GetFormulaCmdBits() const; - BOOL IsSkipEmptyCells() const {return aBtnSkipEmptyCells.IsChecked();} - BOOL IsTranspose() const {return aBtnTranspose.IsChecked();} - BOOL IsLink() const {return aBtnLink.IsChecked();} - InsCellCmd GetMoveMode(); + USHORT GetInsContentsCmdBits() const; + USHORT GetFormulaCmdBits() const; + BOOL IsSkipEmptyCells() const {return aBtnSkipEmptyCells.IsChecked();} + BOOL IsTranspose() const {return aBtnTranspose.IsChecked();} + BOOL IsLink() const {return aBtnLink.IsChecked();} + InsCellCmd GetMoveMode(); - void SetOtherDoc( BOOL bSet ); - void SetFillMode( BOOL bSet ); - void SetChangeTrack( BOOL bSet ); - void SetCellShiftDisabled( int nDisable ); + void SetOtherDoc( BOOL bSet ); + void SetFillMode( BOOL bSet ); + void SetChangeTrack( BOOL bSet ); + void SetCellShiftDisabled( int nDisable ); private: FixedLine aFlFrame; - CheckBox aBtnInsAll; - CheckBox aBtnInsStrings; - CheckBox aBtnInsNumbers; - CheckBox aBtnInsDateTime; - CheckBox aBtnInsFormulas; - CheckBox aBtnInsNotes; - CheckBox aBtnInsAttrs; - CheckBox aBtnInsObjects; + CheckBox aBtnInsAll; + CheckBox aBtnInsStrings; + CheckBox aBtnInsNumbers; + CheckBox aBtnInsDateTime; + CheckBox aBtnInsFormulas; + CheckBox aBtnInsNotes; + CheckBox aBtnInsAttrs; + CheckBox aBtnInsObjects; FixedLine aFlSep1; FixedLine aFlOptions; - CheckBox aBtnSkipEmptyCells; - CheckBox aBtnTranspose; - CheckBox aBtnLink; + CheckBox aBtnSkipEmptyCells; + CheckBox aBtnTranspose; + CheckBox aBtnLink; FixedLine aFlOperation; - RadioButton aRbNoOp; - RadioButton aRbAdd; - RadioButton aRbSub; - RadioButton aRbMul; - RadioButton aRbDiv; + RadioButton aRbNoOp; + RadioButton aRbAdd; + RadioButton aRbSub; + RadioButton aRbMul; + RadioButton aRbDiv; FixedLine aFlSep2; FixedLine aFlMove; - RadioButton aRbMoveNone; - RadioButton aRbMoveDown; - RadioButton aRbMoveRight; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - BOOL bOtherDoc; - BOOL bFillMode; - BOOL bChangeTrack; - BOOL bMoveDownDisabled; - BOOL bMoveRightDisabled; - - static BOOL bPreviousAllCheck; - static USHORT nPreviousChecks; - static USHORT nPreviousChecks2; - static USHORT nPreviousFormulaChecks; - static USHORT nPreviousMoveMode; // enum InsCellCmd + RadioButton aRbMoveNone; + RadioButton aRbMoveDown; + RadioButton aRbMoveRight; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + BOOL bOtherDoc; + BOOL bFillMode; + BOOL bChangeTrack; + BOOL bMoveDownDisabled; + BOOL bMoveRightDisabled; + + static BOOL bPreviousAllCheck; + static USHORT nPreviousChecks; + static USHORT nPreviousChecks2; + static USHORT nPreviousFormulaChecks; + static USHORT nPreviousMoveMode; // enum InsCellCmd void DisableChecks( BOOL bInsAllChecked = TRUE ); void TestModes(); diff --git a/sc/source/ui/inc/instbdlg.hrc b/sc/source/ui/inc/instbdlg.hrc index 08bff85388dd..1b3388761029 100644 --- a/sc/source/ui/inc/instbdlg.hrc +++ b/sc/source/ui/inc/instbdlg.hrc @@ -1,7 +1,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 @@ -29,24 +29,24 @@ //#define RID_SCDLG_INSERT_TABLE 300 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 -#define FL_POSITION 10 -#define RB_BEFORE 11 -#define RB_BEHIND 12 +#define FL_POSITION 10 +#define RB_BEFORE 11 +#define RB_BEHIND 12 -#define FL_TABLE 20 -#define RB_NEW 21 -#define FT_COUNT 22 -#define NF_COUNT 23 -#define FT_NAME 24 -#define ED_TABNAME 25 -#define RB_FROMFILE 26 -#define LB_TABLES 27 -#define BTN_BROWSE 28 -#define CB_LINK 29 -#define FT_PATH 30 +#define FL_TABLE 20 +#define RB_NEW 21 +#define FT_COUNT 22 +#define NF_COUNT 23 +#define FT_NAME 24 +#define ED_TABNAME 25 +#define RB_FROMFILE 26 +#define LB_TABLES 27 +#define BTN_BROWSE 28 +#define CB_LINK 29 +#define FT_PATH 30 diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index d0ae51329feb..7fedbcc88d19 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.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 @@ -60,35 +60,35 @@ public: ScInsertTableDlg( Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile ); ~ScInsertTableDlg(); - virtual short Execute(); // ueberladen, um Dialog-Parent zu setzen + virtual short Execute(); // ueberladen, um Dialog-Parent zu setzen - BOOL GetTablesFromFile() { return aBtnFromFile.IsChecked(); } - BOOL GetTablesAsLink() { return aBtnLink.IsChecked(); } + BOOL GetTablesFromFile() { return aBtnFromFile.IsChecked(); } + BOOL GetTablesAsLink() { return aBtnLink.IsChecked(); } - const String* GetFirstTable( USHORT* pN = NULL ); - const String* GetNextTable( USHORT* pN = NULL ); - ScDocShell* GetDocShellTables() { return pDocShTables; } - BOOL IsTableBefore() { return aBtnBefore.IsChecked(); } - SCTAB GetTableCount() { return nTableCount;} + const String* GetFirstTable( USHORT* pN = NULL ); + const String* GetNextTable( USHORT* pN = NULL ); + ScDocShell* GetDocShellTables() { return pDocShTables; } + BOOL IsTableBefore() { return aBtnBefore.IsChecked(); } + SCTAB GetTableCount() { return nTableCount;} private: - RadioButton aBtnBefore; - RadioButton aBtnBehind; - FixedLine aFlPos; - RadioButton aBtnNew; - RadioButton aBtnFromFile; - FixedText aFtCount; - NumericField aNfCount; - FixedText aFtName; - Edit aEdName; - MultiListBox aLbTables; - ScExpandedFixedText aFtPath; - PushButton aBtnBrowse; - CheckBox aBtnLink; - FixedLine aFlTable; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnBefore; + RadioButton aBtnBehind; + FixedLine aFlPos; + RadioButton aBtnNew; + RadioButton aBtnFromFile; + FixedText aFtCount; + NumericField aNfCount; + FixedText aFtName; + Edit aEdName; + MultiListBox aLbTables; + ScExpandedFixedText aFtPath; + PushButton aBtnBrowse; + CheckBox aBtnLink; + FixedLine aFlTable; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; Timer aBrowseTimer; ScViewData& rViewData; @@ -98,16 +98,16 @@ private: SfxObjectShellRef aDocShTablesRef; bool bMustClose; - USHORT nSelTabIndex; // fuer GetFirstTable() / GetNextTable() - String aStrCurSelTable; - SCTAB nTableCount; + USHORT nSelTabIndex; // fuer GetFirstTable() / GetNextTable() + String aStrCurSelTable; + SCTAB nTableCount; #ifdef SC_INSTBDLG_CXX void Init_Impl( bool bFromFile ); - void SetNewTable_Impl(); - void SetFromTo_Impl(); - void FillTables_Impl( ScDocument* pSrcDoc ); - void DoEnable_Impl(); + void SetNewTable_Impl(); + void SetFromTo_Impl(); + void FillTables_Impl( ScDocument* pSrcDoc ); + void DoEnable_Impl(); DECL_LINK( BrowseHdl_Impl, PushButton* ); DECL_LINK( ChoiceHdl_Impl, RadioButton* ); diff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxx index ebe03a91988f..893e4145ce7a 100644 --- a/sc/source/ui/inc/invmerge.hxx +++ b/sc/source/ui/inc/invmerge.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 @@ -38,21 +38,21 @@ class Window; class ScInvertMerger { private: - Window* pWin; + Window* pWin; ::std::vector< Rectangle >* pRects; - Rectangle aTotalRect; - Rectangle aLineRect; + Rectangle aTotalRect; + Rectangle aLineRect; - void FlushLine(); - void FlushTotal(); + void FlushLine(); + void FlushTotal(); public: ScInvertMerger( Window* pWindow ); ScInvertMerger( ::std::vector< Rectangle >* pRectangles ); ~ScInvertMerger(); - void AddRect( const Rectangle& rRect ); - void Flush(); + void AddRect( const Rectangle& rRect ); + void Flush(); }; diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index f6e8946737d8..17fa0b0ca05e 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.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 @@ -44,19 +44,19 @@ class ScSelEntryDlg : public ModalDialog { private: FixedLine aFlLbTitle; - ListBox aLb; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + ListBox aLb; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; DECL_LINK( DblClkHdl, void * ); public: - ScSelEntryDlg( Window* pParent, - USHORT nResId, + ScSelEntryDlg( Window* pParent, + USHORT nResId, const String& aTitle, const String& aLbTitle, - List& aEntryList ); + List& aEntryList ); ~ScSelEntryDlg(); String GetSelectEntry() const; diff --git a/sc/source/ui/inc/linkarea.hrc b/sc/source/ui/inc/linkarea.hrc index bc906fdb14ad..f0e9ae7120f2 100644 --- a/sc/source/ui/inc/linkarea.hrc +++ b/sc/source/ui/inc/linkarea.hrc @@ -1,7 +1,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 @@ -27,16 +27,16 @@ #include <sc.hrc> -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 -#define FL_LOCATION 4 -#define CB_URL 5 -#define BTN_BROWSE 6 -#define FT_HINT 7 -#define FT_RANGES 8 -#define LB_RANGES 9 -#define BTN_RELOAD 10 -#define NF_DELAY 11 -#define FT_SECONDS 12 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 +#define FL_LOCATION 4 +#define CB_URL 5 +#define BTN_BROWSE 6 +#define FT_HINT 7 +#define FT_RANGES 8 +#define LB_RANGES 9 +#define BTN_RELOAD 10 +#define NF_DELAY 11 +#define FT_SECONDS 12 diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 513cd6d19175..4c287372be5e 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.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 @@ -39,10 +39,10 @@ #include <svtools/stdctrl.hxx> #include <svtools/inettbc.hxx> -//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -//REMOVE SO2_DECL_REF(SvEmbeddedObject) -//REMOVE #endif +//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE SO2_DECL_REF(SvEmbeddedObject) +//REMOVE #endif namespace sfx2 { class DocumentInserter; } namespace sfx2 { class FileDialogHelper; } @@ -54,18 +54,18 @@ class ScDocShell; class ScLinkedAreaDlg : public ModalDialog { private: - FixedLine aFlLocation; - SvtURLBox aCbUrl; - PushButton aBtnBrowse; - FixedInfo aTxtHint; - FixedText aFtRanges; - MultiListBox aLbRanges; - CheckBox aBtnReload; - NumericField aNfDelay; - FixedText aFtSeconds; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedLine aFlLocation; + SvtURLBox aCbUrl; + PushButton aBtnBrowse; + FixedInfo aTxtHint; + FixedText aFtRanges; + MultiListBox aLbRanges; + CheckBox aBtnReload; + NumericField aNfDelay; + FixedText aFtSeconds; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; ScDocShell* pSourceShell; sfx2::DocumentInserter* pDocInserter; @@ -79,26 +79,26 @@ private: DECL_LINK( ReloadHdl, CheckBox* ); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); - void UpdateSourceRanges(); - void UpdateEnable(); - void LoadDocument( const String& rFile, const String& rFilter, + void UpdateSourceRanges(); + void UpdateEnable(); + void LoadDocument( const String& rFile, const String& rFilter, const String& rOptions ); public: ScLinkedAreaDlg( Window* pParent ); ~ScLinkedAreaDlg(); - void InitFromOldLink( const String& rFile, const String& rFilter, + void InitFromOldLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, ULONG nRefresh ); - virtual short Execute(); // overwritten to set dialog parent + virtual short Execute(); // overwritten to set dialog parent - String GetURL(); - String GetFilter(); // may be empty - String GetOptions(); // filter options - String GetSource(); // separated by ";" - ULONG GetRefresh(); // 0 if disabled + String GetURL(); + String GetFilter(); // may be empty + String GetOptions(); // filter options + String GetSource(); // separated by ";" + ULONG GetRefresh(); // 0 if disabled }; #endif diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index 23b89f0d2d41..0f345bea6541 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.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 @@ -35,19 +35,19 @@ class ScLinkTransferObj : public TransferableHelper { private: - String aLinkURL; - String aLinkText; + String aLinkURL; + String aLinkText; public: ScLinkTransferObj(); virtual ~ScLinkTransferObj(); - void SetLinkURL( const String& rURL, const String& rText ); + void SetLinkURL( const String& rURL, const String& rText ); - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); + virtual void DragFinished( sal_Int8 nDropAction ); }; #endif diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx index 58fccaae74f2..2bdffb9a7c7b 100644 --- a/sc/source/ui/inc/mediash.hxx +++ b/sc/source/ui/inc/mediash.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 @@ -46,10 +46,10 @@ public: SFX_DECL_INTERFACE(SCID_MEDIA_SHELL) ScMediaShell(ScViewData* pData); - virtual ~ScMediaShell(); + virtual ~ScMediaShell(); - void ExecuteMedia(SfxRequest& rReq); - void GetMediaState(SfxItemSet &rSet); + void ExecuteMedia(SfxRequest& rReq); + void GetMediaState(SfxItemSet &rSet); }; #endif diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc index 00b1658849d6..160c7b026ec1 100644 --- a/sc/source/ui/inc/miscdlgs.hrc +++ b/sc/source/ui/inc/miscdlgs.hrc @@ -1,7 +1,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 @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "sc.hrc" // -> RID_SCDLG_DELCELL +#include "sc.hrc" // -> RID_SCDLG_DELCELL // -> RID_SCDLG_INSCELL // -> RID_SCDLG_DELCONT // -> RID_SCDLG_INSCONT @@ -52,41 +52,41 @@ // allgemein #define BTN_OK 100 -#define BTN_CANCEL 102 +#define BTN_CANCEL 102 #define BTN_HELP 103 -#define BTN_MORE 104 -#define BTN_ADD 105 -#define BTN_REMOVE 106 -#define FT_LABEL 110 +#define BTN_MORE 104 +#define BTN_ADD 105 +#define BTN_REMOVE 106 +#define FT_LABEL 110 #define FL_FRAME 112 -#define STR_BTN_CLOSE 200 +#define STR_BTN_CLOSE 200 // Zellen loeschen/einfuegen Dialog #define BTN_CELLSUP 10 #define BTN_CELLSDOWN 11 #define BTN_CELLSRIGHT 12 -#define BTN_CELLSLEFT 13 +#define BTN_CELLSLEFT 13 #define BTN_DELROWS 14 #define BTN_DELCOLS 15 #define BTN_INSROWS 16 #define BTN_INSCOLS 17 // Inhalte loeschen/einfuegen Dialog -#define BTN_DELALL 10 -#define BTN_DELSTRINGS 11 -#define BTN_DELNUMBERS 12 -#define BTN_DELDATETIME 13 -#define BTN_DELFORMULAS 14 -#define BTN_DELATTRS 15 -#define BTN_DELNOTES 16 -#define BTN_DELOBJECTS 17 -#define BTN_INSALL 20 -#define BTN_INSSTRINGS 21 -#define BTN_INSNUMBERS 22 -#define BTN_INSDATETIME 23 -#define BTN_INSFORMULAS 24 -#define BTN_INSATTRS 25 -#define BTN_INSNOTES 26 +#define BTN_DELALL 10 +#define BTN_DELSTRINGS 11 +#define BTN_DELNUMBERS 12 +#define BTN_DELDATETIME 13 +#define BTN_DELFORMULAS 14 +#define BTN_DELATTRS 15 +#define BTN_DELNOTES 16 +#define BTN_DELOBJECTS 17 +#define BTN_INSALL 20 +#define BTN_INSSTRINGS 21 +#define BTN_INSNUMBERS 22 +#define BTN_INSDATETIME 23 +#define BTN_INSFORMULAS 24 +#define BTN_INSATTRS 25 +#define BTN_INSNOTES 26 #define BTN_OP_NOOP 27 #define BTN_OP_ADD 28 #define BTN_OP_SUB 29 @@ -97,28 +97,28 @@ #define BTN_TRANSPOSE 34 #define BTN_LINK 35 #define FL_OPTIONS 36 -#define BTN_MV_NONE 37 -#define BTN_MV_DOWN 38 -#define BTN_MV_RIGHT 39 +#define BTN_MV_NONE 37 +#define BTN_MV_DOWN 38 +#define BTN_MV_RIGHT 39 #define FL_MOVE 40 #define BTN_INSOBJECTS 41 #define FL_SEP1 51 #define FL_SEP2 52 // Tabelle einfuegen/loeschen -#define FT_DEST 1 -#define LB_DEST 2 -#define FT_INSERT 3 -#define LB_INSERT 4 -#define BTN_COPY 5 +#define FT_DEST 1 +#define LB_DEST 2 +#define FT_INSERT 3 +#define LB_INSERT 4 +#define BTN_COPY 5 #define STR_NEWDOC 6 // Eingabe eines Strings -#define ED_INPUT 10 +#define ED_INPUT 10 // Eingabe einer Metrik -#define ED_VALUE 1 -#define BTN_DEFVAL 1 +#define ED_VALUE 1 +#define BTN_DEFVAL 1 // Auswahl aus einer (String-)ListBox #define FL_ENTRYLIST 10 @@ -143,44 +143,44 @@ #define BTN_MONTH 24 #define BTN_YEAR 25 #define FT_INCREMENT 30 -#define ED_INCREMENT 39 -#define FT_END_VALUE 40 -#define ED_END_VALUES 49 -#define STR_VALERR 50 -#define FT_START_VALUE 51 -#define ED_START_VALUES 52 +#define ED_INCREMENT 39 +#define FT_END_VALUE 40 +#define ED_END_VALUES 49 +#define STR_VALERR 50 +#define FT_START_VALUE 51 +#define ED_START_VALUES 52 // Autoformat -#define LB_FORMAT 1 +#define LB_FORMAT 1 #define FL_FORMAT 9 -#define WND_PREVIEW 19 -#define BTN_NUMFORMAT 20 -#define BTN_BORDER 21 -#define BTN_FONT 23 -#define BTN_PATTERN 24 -#define BTN_ALIGNMENT 25 -#define BTN_ADJUST 26 -#define BTN_RENAME 27 +#define WND_PREVIEW 19 +#define BTN_NUMFORMAT 20 +#define BTN_BORDER 21 +#define BTN_FONT 23 +#define BTN_PATTERN 24 +#define BTN_ALIGNMENT 25 +#define BTN_ADJUST 26 +#define BTN_RENAME 27 #define FL_FORMATTING 29 -#define STR_ADD_TITLE 100 -#define STR_ADD_LABEL 101 -#define STR_DEL_TITLE 102 -#define STR_DEL_MSG 103 -#define STR_RENAME_TITLE 104 +#define STR_ADD_TITLE 100 +#define STR_ADD_LABEL 101 +#define STR_DEL_TITLE 102 +#define STR_DEL_MSG 103 +#define STR_RENAME_TITLE 104 // Autoformat-Preview: -#define STR_JAN 121 -#define STR_FEB 122 -#define STR_MAR 123 -#define STR_NORTH 124 -#define STR_MID 125 -#define STR_SOUTH 126 -#define STR_SUM 127 +#define STR_JAN 121 +#define STR_FEB 122 +#define STR_MAR 123 +#define STR_NORTH 124 +#define STR_MID 125 +#define STR_SOUTH 126 +#define STR_SUM 127 // Gruppierung setzen/aufheben: -#define BTN_GROUP_COLS 1 -#define BTN_GROUP_ROWS 3 -#define STR_GROUP 1 -#define STR_UNGROUP 2 +#define BTN_GROUP_COLS 1 +#define BTN_GROUP_ROWS 3 +#define STR_GROUP 1 +#define STR_UNGROUP 2 // Tab Bg Color #define TAB_BG_COLOR_CT_BORDER 1 diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 76b5036b4000..6ae9cf8c828d 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.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 @@ -48,20 +48,20 @@ class ScDocumentPool; class ScMessagePool: public SfxItemPool { - SfxStringItem aGlobalStringItem; - SvxSearchItem aGlobalSearchItem; - ScSortItem aGlobalSortItem; - ScQueryItem aGlobalQueryItem; - ScSubTotalItem aGlobalSubTotalItem; - ScConsolidateItem aGlobalConsolidateItem; - ScPivotItem aGlobalPivotItem; - ScSolveItem aGlobalSolveItem; - ScUserListItem aGlobalUserListItem; + SfxStringItem aGlobalStringItem; + SvxSearchItem aGlobalSearchItem; + ScSortItem aGlobalSortItem; + ScQueryItem aGlobalQueryItem; + ScSubTotalItem aGlobalSubTotalItem; + ScConsolidateItem aGlobalConsolidateItem; + ScPivotItem aGlobalPivotItem; + ScSolveItem aGlobalSolveItem; + ScUserListItem aGlobalUserListItem; - SfxBoolItem aPrintWarnItem; + SfxBoolItem aPrintWarnItem; - SfxPoolItem** ppPoolDefaults; - ScDocumentPool* pDocPool; + SfxPoolItem** ppPoolDefaults; + ScDocumentPool* pDocPool; public: ScMessagePool(); @@ -69,7 +69,7 @@ protected: virtual ~ScMessagePool(); public: - virtual SfxMapUnit GetMetric( USHORT nWhich ) const; + virtual SfxMapUnit GetMetric( USHORT nWhich ) const; }; diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 1dedf6ae258d..f86b368bc4ea 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.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 @@ -40,29 +40,29 @@ class ScMetricInputDlg : public ModalDialog { public: - ScMetricInputDlg( Window* pParent, - USHORT nResId, // Ableitung fuer jeden Dialog! - long nCurrent, - long nDefault, - FieldUnit eFUnit = FUNIT_MM, - USHORT nDecimals = 2, - long nMaximum = 1000, - long nMinimum = 0, - long nFirst = 1, + ScMetricInputDlg( Window* pParent, + USHORT nResId, // Ableitung fuer jeden Dialog! + long nCurrent, + long nDefault, + FieldUnit eFUnit = FUNIT_MM, + USHORT nDecimals = 2, + long nMaximum = 1000, + long nMinimum = 0, + long nFirst = 1, long nLast = 100 ); ~ScMetricInputDlg(); long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const; private: - FixedText aFtEditTitle; - MetricField aEdValue; - CheckBox aBtnDefVal; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - long nDefaultValue; - long nCurrentValue; + FixedText aFtEditTitle; + MetricField aEdValue; + CheckBox aBtnDefVal; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + long nDefaultValue; + long nCurrentValue; void CalcPositions(); DECL_LINK( SetDefValHdl, CheckBox * ); diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 27963f335bcb..1260737512a5 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.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 @@ -47,28 +47,28 @@ public: ScMoveTableDlg( Window* pParent ); ~ScMoveTableDlg(); - USHORT GetSelectedDocument () const; - SCTAB GetSelectedTable () const; - BOOL GetCopyTable () const; - void SetCopyTable (BOOL bFlag=TRUE); - void EnableCopyTable (BOOL bFlag=TRUE); + USHORT GetSelectedDocument () const; + SCTAB GetSelectedTable () const; + BOOL GetCopyTable () const; + void SetCopyTable (BOOL bFlag=TRUE); + void EnableCopyTable (BOOL bFlag=TRUE); private: - FixedText aFtDoc; - ListBox aLbDoc; - FixedText aFtTable; - ListBox aLbTable; - CheckBox aBtnCopy; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtDoc; + ListBox aLbDoc; + FixedText aFtTable; + ListBox aLbTable; + CheckBox aBtnCopy; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - USHORT nDocument; - SCTAB nTable; - BOOL bCopyTable; + USHORT nDocument; + SCTAB nTable; + BOOL bCopyTable; //-------------------------------------- - void Init (); - void InitDocListBox (); + void Init (); + void InitDocListBox (); DECL_LINK( OkHdl, void * ); DECL_LINK( SelHdl, ListBox * ); }; diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx index 852a3ce9c85c..0719f68adade 100644 --- a/sc/source/ui/inc/namecrea.hxx +++ b/sc/source/ui/inc/namecrea.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 @@ -38,17 +38,17 @@ class ScNameCreateDlg : public ModalDialog { protected: FixedLine aFixedLine; - CheckBox aTopBox; - CheckBox aLeftBox; - CheckBox aBottomBox; - CheckBox aRightBox; - OKButton aOKButton; - CancelButton aCancelButton; - HelpButton aHelpButton; + CheckBox aTopBox; + CheckBox aLeftBox; + CheckBox aBottomBox; + CheckBox aRightBox; + OKButton aOKButton; + CancelButton aCancelButton; + HelpButton aHelpButton; public: ScNameCreateDlg( Window * pParent, USHORT nFlags ); - USHORT GetFlags() const; + USHORT GetFlags() const; }; diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc index b2eec6879ec3..5381df425e90 100644 --- a/sc/source/ui/inc/namedlg.hrc +++ b/sc/source/ui/inc/namedlg.hrc @@ -1,7 +1,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 @@ -28,25 +28,25 @@ #include "sc.hrc" // -> RID_SCDLG_NAMES #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_REMOVE 4 -#define BTN_HELP 5 -#define BTN_MORE 6 +#define BTN_CANCEL 2 +#define BTN_ADD 3 +#define BTN_REMOVE 4 +#define BTN_HELP 5 +#define BTN_MORE 6 // #define FL_NAME 11 -#define ED_NAME 12 +#define ED_NAME 12 #define FL_ASSIGN 13 -#define ED_ASSIGN 15 -#define RB_ASSIGN 16 +#define ED_ASSIGN 15 +#define RB_ASSIGN 16 // -#define STR_ADD 21 -#define STR_MODIFY 22 +#define STR_ADD 21 +#define STR_MODIFY 22 #define STR_INVALIDSYMBOL 23 // -#define BTN_CRITERIA 31 -#define BTN_PRINTAREA 32 -#define BTN_COLHEADER 33 -#define BTN_ROWHEADER 34 -#define FL_TYPE 35 +#define BTN_CRITERIA 31 +#define BTN_PRINTAREA 32 +#define BTN_COLHEADER 33 +#define BTN_ROWHEADER 34 +#define FL_TYPE 35 diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 627fc8d3fee0..4ae250bec005 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.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 @@ -46,35 +46,35 @@ class ScNameDlg : public ScAnyRefDlg { private: FixedLine aFlName; - ComboBox aEdName; + ComboBox aEdName; FixedLine aFlAssign; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; - - FixedLine aFlType; - CheckBox aBtnPrintArea; - CheckBox aBtnColHeader; - CheckBox aBtnCriteria; - CheckBox aBtnRowHeader; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - MoreButton aBtnMore; - BOOL bSaved; - - const String aStrAdd; // "Hinzufuegen" - const String aStrModify; // "Aendern" - const String errMsgInvalidSym; - - ScViewData* pViewData; - ScDocument* pDoc; - ScRangeName aLocalRangeName; - const ScAddress theCursorPos; - Selection theCurSel; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; + + FixedLine aFlType; + CheckBox aBtnPrintArea; + CheckBox aBtnColHeader; + CheckBox aBtnCriteria; + CheckBox aBtnRowHeader; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + MoreButton aBtnMore; + BOOL bSaved; + + const String aStrAdd; // "Hinzufuegen" + const String aStrModify; // "Aendern" + const String errMsgInvalidSym; + + ScViewData* pViewData; + ScDocument* pDoc; + ScRangeName aLocalRangeName; + const ScAddress theCursorPos; + Selection theCurSel; #ifdef _NAMEDLG_CXX private: @@ -95,20 +95,20 @@ private: protected: - virtual void RefInputDone( BOOL bForced = FALSE ); + virtual void RefInputDone( BOOL bForced = FALSE ); public: ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData, - const ScAddress& aCursorPos ); + ScViewData* ptrViewData, + const ScAddress& aCursorPos ); ~ScNameDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual void SetActive(); + virtual BOOL Close(); }; diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 3c3547666f8f..b006b4146307 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.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 @@ -44,16 +44,16 @@ class ScNamePasteDlg : public ModalDialog DECL_LINK( ListDblClickHdl, ListBox * ); protected: - FixedText aLabelText; - ListBox aNameList; - OKButton aOKButton; - CancelButton aCancelButton; - HelpButton aHelpButton; - PushButton aInsListButton; + FixedText aLabelText; + ListBox aNameList; + OKButton aOKButton; + CancelButton aCancelButton; + HelpButton aHelpButton; + PushButton aInsListButton; public: ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL bInsList=TRUE ); - String GetSelectedName() const; + String GetSelectedName() const; }; diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx index 90bef19cc410..366511e484d0 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.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 @@ -44,7 +44,7 @@ public: ScNavigatorDlg& rDlg, SfxBindings& rBindings ); protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem ); private: diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 6b804589e145..4eaad27040c2 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.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 @@ -53,15 +53,15 @@ class ScRange; //======================================================================== -#define SC_DROPMODE_URL 0 -#define SC_DROPMODE_LINK 1 -#define SC_DROPMODE_COPY 2 +#define SC_DROPMODE_URL 0 +#define SC_DROPMODE_LINK 1 +#define SC_DROPMODE_COPY 2 -enum NavListMode { NAV_LMODE_NONE = 0x4000, - NAV_LMODE_AREAS = 0x2000, - NAV_LMODE_DBAREAS = 0x1000, - NAV_LMODE_DOCS = 0x800, - NAV_LMODE_SCENARIOS = 0x400 }; +enum NavListMode { NAV_LMODE_NONE = 0x4000, + NAV_LMODE_AREAS = 0x2000, + NAV_LMODE_DBAREAS = 0x1000, + NAV_LMODE_DOCS = 0x800, + NAV_LMODE_SCENARIOS = 0x400 }; //======================================================================== // class ScScenarioListBox ----------------------------------------------- @@ -113,23 +113,23 @@ public: ScScenarioWindow( Window* pParent,const String& aQH_List,const String& aQH_Comment); ~ScScenarioWindow(); - void NotifyState( const SfxPoolItem* pState ); - void SetComment( const String& rComment ) + void NotifyState( const SfxPoolItem* pState ); + void SetComment( const String& rComment ) { aEdComment.SetText( rComment ); } - void SetSizePixel( const Size& rNewSize ); + void SetSizePixel( const Size& rNewSize ); protected: - virtual void Paint( const Rectangle& rRec ); + virtual void Paint( const Rectangle& rRec ); private: - ScScenarioListBox aLbScenario; - MultiLineEdit aEdComment; + ScScenarioListBox aLbScenario; + MultiLineEdit aEdComment; }; //================================================================== -// class ColumnEdit +// class ColumnEdit //================================================================== class ColumnEdit : public SpinField { @@ -137,32 +137,32 @@ public: ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ); ~ColumnEdit(); - SCCOL GetCol() { return nCol; } - void SetCol( SCCOL nColNo ); + SCCOL GetCol() { return nCol; } + void SetCol( SCCOL nColNo ); protected: - virtual long Notify( NotifyEvent& rNEvt ); - virtual void LoseFocus(); - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + virtual long Notify( NotifyEvent& rNEvt ); + virtual void LoseFocus(); + virtual void Up(); + virtual void Down(); + virtual void First(); + virtual void Last(); private: ScNavigatorDlg& rDlg; - SCCOL nCol; - USHORT nKeyGroup; - - void EvalText (); - void ExecuteCol (); - SCCOL AlphaToNum ( String& rStr ); - SCCOL NumStrToAlpha ( String& rStr ); - SCCOL NumToAlpha ( SCCOL nColNo, String& rStr ); + SCCOL nCol; + USHORT nKeyGroup; + + void EvalText (); + void ExecuteCol (); + SCCOL AlphaToNum ( String& rStr ); + SCCOL NumStrToAlpha ( String& rStr ); + SCCOL NumToAlpha ( SCCOL nColNo, String& rStr ); }; //================================================================== -// class RowEdit +// class RowEdit //================================================================== class RowEdit : public NumericField { @@ -170,22 +170,22 @@ public: RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ); ~RowEdit(); - SCROW GetRow() { return (SCROW)GetValue(); } - void SetRow( SCROW nRow ){ SetValue( nRow ); } + SCROW GetRow() { return (SCROW)GetValue(); } + void SetRow( SCROW nRow ){ SetValue( nRow ); } protected: - virtual long Notify( NotifyEvent& rNEvt ); - virtual void LoseFocus(); + virtual long Notify( NotifyEvent& rNEvt ); + virtual void LoseFocus(); private: ScNavigatorDlg& rDlg; - void ExecuteRow(); + void ExecuteRow(); }; //================================================================== -// class ScDocListBox +// class ScDocListBox //================================================================== class ScDocListBox : public ListBox { @@ -194,7 +194,7 @@ public: ~ScDocListBox(); protected: - virtual void Select(); + virtual void Select(); private: ScNavigatorDlg& rDlg; @@ -202,7 +202,7 @@ private: //================================================================== -// class CommandToolBox +// class CommandToolBox //================================================================== class CommandToolBox : public ToolBox { @@ -214,20 +214,20 @@ public: void UpdateButtons(); void InitImageList(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); DECL_LINK( ToolBoxDropdownClickHdl, ToolBox* ); protected: - virtual void Select(); - virtual void Click(); + virtual void Select(); + virtual void Click(); private: ScNavigatorDlg& rDlg; }; //================================================================== -// class ScNavigatorDlg +// class ScNavigatorDlg //================================================================== class ScNavigatorDlg : public Window, public SfxListener @@ -241,28 +241,28 @@ friend class CommandToolBox; friend class ScContentTree; private: - SfxBindings& rBindings; // must be first member + SfxBindings& rBindings; // must be first member - ImageList aCmdImageList; // must be before aTbxCmd + ImageList aCmdImageList; // must be before aTbxCmd ImageList aCmdImageListH; - FixedInfo aFtCol; - ColumnEdit aEdCol; - FixedInfo aFtRow; - RowEdit aEdRow; - CommandToolBox aTbxCmd; - ScContentTree aLbEntries; + FixedInfo aFtCol; + ColumnEdit aEdCol; + FixedInfo aFtRow; + RowEdit aEdRow; + CommandToolBox aTbxCmd; + ScContentTree aLbEntries; ScScenarioWindow aWndScenarios; - ScDocListBox aLbDocuments; + ScDocListBox aLbDocuments; - Timer aContentTimer; + Timer aContentTimer; - String aTitleBase; - String aStrDragMode; - String aStrDisplay; - String aStrActive; - String aStrNotActive; - String aStrHidden; - String aStrActiveWin; + String aTitleBase; + String aStrDragMode; + String aStrDisplay; + String aStrActive; + String aStrNotActive; + String aStrHidden; + String aStrActiveWin; SfxChildWindowContext* pContextWin; Size aInitSize; @@ -270,77 +270,77 @@ private: ScViewData* pViewData; long nBorderOffset; - long nListModeHeight; - long nInitListHeight; - NavListMode eListMode; - USHORT nDropMode; - SCCOL nCurCol; - SCROW nCurRow; - SCTAB nCurTab; - BOOL bFirstBig; + long nListModeHeight; + long nInitListHeight; + NavListMode eListMode; + USHORT nDropMode; + SCCOL nCurCol; + SCROW nCurRow; + SCTAB nCurTab; + BOOL bFirstBig; ScNavigatorControllerItem** ppBoundItems; DECL_LINK( TimeHdl, Timer* ); - void DoResize(); + void DoResize(); SfxBindings& GetBindings() { return rBindings; } - void SetCurrentCell( SCCOL nCol, SCROW Row ); - void SetCurrentCellStr( const String rName ); - void SetCurrentTable( SCTAB nTab ); - void SetCurrentTableStr( const String rName ); - void SetCurrentObject( const String rName ); - void SetCurrentDoc( const String& rDocName ); + void SetCurrentCell( SCCOL nCol, SCROW Row ); + void SetCurrentCellStr( const String rName ); + void SetCurrentTable( SCTAB nTab ); + void SetCurrentTableStr( const String rName ); + void SetCurrentObject( const String rName ); + void SetCurrentDoc( const String& rDocName ); ScTabViewShell* GetTabViewShell() const; ScNavigatorSettings* GetNavigatorSettings(); BOOL GetViewData(); - void UpdateColumn ( const SCCOL* pCol = NULL ); - void UpdateRow ( const SCROW* pRow = NULL ); - void UpdateTable ( const SCTAB* pTab = NULL ); - void UpdateAll (); + void UpdateColumn ( const SCCOL* pCol = NULL ); + void UpdateRow ( const SCROW* pRow = NULL ); + void UpdateTable ( const SCTAB* pTab = NULL ); + void UpdateAll (); - void GetDocNames(const String* pSelEntry = NULL); + void GetDocNames(const String* pSelEntry = NULL); - void SetListMode ( NavListMode eMode, BOOL bSetSize = TRUE ); - void ShowList ( BOOL bShow, BOOL bSetSize ); - void ShowScenarios ( BOOL bShow, BOOL bSetSize ); + void SetListMode ( NavListMode eMode, BOOL bSetSize = TRUE ); + void ShowList ( BOOL bShow, BOOL bSetSize ); + void ShowScenarios ( BOOL bShow, BOOL bSetSize ); - void SetDropMode(USHORT nNew); - USHORT GetDropMode() const { return nDropMode; } + void SetDropMode(USHORT nNew); + USHORT GetDropMode() const { return nDropMode; } - const String& GetStrDragMode() const { return aStrDragMode; } - const String& GetStrDisplay() const { return aStrDisplay; } + const String& GetStrDragMode() const { return aStrDragMode; } + const String& GetStrDisplay() const { return aStrDisplay; } - void CheckDataArea (); - void MarkDataArea (); - void UnmarkDataArea (); - void StartOfDataArea (); - void EndOfDataArea (); + void CheckDataArea (); + void MarkDataArea (); + void UnmarkDataArea (); + void StartOfDataArea (); + void EndOfDataArea (); static void ReleaseFocus(); protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRec ); - virtual void Resizing( Size& rSize ); + virtual void Resize(); + virtual void Paint( const Rectangle& rRec ); + virtual void Resizing( Size& rSize ); public: ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent ); ~ScNavigatorDlg(); using Window::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void CursorPosChanged(); + void CursorPosChanged(); virtual SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; //================================================================== @@ -348,14 +348,14 @@ public: class ScNavigatorDialogWrapper: public SfxChildWindowContext { public: - ScNavigatorDialogWrapper( Window* pParent, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo ); + ScNavigatorDialogWrapper( Window* pParent, + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOWCONTEXT(ScNavigatorDialogWrapper) - virtual void Resizing( Size& rSize ); + virtual void Resizing( Size& rSize ); private: ScNavigatorDlg* pNavigator; diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx index 3666a6be981a..1b9fff2bbfa8 100644 --- a/sc/source/ui/inc/navsett.hxx +++ b/sc/source/ui/inc/navsett.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/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index 03626bfeafb7..11eb7c152f22 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.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 @@ -40,23 +40,23 @@ class SdrObject; class ScNoteMarker { private: - Window* pWindow; - Window* pRightWin; - Window* pBottomWin; - Window* pDiagWin; - ScDocument* pDoc; - ScAddress aDocPos; - String aUserText; + Window* pWindow; + Window* pRightWin; + Window* pBottomWin; + Window* pDiagWin; + ScDocument* pDoc; + ScAddress aDocPos; + String aUserText; Rectangle aVisRect; - Timer aTimer; - MapMode aMapMode; - BOOL bLeft; - BOOL bByKeyboard; + Timer aTimer; + MapMode aMapMode; + BOOL bLeft; + BOOL bByKeyboard; - Rectangle aRect; - SdrModel* pModel; - SdrObject* pObject; - BOOL bVisible; + Rectangle aRect; + SdrModel* pModel; + SdrObject* pObject; + BOOL bVisible; DECL_LINK( TimeHdl, Timer* ); @@ -66,11 +66,11 @@ public: const MapMode& rMap, BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard ); ~ScNoteMarker(); - void Draw(); - void InvalidateWin(); + void Draw(); + void InvalidateWin(); - ScAddress GetDocPos() const { return aDocPos; } - BOOL IsByKeyboard() const { return bByKeyboard; } + ScAddress GetDocPos() const { return aDocPos; } + BOOL IsByKeyboard() const { return bByKeyboard; } }; diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx index 0d3e5c8d86a8..214c320b3024 100644 --- a/sc/source/ui/inc/oleobjsh.hxx +++ b/sc/source/ui/inc/oleobjsh.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 @@ -46,7 +46,7 @@ public: SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL) ScOleObjectShell(ScViewData* pData); - virtual ~ScOleObjectShell(); + virtual ~ScOleObjectShell(); }; diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx index 809db33df06d..3f9db1cc88ed 100644 --- a/sc/source/ui/inc/olinefun.hxx +++ b/sc/source/ui/inc/olinefun.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 @@ -40,26 +40,26 @@ class ScRange; class ScOutlineDocFunc { private: - ScDocShell& rDocShell; + ScDocShell& rDocShell; public: ScOutlineDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {} ~ScOutlineDocFunc() {} - BOOL MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ); - BOOL RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ); - BOOL RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi ); - BOOL AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi ); + BOOL MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ); + BOOL RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ); + BOOL RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi ); + BOOL AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi ); - BOOL SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel, + BOOL SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPaint, BOOL bApi ); - BOOL ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ); - BOOL HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ); + BOOL ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ); + BOOL HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ); - BOOL ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, + BOOL ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint, BOOL bApi ); - BOOL HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, + BOOL HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint, BOOL bApi ); }; diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index 266e67dd0999..abe893a94d61 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.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/inc/opredlin.hrc b/sc/source/ui/inc/opredlin.hrc index 2b52d8b46118..212ee87878bf 100644 --- a/sc/source/ui/inc/opredlin.hrc +++ b/sc/source/ui/inc/opredlin.hrc @@ -1,7 +1,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 @@ -24,15 +24,15 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE +#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE -#define FT_CONTENT 1 -#define FT_REMOVE 2 -#define FT_INSERT 3 -#define FT_MOVE 4 -#define GB_COLORCHGS 1 -#define CLB_CONTENT 1 -#define CLB_REMOVE 2 -#define CLB_INSERT 3 -#define CLB_MOVE 4 -#define STR_AUTHOR 1 +#define FT_CONTENT 1 +#define FT_REMOVE 2 +#define FT_INSERT 3 +#define FT_MOVE 4 +#define GB_COLORCHGS 1 +#define CLB_CONTENT 1 +#define CLB_REMOVE 2 +#define CLB_INSERT 3 +#define CLB_MOVE 4 +#define STR_AUTHOR 1 diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index f6c3a2212ca9..b1bf9107c5bf 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.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 @@ -49,16 +49,16 @@ class ScRedlineOptionsTabPage : public SfxTabPage { - FixedText aContentFT; - ColorListBox aContentColorLB; - FixedText aRemoveFT; - ColorListBox aRemoveColorLB; - FixedText aInsertFT; - ColorListBox aInsertColorLB; - FixedText aMoveFT; - ColorListBox aMoveColorLB; + FixedText aContentFT; + ColorListBox aContentColorLB; + FixedText aRemoveFT; + ColorListBox aRemoveColorLB; + FixedText aInsertFT; + ColorListBox aInsertColorLB; + FixedText aMoveFT; + ColorListBox aMoveColorLB; FixedLine aChangedGB; - String aAuthorStr; + String aAuthorStr; DECL_LINK( ColorHdl, ColorListBox *pColorLB ); @@ -67,10 +67,10 @@ public: ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~ScRedlineOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc index e03f3e807037..d409ad32ed24 100644 --- a/sc/source/ui/inc/optdlg.hrc +++ b/sc/source/ui/inc/optdlg.hrc @@ -1,7 +1,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 @@ -28,7 +28,7 @@ #include "sc.hrc" -#define TP_GENERAL 1 +#define TP_GENERAL 1 #define TP_SAVE 2 #define TP_PATH 3 #define TP_SPELL 4 @@ -41,60 +41,60 @@ #define TP_CONTENT 11 #define TP_LAYOUT 12 #define TP_INPUT 13 -#define TP_CHANGES 14 +#define TP_CHANGES 14 #define TP_FORMULA 15 // TP_CALC: -#define BTN_ITERATE 1 -#define FT_STEPS 2 -#define FT_EPS 3 -#define ED_STEPS 4 -#define ED_EPS 5 -#define GB_ZREFS 6 -#define ED_PREC 7 -#define FT_PREC 8 -#define BTN_DATESTD 9 -#define BTN_DATESC10 10 -#define BTN_DATE1904 11 -#define FT_VALUE 13 -#define GB_DATE 14 +#define BTN_ITERATE 1 +#define FT_STEPS 2 +#define FT_EPS 3 +#define ED_STEPS 4 +#define ED_EPS 5 +#define GB_ZREFS 6 +#define ED_PREC 7 +#define FT_PREC 8 +#define BTN_DATESTD 9 +#define BTN_DATESC10 10 +#define BTN_DATE1904 11 +#define FT_VALUE 13 +#define GB_DATE 14 #define BTN_CASE 15 #define FT_CASE 16 -#define BTN_CALC 17 -#define BTN_MATCH 18 -#define BTN_LOOKUP 19 +#define BTN_CALC 17 +#define BTN_MATCH 18 +#define BTN_LOOKUP 19 #define BTN_REGEX 20 #define BTN_GENERAL_PREC 21 // TP_VIEW: -#define BTN_VSCROLL 1 -#define BTN_HSCROLL 2 -#define BTN_REGISTER 3 -#define BTN_OUTLINER 4 -#define BTN_HEADERFOOTER 5 -#define BTN_GRID 6 +#define BTN_VSCROLL 1 +#define BTN_HSCROLL 2 +#define BTN_REGISTER 3 +#define BTN_OUTLINER 4 +#define BTN_HEADERFOOTER 5 +#define BTN_GRID 6 #define BTN_SYNTAX 7 -#define LB_GRIDCOLOR 9 -#define GB_ELEMENTS 10 +#define LB_GRIDCOLOR 9 +#define GB_ELEMENTS 10 #define BTN_HELPLINES 11 #define BTN_FORMULAS 20 #define BTN_NULLVALS 21 #define BTN_NOTES 22 -#define GB_CONTENTS 23 +#define GB_CONTENTS 23 // TP_USERLISTS: -#define FT_LISTS 1 -#define LB_LISTS 1 -#define FT_ENTRIES 2 -#define ED_ENTRIES 2 -#define FT_COPYFROM 3 -#define ED_COPYFROM 3 -#define BTN_NEW 1 -#define BTN_ADD 2 -#define BTN_REMOVE 3 -#define BTN_COPY 4 +#define FT_LISTS 1 +#define LB_LISTS 1 +#define FT_ENTRIES 2 +#define ED_ENTRIES 2 +#define FT_COPYFROM 3 +#define ED_COPYFROM 3 +#define BTN_NEW 1 +#define BTN_ADD 2 +#define BTN_REMOVE 3 +#define BTN_COPY 4 #define STR_QUERYREMOVE 5 #define STR_DISMISS 6 #define STR_COPYLIST 7 @@ -102,61 +102,61 @@ #define STR_COPYERR 9 // TP_PRINT: -#define FL_PAGES 1 -#define BTN_SKIPEMPTYPAGES 2 -#define FL_SHEETS 2 -#define BTN_SELECTEDSHEETS 4 +#define FL_PAGES 1 +#define BTN_SKIPEMPTYPAGES 2 +#define FL_SHEETS 2 +#define BTN_SELECTEDSHEETS 4 // TP_LCONTENT -#define GB_DISPLAY 20 +#define GB_DISPLAY 20 #define CB_FORMULA 21 -#define CB_NIL 22 -#define CB_ANNOT 23 -#define CB_VALUE 24 -#define CB_ANCHOR 25 -#define GB_OBJECT 26 -#define FT_OBJGRF 27 -#define LB_OBJGRF 28 +#define CB_NIL 22 +#define CB_ANNOT 23 +#define CB_VALUE 24 +#define CB_ANCHOR 25 +#define GB_OBJECT 26 +#define FT_OBJGRF 27 +#define LB_OBJGRF 28 #define FT_DIAGRAM 29 #define LB_DIAGRAM 30 -#define FT_DRAW 31 -#define LB_DRAW 32 -#define CB_CLIP 33 +#define FT_DRAW 31 +#define LB_DRAW 32 +#define CB_CLIP 33 #define GB_ZOOM 34 #define CB_SYNCZOOM 35 // TP_LAYOUT #define GB_LINK 1 -#define RB_ALWAYS 2 -#define RB_REQUEST 3 -#define RB_NEVER 4 -#define CB_DOCONLY 5 -#define CB_MERGE_PARA_DIST 6 -#define GB_COMPAT 7 -#define CB_AUTO_UPDATE_FIELDS 8 -#define CB_AUTO_UPDATE_CHARTS 9 -#define FT_UPDATE_LINKS 10 +#define RB_ALWAYS 2 +#define RB_REQUEST 3 +#define RB_NEVER 4 +#define CB_DOCONLY 5 +#define CB_MERGE_PARA_DIST 6 +#define GB_COMPAT 7 +#define CB_AUTO_UPDATE_FIELDS 8 +#define CB_AUTO_UPDATE_CHARTS 9 +#define FT_UPDATE_LINKS 10 #define GB_WINDOW 50 -#define CB_ROWCOLHEADER 51 -#define CB_HSCROLL 52 -#define CB_VSCROLL 53 -#define CB_TBLREG 54 -#define CB_OUTLINE 55 -#define GB_LINES 56 -#define CB_GRID 57 -#define FT_COLOR 58 -#define LB_COLOR 59 -#define CB_GUIDELINE 60 -#define GB_UNIT 61 -#define LB_UNIT 62 -#define ST_UNIT 63 -#define GB_TAB 64 -#define MF_TAB 65 -#define CB_PAGEBREAKS 66 -#define CB_HANDLES 67 -#define CB_BIGHANDLES 68 +#define CB_ROWCOLHEADER 51 +#define CB_HSCROLL 52 +#define CB_VSCROLL 53 +#define CB_TBLREG 54 +#define CB_OUTLINE 55 +#define GB_LINES 56 +#define CB_GRID 57 +#define FT_COLOR 58 +#define LB_COLOR 59 +#define CB_GUIDELINE 60 +#define GB_UNIT 61 +#define LB_UNIT 62 +#define ST_UNIT 63 +#define GB_TAB 64 +#define MF_TAB 65 +#define CB_PAGEBREAKS 66 +#define CB_HANDLES 67 +#define CB_BIGHANDLES 68 #define FT_TAB 69 #define FT_UNIT 70 #define FL_SEPARATOR1 71 @@ -165,15 +165,15 @@ #define FL_H_SEPARATOR 74 // TP_INPUT -#define GB_OPTIONS 70 -#define CB_ALIGN 71 -#define LB_ALIGN 72 -#define CB_EDITMODE 73 -#define CB_FORMAT 74 -#define CB_RFIND 75 -#define CB_EXPREF 76 -#define CB_MARKHDR 77 -#define CB_TEXTFMT 78 +#define GB_OPTIONS 70 +#define CB_ALIGN 71 +#define LB_ALIGN 72 +#define CB_EDITMODE 73 +#define CB_FORMAT 74 +#define CB_RFIND 75 +#define CB_EXPREF 76 +#define CB_MARKHDR 77 +#define CB_TEXTFMT 78 #define CB_REPLWARN 79 diff --git a/sc/source/ui/inc/optload.hrc b/sc/source/ui/inc/optload.hrc index 992bb8c737e4..e43e10284da7 100644 --- a/sc/source/ui/inc/optload.hrc +++ b/sc/source/ui/inc/optload.hrc @@ -1,7 +1,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 @@ -24,17 +24,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE +#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE -#define GB_LINK 1 -#define RB_ALWAYS 2 -#define RB_REQUEST 3 -#define RB_NEVER 4 -#define CB_DOCONLY 5 -#define CB_MERGE_PARA_DIST 6 -#define GB_COMPAT 7 -#define CB_AUTO_UPDATE_FIELDS 8 -#define CB_AUTO_UPDATE_CHARTS 9 -#define FT_UPDATE_LINKS 10 +#define GB_LINK 1 +#define RB_ALWAYS 2 +#define RB_REQUEST 3 +#define RB_NEVER 4 +#define CB_DOCONLY 5 +#define CB_MERGE_PARA_DIST 6 +#define GB_COMPAT 7 +#define CB_AUTO_UPDATE_FIELDS 8 +#define CB_AUTO_UPDATE_CHARTS 9 +#define FT_UPDATE_LINKS 10 diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx index 26ffb04cb3be..1a0584eedf3f 100644 --- a/sc/source/ui/inc/optload.hxx +++ b/sc/source/ui/inc/optload.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 @@ -38,28 +38,28 @@ class ScDocument; class ScLoadOptPage : public SfxTabPage { private: - FixedText aLinkFT; - RadioButton aAlwaysRB; - RadioButton aRequestRB; - RadioButton aNeverRB; - CheckBox aDocOnlyCB; - GroupBox aLinkGB; + FixedText aLinkFT; + RadioButton aAlwaysRB; + RadioButton aRequestRB; + RadioButton aNeverRB; + CheckBox aDocOnlyCB; + GroupBox aLinkGB; ScDocument *pDoc; - DECL_LINK( UpdateHdl, CheckBox* ); + DECL_LINK( UpdateHdl, CheckBox* ); public: ScLoadOptPage( Window* pParent, const SfxItemSet& rSet ); ~ScLoadOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SetDocument(ScDocument*); + void SetDocument(ScDocument*); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrc index 9df8eea1d7f4..88051bacdc64 100644 --- a/sc/source/ui/inc/optsolver.hrc +++ b/sc/source/ui/inc/optsolver.hrc @@ -1,7 +1,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,30 +57,30 @@ #define FL_CONDITIONS 1 #define FL_BUTTONS 2 -#define IB_OBJECTIVECELL 1 -#define IB_TARGET 2 -#define IB_VARIABLECELLS 3 -#define IB_LEFT1 4 -#define IB_LEFT2 5 -#define IB_LEFT3 6 -#define IB_LEFT4 7 -#define IB_RIGHT1 8 -#define IB_RIGHT2 9 -#define IB_RIGHT3 10 -#define IB_RIGHT4 11 -#define IB_DELETE1 12 -#define IB_DELETE2 13 -#define IB_DELETE3 14 -#define IB_DELETE4 15 +#define IB_OBJECTIVECELL 1 +#define IB_TARGET 2 +#define IB_VARIABLECELLS 3 +#define IB_LEFT1 4 +#define IB_LEFT2 5 +#define IB_LEFT3 6 +#define IB_LEFT4 7 +#define IB_RIGHT1 8 +#define IB_RIGHT2 9 +#define IB_RIGHT3 10 +#define IB_RIGHT4 11 +#define IB_DELETE1 12 +#define IB_DELETE2 13 +#define IB_DELETE3 14 +#define IB_DELETE4 15 #define LB_OP1 1 #define LB_OP2 2 #define LB_OP3 3 #define LB_OP4 4 -#define RB_MAX 1 -#define RB_MIN 2 -#define RB_VALUE 3 +#define RB_MAX 1 +#define RB_MIN 2 +#define RB_VALUE 3 #define SB_SCROLL 1 diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index f81fbf05cd1f..d599b5a213b1 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.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/inc/output.hxx b/sc/source/ui/inc/output.hxx index bf4440e04d7b..ab60aad6f94e 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.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 @@ -57,16 +57,16 @@ class SdrPaintWindow; // --------------------------------------------------------------------------- -#define SC_SCENARIO_HSPACE 60 -#define SC_SCENARIO_VSPACE 50 +#define SC_SCENARIO_HSPACE 60 +#define SC_SCENARIO_VSPACE 50 // --------------------------------------------------------------------------- -#define SC_OBJECTS_NONE 0 -#define SC_OBJECTS_DRAWING 1 -#define SC_OBJECTS_OLE 2 -#define SC_OBJECTS_CHARTS 4 -#define SC_OBJECTS_ALL ( SC_OBJECTS_DRAWING | SC_OBJECTS_OLE | SC_OBJECTS_CHARTS ) +#define SC_OBJECTS_NONE 0 +#define SC_OBJECTS_DRAWING 1 +#define SC_OBJECTS_OLE 2 +#define SC_OBJECTS_CHARTS 4 +#define SC_OBJECTS_ALL ( SC_OBJECTS_DRAWING | SC_OBJECTS_OLE | SC_OBJECTS_CHARTS ) enum ScOutputType { OUTTYPE_WINDOW, OUTTYPE_PRINTER }; @@ -83,87 +83,87 @@ private: bool mbRightClip; }; - OutputDevice* pDev; // Device - OutputDevice* pRefDevice; // printer if used for preview - OutputDevice* pFmtDevice; // reference for text formatting + OutputDevice* pDev; // Device + OutputDevice* pRefDevice; // printer if used for preview + OutputDevice* pFmtDevice; // reference for text formatting ScTableInfo& mrTabInfo; - RowInfo* pRowInfo; // Info-Block - SCSIZE nArrCount; // belegte Zeilen im Info-Block - ScDocument* pDoc; // Dokument - SCTAB nTab; // Tabelle - long nScrX; // Ausgabe Startpos. (Pixel) + RowInfo* pRowInfo; // Info-Block + SCSIZE nArrCount; // belegte Zeilen im Info-Block + ScDocument* pDoc; // Dokument + SCTAB nTab; // Tabelle + long nScrX; // Ausgabe Startpos. (Pixel) long nScrY; - long nScrW; // Ausgabe Groesse (Pixel) + long nScrW; // Ausgabe Groesse (Pixel) long nScrH; - long nMirrorW; // Visible output width for mirroring (default: nScrW) - SCCOL nX1; // Start-/Endkoordinaten - SCROW nY1; // ( incl. versteckte ) + long nMirrorW; // Visible output width for mirroring (default: nScrW) + SCCOL nX1; // Start-/Endkoordinaten + SCROW nY1; // ( incl. versteckte ) SCCOL nX2; SCROW nY2; - SCCOL nVisX1; // Start-/Endkoordinaten - SCROW nVisY1; // ( sichtbarer Bereich ) + SCCOL nVisX1; // Start-/Endkoordinaten + SCROW nVisY1; // ( sichtbarer Bereich ) SCCOL nVisX2; SCROW nVisY2; - ScOutputType eType; // Bildschirm/Drucker ... - double nPPTX; // Pixel per Twips + ScOutputType eType; // Bildschirm/Drucker ... + double nPPTX; // Pixel per Twips double nPPTY; -// USHORT nZoom; // Zoom-Faktor (Prozent) - fuer GetFont +// USHORT nZoom; // Zoom-Faktor (Prozent) - fuer GetFont Fraction aZoomX; Fraction aZoomY; - SdrObject* pEditObj; // beim Painten auslassen + SdrObject* pEditObj; // beim Painten auslassen - ScTabViewShell* pViewShell; // zum Connecten von sichtbaren Plug-Ins + ScTabViewShell* pViewShell; // zum Connecten von sichtbaren Plug-Ins // #114135# - FmFormView* pDrawView; // SdrView to paint to + FmFormView* pDrawView; // SdrView to paint to - BOOL bEditMode; // InPlace editierte Zelle - nicht ausgeben + BOOL bEditMode; // InPlace editierte Zelle - nicht ausgeben SCCOL nEditCol; SCROW nEditRow; - BOOL bMetaFile; // Ausgabe auf Metafile (nicht in Pixeln!) - BOOL bSingleGrid; // beim Gitter bChanged auswerten + BOOL bMetaFile; // Ausgabe auf Metafile (nicht in Pixeln!) + BOOL bSingleGrid; // beim Gitter bChanged auswerten - BOOL bPagebreakMode; // Seitenumbruch-Vorschau - BOOL bSolidBackground; // weiss statt transparent + BOOL bPagebreakMode; // Seitenumbruch-Vorschau + BOOL bSolidBackground; // weiss statt transparent BOOL bUseStyleColor; BOOL bForceAutoColor; - BOOL bSyntaxMode; // Syntax-Highlighting + BOOL bSyntaxMode; // Syntax-Highlighting Color* pValueColor; Color* pTextColor; Color* pFormulaColor; - Color aGridColor; + Color aGridColor; - BOOL bShowNullValues; - BOOL bShowFormulas; - BOOL bShowSpellErrors; // Spell-Errors in EditObjekten anzeigen - BOOL bMarkClipped; + BOOL bShowNullValues; + BOOL bShowFormulas; + BOOL bShowSpellErrors; // Spell-Errors in EditObjekten anzeigen + BOOL bMarkClipped; - BOOL bSnapPixel; + BOOL bSnapPixel; - BOOL bAnyRotated; // intern - BOOL bAnyClipped; // intern - BOOL bTabProtected; - BYTE nTabTextDirection; // EEHorizontalTextDirection values - BOOL bLayoutRTL; + BOOL bAnyRotated; // intern + BOOL bAnyClipped; // intern + BOOL bTabProtected; + BYTE nTabTextDirection; // EEHorizontalTextDirection values + BOOL bLayoutRTL; // #i74769# use SdrPaintWindow direct, remember it during BeginDrawLayers/EndDrawLayers - SdrPaintWindow* mpTargetPaintWindow; + SdrPaintWindow* mpTargetPaintWindow; // private methods - BOOL GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, + BOOL GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, SCCOL& rOverX, SCROW& rOverY, BOOL bVisRowChanged ); - BOOL IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY ); - void GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ); + BOOL IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY ); + void GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ); - BOOL IsAvailable( SCCOL nX, SCROW nY ); + BOOL IsAvailable( SCCOL nX, SCROW nY ); - void GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY, + void GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY, SCCOL nCellX, SCROW nCellY, long nNeeded, const ScPatternAttr& rPattern, USHORT nHorJustify, bool bCellIsValue, @@ -176,12 +176,12 @@ private: long& rEngineWidth, long& rEngineHeight, long& rNeededPixel, bool& rLeftClip, bool& rRightClip ); - void SetSyntaxColor( Font* pFont, ScBaseCell* pCell ); - void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell ); + void SetSyntaxColor( Font* pFont, ScBaseCell* pCell ); + void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell ); - double GetStretch(); + double GetStretch(); - void DrawRotatedFrame( const Color* pForceColor ); // pixel + void DrawRotatedFrame( const Color* pForceColor ); // pixel public: ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, @@ -196,47 +196,47 @@ public: void SetContentDevice( OutputDevice* pContentDev ); - void SetRefDevice( OutputDevice* pRDev ) { pRefDevice = pFmtDevice = pRDev; } - void SetFmtDevice( OutputDevice* pRDev ) { pFmtDevice = pRDev; } - void SetEditObject( SdrObject* pObj ) { pEditObj = pObj; } - void SetViewShell( ScTabViewShell* pSh ) { pViewShell = pSh; } + void SetRefDevice( OutputDevice* pRDev ) { pRefDevice = pFmtDevice = pRDev; } + void SetFmtDevice( OutputDevice* pRDev ) { pFmtDevice = pRDev; } + void SetEditObject( SdrObject* pObj ) { pEditObj = pObj; } + void SetViewShell( ScTabViewShell* pSh ) { pViewShell = pSh; } // #114135# - void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; } - - void SetSolidBackground( BOOL bSet ) { bSolidBackground = bSet; } - void SetUseStyleColor( BOOL bSet ) { bUseStyleColor = bSet; } - - void SetEditCell( SCCOL nCol, SCROW nRow ); - void SetSyntaxMode( BOOL bNewMode ); - void SetMetaFileMode( BOOL bNewMode ); - void SetSingleGrid( BOOL bNewMode ); - void SetGridColor( const Color& rColor ); - void SetMarkClipped( BOOL bSet ); - void SetShowNullValues ( BOOL bSet = TRUE ); - void SetShowFormulas ( BOOL bSet = TRUE ); - void SetShowSpellErrors( BOOL bSet = TRUE ); - void SetMirrorWidth( long nNew ); - long GetScrW() const { return nScrW; } - long GetScrH() const { return nScrH; } - - void SetSnapPixel( BOOL bSet = TRUE ); - - void DrawGrid( BOOL bGrid, BOOL bPage ); - void DrawStrings( BOOL bPixelToLogic = FALSE ); + void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; } + + void SetSolidBackground( BOOL bSet ) { bSolidBackground = bSet; } + void SetUseStyleColor( BOOL bSet ) { bUseStyleColor = bSet; } + + void SetEditCell( SCCOL nCol, SCROW nRow ); + void SetSyntaxMode( BOOL bNewMode ); + void SetMetaFileMode( BOOL bNewMode ); + void SetSingleGrid( BOOL bNewMode ); + void SetGridColor( const Color& rColor ); + void SetMarkClipped( BOOL bSet ); + void SetShowNullValues ( BOOL bSet = TRUE ); + void SetShowFormulas ( BOOL bSet = TRUE ); + void SetShowSpellErrors( BOOL bSet = TRUE ); + void SetMirrorWidth( long nNew ); + long GetScrW() const { return nScrW; } + long GetScrH() const { return nScrH; } + + void SetSnapPixel( BOOL bSet = TRUE ); + + void DrawGrid( BOOL bGrid, BOOL bPage ); + void DrawStrings( BOOL bPixelToLogic = FALSE ); void DrawDocumentBackground(); - void DrawBackground(); - void DrawShadow(); - void DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom); - void DrawFrame(); + void DrawBackground(); + void DrawShadow(); + void DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom); + void DrawFrame(); // with logic MapMode set! - void DrawEdit(BOOL bPixelToLogic); + void DrawEdit(BOOL bPixelToLogic); - void FindRotated(); - void DrawRotated(BOOL bPixelToLogic); // logisch + void FindRotated(); + void DrawRotated(BOOL bPixelToLogic); // logisch - void DrawClear(); + void DrawClear(); // #i72502# printer only command set Point PrePrintDrawingLayer(long nLogStX, long nLogStY ); @@ -244,27 +244,27 @@ public: void PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOffset); // nur Bildschirm: - void DrawingSingle(const sal_uInt16 nLayer); - void DrawSelectiveObjects(const sal_uInt16 nLayer); + void DrawingSingle(const sal_uInt16 nLayer); + void DrawSelectiveObjects(const sal_uInt16 nLayer); - BOOL SetChangedClip(); // FALSE = nix + BOOL SetChangedClip(); // FALSE = nix PolyPolygon GetChangedArea(); - void FindChanged(); - void SetPagebreakMode( ScPageBreakData* pPageData ); + void FindChanged(); + void SetPagebreakMode( ScPageBreakData* pPageData ); #ifdef OLD_SELECTION_PAINT void DrawMark( Window* pWin ); -#endif - void DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, +#endif + void DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, SCCOL nRefEndX, SCROW nRefEndY, const Color& rColor, BOOL bHandle ); - void DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, + void DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, SCCOL nRefEndX, SCROW nRefEndY, const Color& rColor, USHORT nType ); - void DrawChangeTrack(); - void DrawClipMarks(); + void DrawChangeTrack(); + void DrawClipMarks(); - void DrawNoteMarks(); + void DrawNoteMarks(); void AddPDFNotes(); }; diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx index 31ce7a5db38c..674bb38bc581 100644 --- a/sc/source/ui/inc/pagedata.hxx +++ b/sc/source/ui/inc/pagedata.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 @@ -39,55 +39,55 @@ class ScDocShell; class ScPrintRangeData { private: - ScRange aPrintRange; - size_t nPagesX; - SCCOL* pPageEndX; - size_t nPagesY; - SCROW* pPageEndY; - long nFirstPage; - BOOL bTopDown; - BOOL bAutomatic; + ScRange aPrintRange; + size_t nPagesX; + SCCOL* pPageEndX; + size_t nPagesY; + SCROW* pPageEndY; + long nFirstPage; + BOOL bTopDown; + BOOL bAutomatic; public: ScPrintRangeData(); ~ScPrintRangeData(); - void SetPrintRange( const ScRange& rNew ) { aPrintRange = rNew; } - const ScRange& GetPrintRange() const { return aPrintRange; } + void SetPrintRange( const ScRange& rNew ) { aPrintRange = rNew; } + const ScRange& GetPrintRange() const { return aPrintRange; } - void SetPagesX( size_t nCount, const SCCOL* pEnd ); - void SetPagesY( size_t nCount, const SCROW* pEnd ); + void SetPagesX( size_t nCount, const SCCOL* pEnd ); + void SetPagesY( size_t nCount, const SCROW* pEnd ); - size_t GetPagesX() const { return nPagesX; } - const SCCOL* GetPageEndX() const { return pPageEndX; } - size_t GetPagesY() const { return nPagesY; } - const SCROW* GetPageEndY() const { return pPageEndY; } + size_t GetPagesX() const { return nPagesX; } + const SCCOL* GetPageEndX() const { return pPageEndX; } + size_t GetPagesY() const { return nPagesY; } + const SCROW* GetPageEndY() const { return pPageEndY; } - void SetFirstPage( long nNew ) { nFirstPage = nNew; } - long GetFirstPage() const { return nFirstPage; } - void SetTopDown( BOOL bSet ) { bTopDown = bSet; } - BOOL IsTopDown() const { return bTopDown; } - void SetAutomatic( BOOL bSet ) { bAutomatic = bSet; } - BOOL IsAutomatic() const { return bAutomatic; } + void SetFirstPage( long nNew ) { nFirstPage = nNew; } + long GetFirstPage() const { return nFirstPage; } + void SetTopDown( BOOL bSet ) { bTopDown = bSet; } + BOOL IsTopDown() const { return bTopDown; } + void SetAutomatic( BOOL bSet ) { bAutomatic = bSet; } + BOOL IsAutomatic() const { return bAutomatic; } }; class ScPageBreakData { private: - size_t nAlloc; - size_t nUsed; - ScPrintRangeData* pData; // Array + size_t nAlloc; + size_t nUsed; + ScPrintRangeData* pData; // Array public: ScPageBreakData(size_t nMax); ~ScPageBreakData(); - size_t GetCount() const { return nUsed; } - ScPrintRangeData& GetData(size_t i); + size_t GetCount() const { return nUsed; } + ScPrintRangeData& GetData(size_t i); - BOOL IsEqual( const ScPageBreakData& rOther ) const; + BOOL IsEqual( const ScPageBreakData& rOther ) const; - void AddPages(); + void AddPages(); }; diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx index 36fac42a01ca..5272fb819c7f 100644 --- a/sc/source/ui/inc/parawin.hxx +++ b/sc/source/ui/inc/parawin.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 @@ -30,7 +30,7 @@ #define SC_PARAWIN_HXX #include "funcutl.hxx" -#include "global.hxx" // ScAddress +#include "global.hxx" // ScAddress #include <svtools/stdctrl.hxx> #include <vcl/lstbox.hxx> #include <vcl/group.hxx> @@ -50,53 +50,53 @@ class ScFuncDesc; //============================================================================ -#define NOT_FOUND 0xffff +#define NOT_FOUND 0xffff //============================================================================ class ScParaWin : public TabPage { private: - Link aScrollLink; - Link aFxLink; - Link aArgModifiedLink; + Link aScrollLink; + Link aFxLink; + Link aArgModifiedLink; ::std::vector<USHORT> aVisibleArgMapping; - const ScFuncDesc* pFuncDesc; - ScAnyRefDlg* pMyParent; - USHORT nArgs; // unsuppressed arguments - Font aFntBold; - Font aFntLight; - - FixedInfo aFtEditDesc; - FixedText aFtArgName; - FixedInfo aFtArgDesc; - - ImageButton aBtnFx1; - FixedText aFtArg1; - ArgEdit aEdArg1; - formula::RefButton aRefBtn1; - ImageButton aBtnFx2; - FixedText aFtArg2; - ArgEdit aEdArg2; - formula::RefButton aRefBtn2; - ImageButton aBtnFx3; - FixedText aFtArg3; - ArgEdit aEdArg3; - formula::RefButton aRefBtn3; - ImageButton aBtnFx4; - FixedText aFtArg4; - ArgEdit aEdArg4; - formula::RefButton aRefBtn4; - ScrollBar aSlider; - BOOL bRefMode; - - USHORT nEdFocus; - USHORT nActiveLine; - - ArgInput aArgInput[4]; - String aDefaultString; - SvStrings aParaArray; + const ScFuncDesc* pFuncDesc; + ScAnyRefDlg* pMyParent; + USHORT nArgs; // unsuppressed arguments + Font aFntBold; + Font aFntLight; + + FixedInfo aFtEditDesc; + FixedText aFtArgName; + FixedInfo aFtArgDesc; + + ImageButton aBtnFx1; + FixedText aFtArg1; + ArgEdit aEdArg1; + formula::RefButton aRefBtn1; + ImageButton aBtnFx2; + FixedText aFtArg2; + ArgEdit aEdArg2; + formula::RefButton aRefBtn2; + ImageButton aBtnFx3; + FixedText aFtArg3; + ArgEdit aEdArg3; + formula::RefButton aRefBtn3; + ImageButton aBtnFx4; + FixedText aFtArg4; + ArgEdit aEdArg4; + formula::RefButton aRefBtn4; + ScrollBar aSlider; + BOOL bRefMode; + + USHORT nEdFocus; + USHORT nActiveLine; + + ArgInput aArgInput[4]; + String aDefaultString; + SvStrings aParaArray; DECL_LINK( ScrollHdl, ScrollBar* ); DECL_LINK( ModifyHdl, ArgInput* ); DECL_LINK( GetEdFocusHdl, ArgInput* ); @@ -105,52 +105,52 @@ private: protected: - virtual void SliderMoved(); - virtual void ArgumentModified(); - virtual void FxClick(); + virtual void SliderMoved(); + virtual void ArgumentModified(); + virtual void FxClick(); - void InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx, + void InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx, ArgEdit& rEdArg, formula::RefButton& rRefBtn); - void DelParaArray(); - void SetArgumentDesc(const String& aText); - void SetArgumentText(const String& aText); + void DelParaArray(); + void SetArgumentDesc(const String& aText); + void SetArgumentText(const String& aText); - void SetArgName (USHORT no,const String &aArg); - void SetArgNameFont (USHORT no,const Font&); - void SetArgVal (USHORT no,const String &aArg); + void SetArgName (USHORT no,const String &aArg); + void SetArgNameFont (USHORT no,const Font&); + void SetArgVal (USHORT no,const String &aArg); - void HideParaLine(USHORT no); - void ShowParaLine(USHORT no); - void UpdateArgDesc( USHORT nArg ); - void UpdateArgInput( USHORT nOffset, USHORT i ); + void HideParaLine(USHORT no); + void ShowParaLine(USHORT no); + void UpdateArgDesc( USHORT nArg ); + void UpdateArgInput( USHORT nOffset, USHORT i ); public: ScParaWin(ScAnyRefDlg* pParent,Point aPos); ~ScParaWin(); - void SetFunctionDesc(const ScFuncDesc* pFDesc); - void SetArgumentOffset(USHORT nOffset); - void SetEditDesc(const String& aText); - void UpdateParas(); - void ClearAll(); + void SetFunctionDesc(const ScFuncDesc* pFDesc); + void SetArgumentOffset(USHORT nOffset); + void SetEditDesc(const String& aText); + void UpdateParas(); + void ClearAll(); - BOOL IsRefMode() {return bRefMode;} - void SetRefMode(BOOL bFlag) {bRefMode=bFlag;} + BOOL IsRefMode() {return bRefMode;} + void SetRefMode(BOOL bFlag) {bRefMode=bFlag;} - USHORT GetActiveLine(); - void SetActiveLine(USHORT no); - formula::RefEdit* GetActiveEdit(); - String GetActiveArgName(); + USHORT GetActiveLine(); + void SetActiveLine(USHORT no); + formula::RefEdit* GetActiveEdit(); + String GetActiveArgName(); - String GetArgument(USHORT no); - void SetArgument(USHORT no, const String& aString); - void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont); + String GetArgument(USHORT no); + void SetArgument(USHORT no, const String& aString); + void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont); - void SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen - USHORT GetSliderPos(); - void SetSliderPos(USHORT nSliderPos); + void SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen + USHORT GetSliderPos(); + void SetSliderPos(USHORT nSliderPos); void SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; } const Link& GetScrollHdl() const { return aScrollLink; } diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 64df881086db..5baf841dae7e 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.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 @@ -55,77 +55,77 @@ class ScPivotFilterDlg : public ModalDialog { public: ScPivotFilterDlg( Window* pParent, - const SfxItemSet& rArgSet, SCTAB nSourceTab ); + const SfxItemSet& rArgSet, SCTAB nSourceTab ); ~ScPivotFilterDlg(); - const ScQueryItem& GetOutputItem(); + const ScQueryItem& GetOutputItem(); private: FixedLine aFlCriteria; //---------------------------- - ListBox aLbField1; - ListBox aLbCond1; - ComboBox aEdVal1; + ListBox aLbField1; + ListBox aLbCond1; + ComboBox aEdVal1; //---------------------------- - ListBox aLbConnect1; - ListBox aLbField2; - ListBox aLbCond2; - ComboBox aEdVal2; + ListBox aLbConnect1; + ListBox aLbField2; + ListBox aLbCond2; + ComboBox aEdVal2; //---------------------------- - ListBox aLbConnect2; - ListBox aLbField3; - ListBox aLbCond3; - ComboBox aEdVal3; + ListBox aLbConnect2; + ListBox aLbField3; + ListBox aLbCond3; + ComboBox aEdVal3; //---------------------------- - FixedText aFtConnect; - FixedText aFtField; - FixedText aFtCond; - FixedText aFtVal; + FixedText aFtConnect; + FixedText aFtField; + FixedText aFtCond; + FixedText aFtVal; FixedLine aFlOptions; - CheckBox aBtnCase; - CheckBox aBtnRegExp; - CheckBox aBtnUnique; - FixedText aFtDbAreaLabel; - FixedInfo aFtDbArea; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - MoreButton aBtnMore; - const String aStrUndefined; - const String aStrNoName; - const String aStrNone; - const String aStrEmpty; - const String aStrNotEmpty; - const String aStrRow; - const String aStrColumn; - - const USHORT nWhichQuery; - const ScQueryParam theQueryData; - ScQueryItem* pOutItem; - ScViewData* pViewData; - ScDocument* pDoc; - SCTAB nSrcTab; - - USHORT nFieldCount; - ComboBox* aValueEdArr[3]; - ListBox* aFieldLbArr[3]; - ListBox* aCondLbArr[3]; - - TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; + CheckBox aBtnCase; + CheckBox aBtnRegExp; + CheckBox aBtnUnique; + FixedText aFtDbAreaLabel; + FixedInfo aFtDbArea; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + MoreButton aBtnMore; + const String aStrUndefined; + const String aStrNoName; + const String aStrNone; + const String aStrEmpty; + const String aStrNotEmpty; + const String aStrRow; + const String aStrColumn; + + const USHORT nWhichQuery; + const ScQueryParam theQueryData; + ScQueryItem* pOutItem; + ScViewData* pViewData; + ScDocument* pDoc; + SCTAB nSrcTab; + + USHORT nFieldCount; + ComboBox* aValueEdArr[3]; + ListBox* aFieldLbArr[3]; + ListBox* aCondLbArr[3]; + + TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; #ifdef _PFILTDLG_CXX private: - void Init ( const SfxItemSet& rArgSet ); - void FillFieldLists (); - void UpdateValueList ( USHORT nList ); - void ClearValueList ( USHORT nList ); - USHORT GetFieldSelPos ( SCCOL nField ); + void Init ( const SfxItemSet& rArgSet ); + void FillFieldLists (); + void UpdateValueList ( USHORT nList ); + void ClearValueList ( USHORT nList ); + USHORT GetFieldSelPos ( SCCOL nField ); // Handler: DECL_LINK( LbSelectHdl, ListBox* ); DECL_LINK( ValModifyHdl, ComboBox* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); + DECL_LINK( CheckBoxHdl, CheckBox* ); #endif }; diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx index 9ab60717c635..d5694773c7ef 100644 --- a/sc/source/ui/inc/pfuncache.hxx +++ b/sc/source/ui/inc/pfuncache.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 @@ -55,19 +55,19 @@ enum ScPrintSelectionMode class ScPrintSelectionStatus { - ScPrintSelectionMode eMode; - ScRangeList aRanges; + ScPrintSelectionMode eMode; + ScRangeList aRanges; ScPrintOptions aOptions; public: ScPrintSelectionStatus() : eMode(SC_PRINTSEL_INVALID) {} ~ScPrintSelectionStatus() {} - void SetMode(ScPrintSelectionMode eNew) { eMode = eNew; } - void SetRanges(const ScRangeList& rNew) { aRanges = rNew; } + void SetMode(ScPrintSelectionMode eNew) { eMode = eNew; } + void SetRanges(const ScRangeList& rNew) { aRanges = rNew; } void SetOptions(const ScPrintOptions& rNew) { aOptions = rNew; } - BOOL operator==(const ScPrintSelectionStatus& rOther) const + BOOL operator==(const ScPrintSelectionStatus& rOther) const { return eMode == rOther.eMode && aRanges == rOther.aRanges && aOptions == rOther.aOptions; } ScPrintSelectionMode GetMode() const { return eMode; } @@ -97,11 +97,11 @@ struct ScPrintPageLocation class ScPrintFuncCache { - ScPrintSelectionStatus aSelection; - ScDocShell* pDocSh; - long nTotalPages; - long nPages[MAXTABCOUNT]; - long nFirstAttr[MAXTABCOUNT]; + ScPrintSelectionStatus aSelection; + ScDocShell* pDocSh; + long nTotalPages; + long nPages[MAXTABCOUNT]; + long nFirstAttr[MAXTABCOUNT]; std::vector<ScPrintPageLocation> aLocations; bool bLocInitialized; @@ -110,16 +110,16 @@ public: const ScPrintSelectionStatus& rStatus ); ~ScPrintFuncCache(); - BOOL IsSameSelection( const ScPrintSelectionStatus& rStatus ) const; + BOOL IsSameSelection( const ScPrintSelectionStatus& rStatus ) const; void InitLocations( const ScMarkData& rMark, OutputDevice* pDev ); bool FindLocation( const ScAddress& rCell, ScPrintPageLocation& rLocation ) const; - long GetPageCount() const { return nTotalPages; } - long GetFirstAttr( SCTAB nTab ) const { return nFirstAttr[nTab]; } - SCTAB GetTabForPage( long nPage ) const; - long GetTabStart( SCTAB nTab ) const; - long GetDisplayStart( SCTAB nTab ) const; + long GetPageCount() const { return nTotalPages; } + long GetFirstAttr( SCTAB nTab ) const { return nFirstAttr[nTab]; } + SCTAB GetTabForPage( long nPage ) const; + long GetTabStart( SCTAB nTab ) const; + long GetDisplayStart( SCTAB nTab ) const; }; #endif diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx index bca834c27eb0..ca9bc3d67853 100644 --- a/sc/source/ui/inc/pgbrksh.hxx +++ b/sc/source/ui/inc/pgbrksh.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/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx index fff0f99ad388..d5a2d4ed8476 100644 --- a/sc/source/ui/inc/pivotsh.hxx +++ b/sc/source/ui/inc/pivotsh.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 @@ -46,11 +46,11 @@ public: ScPivotShell( ScTabViewShell* pView ); ~ScPivotShell(); - void Execute ( SfxRequest& rReq ); - void GetState( SfxItemSet& rSet ); + void Execute ( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); private: - ScTabViewShell* pViewShell; + ScTabViewShell* pViewShell; ScDPObject* GetCurrDPObject(); }; diff --git a/sc/source/ui/inc/pntlock.hxx b/sc/source/ui/inc/pntlock.hxx index 1633a160632d..18c090e8dde5 100644 --- a/sc/source/ui/inc/pntlock.hxx +++ b/sc/source/ui/inc/pntlock.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 @@ -34,33 +34,33 @@ class ScPaintLockData { private: - ScRangeListRef xRangeList; - USHORT nMode; - USHORT nLevel; - USHORT nDocLevel; - USHORT nParts; - BOOL bModified; + ScRangeListRef xRangeList; + USHORT nMode; + USHORT nLevel; + USHORT nDocLevel; + USHORT nParts; + BOOL bModified; public: ScPaintLockData(USHORT nNewMode); ~ScPaintLockData(); - void AddRange( const ScRange& rRange, USHORT nP ); + void AddRange( const ScRange& rRange, USHORT nP ); - void SetModified() { bModified = TRUE; } - void IncLevel(sal_Bool bDoc) + void SetModified() { bModified = TRUE; } + void IncLevel(sal_Bool bDoc) { if (bDoc) ++nDocLevel; else ++nLevel; } - void DecLevel(sal_Bool bDoc) + void DecLevel(sal_Bool bDoc) { if (bDoc) --nDocLevel; else --nLevel; } - const ScRangeListRef& GetRangeList() const { return xRangeList; } - USHORT GetParts() const { return nParts; } - USHORT GetLevel(sal_Bool bDoc) const + const ScRangeListRef& GetRangeList() const { return xRangeList; } + USHORT GetParts() const { return nParts; } + USHORT GetLevel(sal_Bool bDoc) const { return bDoc ? nDocLevel : nLevel; } - BOOL GetModified() const { return bModified; } + BOOL GetModified() const { return bModified; } // fuer Wiederherstellen nach Reset - void SetLevel(USHORT nNew, sal_Bool bDoc) + void SetLevel(USHORT nNew, sal_Bool bDoc) { if (bDoc) nDocLevel = nNew; else nLevel = nNew; } }; diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx index ee5bb314f213..72db6f61f98a 100644 --- a/sc/source/ui/inc/popmenu.hxx +++ b/sc/source/ui/inc/popmenu.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 @@ -35,15 +35,15 @@ class SC_DLLPUBLIC ScPopupMenu : public PopupMenu { private: - USHORT nSel; - BOOL bHit; + USHORT nSel; + BOOL bHit; protected: virtual void Select(); public: ScPopupMenu() : nSel(0),bHit(FALSE) {} ScPopupMenu(const ResId& rRes) : PopupMenu(rRes),nSel(0),bHit(FALSE) {} - USHORT GetSelected() const { return nSel; } - BOOL WasHit() const { return bHit; } + USHORT GetSelected() const { return nSel; } + BOOL WasHit() const { return bHit; } }; diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 870441a574c0..648fd47e10f3 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.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 @@ -30,7 +30,7 @@ #include <vcl/window.hxx> -#include "printfun.hxx" // ScPrintState +#include "printfun.hxx" // ScPrintState class ScDocShell; class ScPreviewShell; @@ -40,37 +40,37 @@ class ScPreview : public Window { private: // eingestellt: - long nPageNo; // Seite im Dokument - USHORT nZoom; // eingestellter Zoom - Point aOffset; // positiv + long nPageNo; // Seite im Dokument + USHORT nZoom; // eingestellter Zoom + Point aOffset; // positiv // berechnet: - BOOL bValid; // folgende Werte gueltig - SCTAB nTabCount; - SCTAB nTabsTested; // fuer wieviele Tabellen ist nPages gueltig? - long nPages[MAXTABCOUNT]; - long nFirstAttr[MAXTABCOUNT]; - SCTAB nTab; // Tabelle - long nTabPage; // Seite von Tabelle - long nTabStart; // erste Seite der Tabelle (wirklich) - long nDisplayStart; // dito, relativ zum Anfang der Zaehlung - Date aDate; - Time aTime; - long nTotalPages; - Size aPageSize; // fuer GetOptimalZoom - BOOL bStateValid; - BOOL bLocationValid; - ScPrintState aState; - ScPreviewLocationData* pLocationData; // stores table layout for accessibility API - FmFormView* pDrawView; + BOOL bValid; // folgende Werte gueltig + SCTAB nTabCount; + SCTAB nTabsTested; // fuer wieviele Tabellen ist nPages gueltig? + long nPages[MAXTABCOUNT]; + long nFirstAttr[MAXTABCOUNT]; + SCTAB nTab; // Tabelle + long nTabPage; // Seite von Tabelle + long nTabStart; // erste Seite der Tabelle (wirklich) + long nDisplayStart; // dito, relativ zum Anfang der Zaehlung + Date aDate; + Time aTime; + long nTotalPages; + Size aPageSize; // fuer GetOptimalZoom + BOOL bStateValid; + BOOL bLocationValid; + ScPrintState aState; + ScPreviewLocationData* pLocationData; // stores table layout for accessibility API + FmFormView* pDrawView; SCTAB nCurTab; // intern: - BOOL bInPaint; - BOOL bInGetState; - ScDocShell* pDocShell; - ScPreviewShell* pViewShell; + BOOL bInPaint; + BOOL bInGetState; + ScDocShell* pDocShell; + ScPreviewShell* pViewShell; BOOL bLeftRulerMove; BOOL bRightRulerMove; @@ -78,7 +78,7 @@ private: BOOL bBottomRulerMove; BOOL bHeaderRulerMove; BOOL bFooterRulerMove; - + BOOL bLeftRulerChange; BOOL bRightRulerChange; BOOL bTopRulerChange; @@ -98,13 +98,13 @@ private: long nHeaderHeight; long nFooterHeight; - void TestLastPage(); - void CalcPages( SCTAB nToWhichTab ); - void RecalcPages(); - void UpdateDrawView(); - void DoPrint( ScPreviewLocationData* pFillLocation ); + void TestLastPage(); + void CalcPages( SCTAB nToWhichTab ); + void RecalcPages(); + void UpdateDrawView(); + void DoPrint( ScPreviewLocationData* pFillLocation ); - void InvalidateLocationData( ULONG nId ); + void InvalidateLocationData( ULONG nId ); using Window::SetZoom; @@ -127,13 +127,13 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void DataChanged(BOOL bNewTime = FALSE); // statt Invalidate rufen - void DoInvalidate(); + void DataChanged(BOOL bNewTime = FALSE); // statt Invalidate rufen + void DoInvalidate(); - void SetXOffset( long nX ); - void SetYOffset( long nY ); - void SetZoom(USHORT nNewZoom); - void SetPageNo( long nPage ); + void SetXOffset( long nX ); + void SetYOffset( long nY ); + void SetZoom(USHORT nNewZoom); + void SetPageNo( long nPage ); BOOL GetPageMargins()const { return bPageMargin; } void SetPageMargins( BOOL bVal ) { bPageMargin = bVal; } @@ -143,22 +143,22 @@ public: const ScPreviewLocationData& GetLocationData(); - String GetPosString(); + String GetPosString(); - long GetPageNo() const { return nPageNo; } - USHORT GetZoom() const { return nZoom; } - Point GetOffset() const { return aOffset; } + long GetPageNo() const { return nPageNo; } + USHORT GetZoom() const { return nZoom; } + Point GetOffset() const { return aOffset; } - SCTAB GetTab() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTab; } - long GetTotalPages() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTotalPages; } + SCTAB GetTab() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTab; } + long GetTotalPages() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTotalPages; } - BOOL AllTested() const { return bValid && nTabsTested >= nTabCount; } + BOOL AllTested() const { return bValid && nTabsTested >= nTabCount; } - USHORT GetOptimalZoom(BOOL bWidthOnly); - long GetFirstPage(SCTAB nTab); + USHORT GetOptimalZoom(BOOL bWidthOnly); + long GetFirstPage(SCTAB nTab); - void CalcAll() { CalcPages(MAXTAB); } - void SetInGetState(BOOL bSet) { bInGetState = bSet; } + void CalcAll() { CalcPages(MAXTAB); } + void SetInGetState(BOOL bSet) { bInGetState = bSet; } DECL_STATIC_LINK( ScPreview, InvalidateHdl, void* ); static void StaticInvalidate(); diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx index fdba3a6f66ab..9dc2782de1da 100644 --- a/sc/source/ui/inc/prevloc.hxx +++ b/sc/source/ui/inc/prevloc.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 @@ -35,7 +35,7 @@ #include <sal/types.h> -#define SC_PREVIEW_MAXRANGES 4 +#define SC_PREVIEW_MAXRANGES 4 #define SC_PREVIEW_RANGE_EDGE 0 #define SC_PREVIEW_RANGE_REPCOL 1 #define SC_PREVIEW_RANGE_REPROW 2 @@ -51,10 +51,10 @@ class ScDocument; struct ScPreviewColRowInfo { - BOOL bIsHeader; + BOOL bIsHeader; SCCOLROW nDocIndex; - long nPixelStart; - long nPixelEnd; + long nPixelStart; + long nPixelEnd; void Set( BOOL bHeader, SCCOLROW nIndex, long nStart, long nEnd ) { @@ -67,81 +67,81 @@ struct ScPreviewColRowInfo class ScPreviewTableInfo { - SCTAB nTab; - SCCOL nCols; - SCROW nRows; - ScPreviewColRowInfo* pColInfo; - ScPreviewColRowInfo* pRowInfo; + SCTAB nTab; + SCCOL nCols; + SCROW nRows; + ScPreviewColRowInfo* pColInfo; + ScPreviewColRowInfo* pRowInfo; public: ScPreviewTableInfo(); ~ScPreviewTableInfo(); - SCTAB GetTab() const { return nTab; } - SCCOL GetCols() const { return nCols; } - SCROW GetRows() const { return nRows; } - const ScPreviewColRowInfo* GetColInfo() const { return pColInfo; } - const ScPreviewColRowInfo* GetRowInfo() const { return pRowInfo; } + SCTAB GetTab() const { return nTab; } + SCCOL GetCols() const { return nCols; } + SCROW GetRows() const { return nRows; } + const ScPreviewColRowInfo* GetColInfo() const { return pColInfo; } + const ScPreviewColRowInfo* GetRowInfo() const { return pRowInfo; } - void SetTab( SCTAB nNewTab ); - void SetColInfo( SCCOL nCount, ScPreviewColRowInfo* pNewInfo ); - void SetRowInfo( SCROW nCount, ScPreviewColRowInfo* pNewInfo ); - void LimitToArea( const Rectangle& rPixelArea ); + void SetTab( SCTAB nNewTab ); + void SetColInfo( SCCOL nCount, ScPreviewColRowInfo* pNewInfo ); + void SetRowInfo( SCROW nCount, ScPreviewColRowInfo* pNewInfo ); + void LimitToArea( const Rectangle& rPixelArea ); }; class ScPreviewLocationData { OutputDevice* pWindow; - ScDocument* pDoc; - MapMode aCellMapMode; - MapMode aDrawMapMode[SC_PREVIEW_MAXRANGES]; - Rectangle aDrawRectangle[SC_PREVIEW_MAXRANGES]; - sal_uInt8 aDrawRangeId[SC_PREVIEW_MAXRANGES]; - USHORT nDrawRanges; - SCTAB nPrintTab; - List aEntries; + ScDocument* pDoc; + MapMode aCellMapMode; + MapMode aDrawMapMode[SC_PREVIEW_MAXRANGES]; + Rectangle aDrawRectangle[SC_PREVIEW_MAXRANGES]; + sal_uInt8 aDrawRangeId[SC_PREVIEW_MAXRANGES]; + USHORT nDrawRanges; + SCTAB nPrintTab; + List aEntries; - Rectangle GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const; + Rectangle GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const; public: ScPreviewLocationData( ScDocument* pDocument, OutputDevice* pWin ); ~ScPreviewLocationData(); - void SetCellMapMode( const MapMode& rMapMode ); - void SetPrintTab( SCTAB nNew ); - void Clear(); - void AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow, + void SetCellMapMode( const MapMode& rMapMode ); + void SetPrintTab( SCTAB nNew ); + void Clear(); + void AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow, const MapMode& rDrawMap ); - void AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol ); - void AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow ); - void AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft ); - void AddNoteMark( const Rectangle& rRect, const ScAddress& rPos ); - void AddNoteText( const Rectangle& rRect, const ScAddress& rPos ); + void AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol ); + void AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow ); + void AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft ); + void AddNoteMark( const Rectangle& rRect, const ScAddress& rPos ); + void AddNoteText( const Rectangle& rRect, const ScAddress& rPos ); - SCTAB GetPrintTab() const { return nPrintTab; } + SCTAB GetPrintTab() const { return nPrintTab; } - // Get info on visible columns/rows in the visible area - void GetTableInfo( const Rectangle& rVisiblePixel, ScPreviewTableInfo& rInfo ) const; + // Get info on visible columns/rows in the visible area + void GetTableInfo( const Rectangle& rVisiblePixel, ScPreviewTableInfo& rInfo ) const; - USHORT GetDrawRanges() const { return nDrawRanges; } - void GetDrawRange( USHORT nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const; + USHORT GetDrawRanges() const { return nDrawRanges; } + void GetDrawRange( USHORT nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const; - BOOL GetHeaderPosition( Rectangle& rHeaderRect ) const; - BOOL GetFooterPosition( Rectangle& rFooterRect ) const; - BOOL IsHeaderLeft() const; - BOOL IsFooterLeft() const; + BOOL GetHeaderPosition( Rectangle& rHeaderRect ) const; + BOOL GetFooterPosition( Rectangle& rFooterRect ) const; + BOOL IsHeaderLeft() const; + BOOL IsFooterLeft() const; - long GetNoteCountInRange( const Rectangle& rVisiblePixel, BOOL bNoteMarks ) const; - BOOL GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, BOOL bNoteMarks, + long GetNoteCountInRange( const Rectangle& rVisiblePixel, BOOL bNoteMarks ) const; + BOOL GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, BOOL bNoteMarks, ScAddress& rCellPos, Rectangle& rNoteRect ) const; - Rectangle GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, BOOL bNoteMarks, + Rectangle GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, BOOL bNoteMarks, const ScAddress& aCellPos) const; - // Check if any cells (including column/row headers) are in the visible area - BOOL HasCellsInRange( const Rectangle& rVisiblePixel ) const; + // Check if any cells (including column/row headers) are in the visible area + BOOL HasCellsInRange( const Rectangle& rVisiblePixel ) const; - BOOL GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const; + BOOL GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const; // returns the rectangle where the EditEngine draws the text of a Header Cell // if bColHeader is true it returns the rectangle of the header of the column in rCellPos diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 861fba46d892..944ada80a46c 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.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 @@ -50,40 +50,40 @@ class CommandEvent; class ScPreviewShell: public SfxViewShell { - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScPreview* pPreview; // Ausgabe-Fenster - ScrollBar* pHorScroll; - ScrollBar* pVerScroll; - Window* pCorner; + ScPreview* pPreview; // Ausgabe-Fenster + ScrollBar* pHorScroll; + ScrollBar* pVerScroll; + Window* pCorner; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData; // ViewData - BYTE nSourceDesignMode; // form design mode from TabView - SvxZoomType eZoom; + BYTE nSourceDesignMode; // form design mode from TabView + SvxZoomType eZoom; long nMaxVertPos; - SfxBroadcaster* pAccessibilityBroadcaster; + SfxBroadcaster* pAccessibilityBroadcaster; private: - void Construct( Window* pParent ); + void Construct( Window* pParent ); DECL_LINK(ScrollHandler, ScrollBar* ); - void DoScroll( USHORT nMode ); + void DoScroll( USHORT nMode ); protected: - virtual void Activate(BOOL bMDI); - virtual void Deactivate(BOOL bMDI); + virtual void Activate(BOOL bMDI); + virtual void Deactivate(BOOL bMDI); - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual Size GetOptimalSizePixel() const; + virtual Size GetOptimalSizePixel() const; virtual String GetDescription() const; - virtual void WriteUserData(String &, BOOL bBrowse = FALSE); - virtual void ReadUserData(const String &, BOOL bBrowse = FALSE); + virtual void WriteUserData(String &, BOOL bBrowse = FALSE); + virtual void ReadUserData(const String &, BOOL bBrowse = FALSE); virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -94,43 +94,43 @@ public: SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL) SFX_DECL_VIEWFACTORY(ScPreviewShell); - ScPreviewShell( SfxViewFrame* pViewFrame, - SfxViewShell* pOldSh ); + ScPreviewShell( SfxViewFrame* pViewFrame, + SfxViewShell* pOldSh ); - virtual ~ScPreviewShell(); + virtual ~ScPreviewShell(); - void InitStartTable(SCTAB nTab); + void InitStartTable(SCTAB nTab); - void UpdateScrollBars(); - BOOL ScrollCommand( const CommandEvent& rCEvt ); + void UpdateScrollBars(); + BOOL ScrollCommand( const CommandEvent& rCEvt ); - void Execute( SfxRequest& rReq ); - void GetState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); - void FillFieldData( ScHeaderFieldData& rData ); + void FillFieldData( ScHeaderFieldData& rData ); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > GetSourceData() const { return aSourceData; } - BYTE GetSourceDesignMode() const { return nSourceDesignMode; } + BYTE GetSourceDesignMode() const { return nSourceDesignMode; } virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); + virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); virtual USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); - virtual PrintDialog* CreatePrintDialog( Window* pParent ); + virtual PrintDialog* CreatePrintDialog( Window* pParent ); virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); - virtual void PreparePrint( PrintDialog* pPrintDialog = NULL ); + virtual void PreparePrint( PrintDialog* pPrintDialog = NULL ); virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); virtual USHORT Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog = NULL ); - void AddAccessibilityObject( SfxListener& rObject ); - void RemoveAccessibilityObject( SfxListener& rObject ); - void BroadcastAccessibility( const SfxHint &rHint ); - BOOL HasAccessibilityObjects(); + void AddAccessibilityObject( SfxListener& rObject ); + void RemoveAccessibilityObject( SfxListener& rObject ); + void BroadcastAccessibility( const SfxHint &rHint ); + BOOL HasAccessibilityObjects(); const ScPreviewLocationData& GetLocationData(); - ScDocument* GetDocument(); - ScPreview* GetPreview() { return pPreview; } + ScDocument* GetDocument(); + ScPreview* GetPreview() { return pPreview; } }; diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index 41d33d693607..31c467e8ac02 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.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 @@ -53,27 +53,27 @@ class SvxBrushItem; class SvxShadowItem; class FmFormView; -#define RANGENO_NORANGE USHRT_MAX +#define RANGENO_NORANGE USHRT_MAX -#define PRINT_HEADER_WIDTH (1.0 * TWIPS_PER_CM) -#define PRINT_HEADER_HEIGHT (12.8 * TWIPS_PER_POINT) -#define PRINT_HEADER_FONTHEIGHT 200 +#define PRINT_HEADER_WIDTH (1.0 * TWIPS_PER_CM) +#define PRINT_HEADER_HEIGHT (12.8 * TWIPS_PER_POINT) +#define PRINT_HEADER_FONTHEIGHT 200 - // Einstellungen fuer Kopf-/Fusszeilen + // Einstellungen fuer Kopf-/Fusszeilen struct ScPrintHFParam { - BOOL bEnable; - BOOL bDynamic; - BOOL bShared; - long nHeight; // insgesamt (Hoehe+Abstand+Rahmen) - long nManHeight; // eingestellte Groesse (Min. bei dynamisch) - USHORT nDistance; - USHORT nLeft; // Raender - USHORT nRight; + BOOL bEnable; + BOOL bDynamic; + BOOL bShared; + long nHeight; // insgesamt (Hoehe+Abstand+Rahmen) + long nManHeight; // eingestellte Groesse (Min. bei dynamisch) + USHORT nDistance; + USHORT nLeft; // Raender + USHORT nRight; const ScPageHFItem* pLeft; const ScPageHFItem* pRight; - const SvxBoxItem* pBorder; + const SvxBoxItem* pBorder; const SvxBrushItem* pBack; const SvxShadowItem* pShadow; }; @@ -86,147 +86,147 @@ class ScJobSetup public: ScJobSetup( SfxPrinter* pPrinter ); - Size aUserSize; - MapMode aUserMapMode; - Paper ePaper; + Size aUserSize; + MapMode aUserMapMode; + Paper ePaper; Orientation eOrientation; - USHORT nPaperBin; + USHORT nPaperBin; }; -struct ScPrintState // Variablen aus ScPrintFunc retten +struct ScPrintState // Variablen aus ScPrintFunc retten { - SCTAB nPrintTab; - SCCOL nStartCol; - SCROW nStartRow; - SCCOL nEndCol; - SCROW nEndRow; - USHORT nZoom; - size_t nPagesX; - size_t nPagesY; - long nTabPages; - long nTotalPages; - long nPageStart; - long nDocPages; + SCTAB nPrintTab; + SCCOL nStartCol; + SCROW nStartRow; + SCCOL nEndCol; + SCROW nEndRow; + USHORT nZoom; + size_t nPagesX; + size_t nPagesY; + long nTabPages; + long nTotalPages; + long nPageStart; + long nDocPages; }; class ScPageRowEntry { private: - SCROW nStartRow; - SCROW nEndRow; - size_t nPagesX; - BOOL* pHidden; - //! Anzahl wirklich sichtbarer cachen??? + SCROW nStartRow; + SCROW nEndRow; + size_t nPagesX; + BOOL* pHidden; + //! Anzahl wirklich sichtbarer cachen??? public: - ScPageRowEntry() { nStartRow = nEndRow = 0; nPagesX = 0; pHidden = NULL; } - ~ScPageRowEntry() { delete[] pHidden; } + ScPageRowEntry() { nStartRow = nEndRow = 0; nPagesX = 0; pHidden = NULL; } + ~ScPageRowEntry() { delete[] pHidden; } ScPageRowEntry(const ScPageRowEntry& r); const ScPageRowEntry& operator=(const ScPageRowEntry& r); - SCROW GetStartRow() const { return nStartRow; } - SCROW GetEndRow() const { return nEndRow; } - size_t GetPagesX() const { return nPagesX; } - void SetStartRow(SCROW n) { nStartRow = n; } - void SetEndRow(SCROW n) { nEndRow = n; } + SCROW GetStartRow() const { return nStartRow; } + SCROW GetEndRow() const { return nEndRow; } + size_t GetPagesX() const { return nPagesX; } + void SetStartRow(SCROW n) { nStartRow = n; } + void SetEndRow(SCROW n) { nEndRow = n; } - void SetPagesX(size_t nNew); - void SetHidden(size_t nX); - BOOL IsHidden(size_t nX) const; + void SetPagesX(size_t nNew); + void SetHidden(size_t nX); + BOOL IsHidden(size_t nX) const; - size_t CountVisible() const; + size_t CountVisible() const; }; class ScPrintFunc { private: - ScDocShell* pDocShell; - ScDocument* pDoc; - SfxPrinter* pPrinter; - OutputDevice* pDev; - FmFormView* pDrawView; - - MapMode aOldPrinterMode; // MapMode vor dem Aufruf - - Point aSrcOffset; // Papier-1/100 mm - Point aOffset; // mit Faktor aus Seitenformat skaliert - USHORT nManualZoom; // Zoom in Preview (Prozent) - BOOL bClearWin; // Ausgabe vorher loeschen - BOOL bUseStyleColor; - BOOL bIsRender; - - SCTAB nPrintTab; - long nPageStart; // Offset fuer erste Seite - long nDocPages; // Seiten im Dokument - - const ScRange* pUserArea; // Selektion, wenn im Dialog eingestellt - - const SfxItemSet* pParamSet; // eingestellte Vorlage - BOOL bState; // aus State-struct erzeugt - - // Parameter aus Vorlage: - USHORT nLeftMargin; - USHORT nTopMargin; - USHORT nRightMargin; - USHORT nBottomMargin; - BOOL bCenterHor; - BOOL bCenterVer; - BOOL bLandscape; - BOOL bSourceRangeValid; - - USHORT nPageUsage; - Size aPageSize; // Drucker-Twips - const SvxBoxItem* pBorderItem; + ScDocShell* pDocShell; + ScDocument* pDoc; + SfxPrinter* pPrinter; + OutputDevice* pDev; + FmFormView* pDrawView; + + MapMode aOldPrinterMode; // MapMode vor dem Aufruf + + Point aSrcOffset; // Papier-1/100 mm + Point aOffset; // mit Faktor aus Seitenformat skaliert + USHORT nManualZoom; // Zoom in Preview (Prozent) + BOOL bClearWin; // Ausgabe vorher loeschen + BOOL bUseStyleColor; + BOOL bIsRender; + + SCTAB nPrintTab; + long nPageStart; // Offset fuer erste Seite + long nDocPages; // Seiten im Dokument + + const ScRange* pUserArea; // Selektion, wenn im Dialog eingestellt + + const SfxItemSet* pParamSet; // eingestellte Vorlage + BOOL bState; // aus State-struct erzeugt + + // Parameter aus Vorlage: + USHORT nLeftMargin; + USHORT nTopMargin; + USHORT nRightMargin; + USHORT nBottomMargin; + BOOL bCenterHor; + BOOL bCenterVer; + BOOL bLandscape; + BOOL bSourceRangeValid; + + USHORT nPageUsage; + Size aPageSize; // Drucker-Twips + const SvxBoxItem* pBorderItem; const SvxBrushItem* pBackgroundItem; const SvxShadowItem* pShadowItem; - ScRange aLastSourceRange; - ScPrintHFParam aHdr; - ScPrintHFParam aFtr; - ScPageTableParam aTableParam; - ScPageAreaParam aAreaParam; - - // berechnete Werte: - USHORT nZoom; - BOOL bPrintCurrentTable; - BOOL bMultiArea; - long nTabPages; - long nTotalPages; - - Rectangle aPageRect; // Dokument-Twips - - MapMode aLogicMode; // in DoPrint gesetzt - MapMode aOffsetMode; - MapMode aTwipMode; - double nScaleX; - double nScaleY; - - SCCOL nRepeatStartCol; - SCCOL nRepeatEndCol; - SCROW nRepeatStartRow; - SCROW nRepeatEndRow; - - SCCOL nStartCol; - SCROW nStartRow; - SCCOL nEndCol; - SCROW nEndRow; - - SCCOL* pPageEndX; // Seitenaufteilung + ScRange aLastSourceRange; + ScPrintHFParam aHdr; + ScPrintHFParam aFtr; + ScPageTableParam aTableParam; + ScPageAreaParam aAreaParam; + + // berechnete Werte: + USHORT nZoom; + BOOL bPrintCurrentTable; + BOOL bMultiArea; + long nTabPages; + long nTotalPages; + + Rectangle aPageRect; // Dokument-Twips + + MapMode aLogicMode; // in DoPrint gesetzt + MapMode aOffsetMode; + MapMode aTwipMode; + double nScaleX; + double nScaleY; + + SCCOL nRepeatStartCol; + SCCOL nRepeatEndCol; + SCROW nRepeatStartRow; + SCROW nRepeatEndRow; + + SCCOL nStartCol; + SCROW nStartRow; + SCCOL nEndCol; + SCROW nEndRow; + + SCCOL* pPageEndX; // Seitenaufteilung SCROW* pPageEndY; - ScPageRowEntry* pPageRows; - size_t nPagesX; - size_t nPagesY; - size_t nTotalY; + ScPageRowEntry* pPageRows; + size_t nPagesX; + size_t nPagesY; + size_t nTotalY; - ScHeaderEditEngine* pEditEngine; - SfxItemSet* pEditDefaults; + ScHeaderEditEngine* pEditEngine; + SfxItemSet* pEditDefaults; - ScHeaderFieldData aFieldData; + ScHeaderFieldData aFieldData; - List aNotePosList; // Reihenfolge der Notizen + List aNotePosList; // Reihenfolge der Notizen - ScPageBreakData* pPageData; // zum Eintragen der Umbrueche etc. + ScPageBreakData* pPageData; // zum Eintragen der Umbrueche etc. public: ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTab, @@ -256,48 +256,48 @@ public: const ScPrintOptions* pOptions ); ~ScPrintFunc(); - static void DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double nPrintFactor, + static void DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double nPrintFactor, const Rectangle& rBound, ScViewData* pViewData, BOOL bMetaFile ); - void SetDrawView( FmFormView* pNew ); + void SetDrawView( FmFormView* pNew ); - void SetOffset( const Point& rOfs ); - void SetManualZoom( USHORT nNewZoom ); - void SetDateTime( const Date& rDate, const Time& rTime ); + void SetOffset( const Point& rOfs ); + void SetManualZoom( USHORT nNewZoom ); + void SetDateTime( const Date& rDate, const Time& rTime ); - void SetClearFlag( BOOL bFlag ); - void SetUseStyleColor( BOOL bFlag ); - void SetRenderFlag( BOOL bFlag ); + void SetClearFlag( BOOL bFlag ); + void SetUseStyleColor( BOOL bFlag ); + void SetRenderFlag( BOOL bFlag ); void SetExclusivelyDrawOleAndDrawObjects();//for printing selected objects without surrounding cell contents - BOOL UpdatePages(); + BOOL UpdatePages(); - void ApplyPrintSettings(); // aus DoPrint() schon gerufen - long DoPrint( const MultiSelection& rPageRanges, + void ApplyPrintSettings(); // aus DoPrint() schon gerufen + long DoPrint( const MultiSelection& rPageRanges, /*long nStartPage, long nDisplayStart, BOOL bDoPrint, SfxProgress* pProgress, ScPreviewLocationData* pLocationData );*/ long nStartPage, long nDisplayStart, BOOL bDoPrint = TRUE, SfxProgress* pProgress = NULL, ScPreviewLocationData* pLocationData = NULL); - // Werte abfragen - sofort + // Werte abfragen - sofort - Size GetPageSize() const { return aPageSize; } - Size GetDataSize() const; - void GetScaleData( Size& rPhysSize, long& rDocHdr, long& rDocFtr ); - long GetFirstPageNo() const { return aTableParam.nFirstPageNo; } + Size GetPageSize() const { return aPageSize; } + Size GetDataSize() const; + void GetScaleData( Size& rPhysSize, long& rDocHdr, long& rDocFtr ); + long GetFirstPageNo() const { return aTableParam.nFirstPageNo; } - // letzte Werte abfragen - nach DoPrint !!! + // letzte Werte abfragen - nach DoPrint !!! - double GetScaleX() const { return nScaleX; } - double GetScaleY() const { return nScaleY; } - long GetTotalPages() const { return nTotalPages; } - USHORT GetZoom() const { return nZoom; } + double GetScaleX() const { return nScaleX; } + double GetScaleY() const { return nScaleY; } + long GetTotalPages() const { return nTotalPages; } + USHORT GetZoom() const { return nZoom; } - void ResetBreaks( SCTAB nTab ); + void ResetBreaks( SCTAB nTab ); - void GetPrintState( ScPrintState& rState ); - BOOL GetLastSourceRange( ScRange& rRange ) const; + void GetPrintState( ScPrintState& rState ); + BOOL GetLastSourceRange( ScRange& rRange ) const; USHORT GetLeftMargin() const{return nLeftMargin;} USHORT GetRightMargin() const{return nRightMargin;} USHORT GetTopMargin() const{return nTopMargin;} @@ -310,55 +310,55 @@ public: ScPrintHFParam GetFooter(){return aFtr;} private: - void Construct( const ScPrintOptions* pOptions ); - void InitParam( const ScPrintOptions* pOptions ); - void CalcZoom( USHORT nRangeNo ); - void CalcPages(); - long CountPages(); - long CountNotePages(); + void Construct( const ScPrintOptions* pOptions ); + void InitParam( const ScPrintOptions* pOptions ); + void CalcZoom( USHORT nRangeNo ); + void CalcPages(); + long CountPages(); + long CountNotePages(); - BOOL AdjustPrintArea( BOOL bNew ); + BOOL AdjustPrintArea( BOOL bNew ); - Size GetDocPageSize(); + Size GetDocPageSize(); - long TextHeight( const EditTextObject* pObject ); - void MakeEditEngine(); - void UpdateHFHeight( ScPrintHFParam& rParam ); + long TextHeight( const EditTextObject* pObject ); + void MakeEditEngine(); + void UpdateHFHeight( ScPrintHFParam& rParam ); - void InitModes(); + void InitModes(); - BOOL IsLeft( long nPageNo ); - BOOL IsMirror( long nPageNo ); - void ReplaceFields( long nPageNo ); // aendert Text in pEditEngine - void MakeTableString(); // setzt aTableStr + BOOL IsLeft( long nPageNo ); + BOOL IsMirror( long nPageNo ); + void ReplaceFields( long nPageNo ); // aendert Text in pEditEngine + void MakeTableString(); // setzt aTableStr - void PrintPage( long nPageNo, + void PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); - void PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, long nScrX, long nScrY, BOOL bShLeft, BOOL bShTop, BOOL bShRight, BOOL bShBottom ); - void LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, long nScrX, long nScrY, BOOL bRepCol, BOOL bRepRow, ScPreviewLocationData& rLocationData ); - void PrintColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY ); - void PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY ); - void LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY, + void PrintColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY ); + void PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY ); + void LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY, BOOL bRepCol, ScPreviewLocationData& rLocationData ); - void LocateRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY, + void LocateRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY, BOOL bRepRow, ScPreviewLocationData& rLocationData ); - void PrintHF( long nPageNo, BOOL bHeader, long nStartY, + void PrintHF( long nPageNo, BOOL bHeader, long nStartY, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); - long PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); - long DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); + long PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); + long DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); - void DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, + void DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, const SvxBoxItem* pBorderData, const SvxBrushItem* pBackground, const SvxShadowItem* pShadow ); - void FillPageData(); + void FillPageData(); }; diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index f7c9f325c06b..282b02beb139 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef SC_PRIVSPLT_HXX -#define SC_PRIVSPLT_HXX +#define SC_PRIVSPLT_HXX #include <vcl/ctrl.hxx> @@ -37,47 +37,47 @@ class ScPrivatSplit : public Control { private: - Link aCtrModifiedLink; - BOOL aMovingFlag; - Pointer aWinPointer; - SC_SPLIT_DIRECTION eScSplit; - short nOldX; - short nOldY; - short nNewX; - short nNewY; - short nMinPos; - short nMaxPos; - Range aXMovingRange; - Range aYMovingRange; - short nDeltaX; - short nDeltaY; + Link aCtrModifiedLink; + BOOL aMovingFlag; + Pointer aWinPointer; + SC_SPLIT_DIRECTION eScSplit; + short nOldX; + short nOldY; + short nNewX; + short nNewY; + short nMinPos; + short nMaxPos; + Range aXMovingRange; + Range aYMovingRange; + short nDeltaX; + short nDeltaY; using Control::ImplInitSettings; - void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); protected: - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt); public: ScPrivatSplit( Window* pWindow, const ResId& rResId, SC_SPLIT_DIRECTION eScSplit); - virtual short GetDeltaX(); - virtual short GetDeltaY(); + virtual short GetDeltaX(); + virtual short GetDeltaY(); virtual void CtrModified(); - void SetYRange(Range cRgeY); + void SetYRange(Range cRgeY); - void MoveSplitTo(Point aPos); + void MoveSplitTo(Point aPos); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); void SetCtrModifiedHdl( const Link& rLink ) { aCtrModifiedLink = rLink; } const Link& GetCtrModifiedHdl() const { return aCtrModifiedLink; } diff --git a/sc/source/ui/inc/protectiondlg.hrc b/sc/source/ui/inc/protectiondlg.hrc index 52e57040922c..7bee7725a617 100644 --- a/sc/source/ui/inc/protectiondlg.hrc +++ b/sc/source/ui/inc/protectiondlg.hrc @@ -1,7 +1,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/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 9fbedaffad07..44419bc4bf9b 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.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/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 773f73679235..c85eb1b6829c 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.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 @@ -225,8 +225,8 @@ public: virtual short Execute(); - /** - * @return String internal name of the selected field. Note that this may + /** + * @return String internal name of the selected field. Note that this may * be different from the name displayed in the dialog if the field * has a layout name. */ diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index d9ae44cca438..56516139aa2a 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.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/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx index f24478b96c35..5cc3e8400092 100644 --- a/sc/source/ui/inc/redcom.hxx +++ b/sc/source/ui/inc/redcom.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 @@ -38,9 +38,9 @@ class ScRedComDialog { private: - ScChangeAction *pChangeAction; - ScDocShell *pDocShell; - String aComment; + ScChangeAction *pChangeAction; + ScDocShell *pDocShell; + String aComment; AbstractSvxPostItDialog* pDlg; DECL_LINK( PrevHdl, AbstractSvxPostItDialog* ); @@ -48,8 +48,8 @@ private: protected: - void ReInit(ScChangeAction *); - void SelectCell(); + void ReInit(ScChangeAction *); + void SelectCell(); ScChangeAction *FindPrev(ScChangeAction *pAction); ScChangeAction *FindNext(ScChangeAction *pAction); diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 0be78421455b..cc0960306482 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.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 @@ -34,11 +34,11 @@ #include "dbfunc.hxx" #define DECL_WRAPPER(Class) \ - class Class : public SfxChildWindow \ - { \ - public: \ - Class( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); \ - SFX_DECL_CHILDWINDOW(Class); \ + class Class : public SfxChildWindow \ + { \ + public: \ + Class( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); \ + SFX_DECL_CHILDWINDOW(Class); \ }; @@ -68,7 +68,7 @@ DECL_WRAPPER(ScArgumentDlgWrapper) class ScAcceptChgDlgWrapper: public SfxChildWindow { public: - ScAcceptChgDlgWrapper( Window*, + ScAcceptChgDlgWrapper( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); @@ -81,38 +81,38 @@ class ScAcceptChgDlgWrapper: public SfxChildWindow class ScSimpleRefDlgWrapper: public SfxChildWindow { public: - ScSimpleRefDlgWrapper( Window*, + ScSimpleRefDlgWrapper( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(Class); - static void SetDefaultPosSize(Point aPos, Size aSize, BOOL bSet=TRUE); - virtual String GetRefString(); - virtual void SetRefString(const String& rStr); - void SetCloseHdl( const Link& rLink ); - void SetUnoLinks( const Link& rDone, const Link& rAbort, + static void SetDefaultPosSize(Point aPos, Size aSize, BOOL bSet=TRUE); + virtual String GetRefString(); + virtual void SetRefString(const String& rStr); + void SetCloseHdl( const Link& rLink ); + void SetUnoLinks( const Link& rDone, const Link& rAbort, const Link& rChange ); void SetFlags( BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection ); - static void SetAutoReOpen(BOOL bFlag); + static void SetAutoReOpen(BOOL bFlag); - void StartRefInput(); + void StartRefInput(); }; //<!--Added by PengYunQuan for Validity Cell Range Picker class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow { - bool m_bVisibleLock:1; - bool m_bFreeWindowLock:1; + bool m_bVisibleLock:1; + bool m_bFreeWindowLock:1; Window * m_pSavedWndParent; -public: +public: ScValidityRefChildWin( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); - SFX_DECL_CHILDWINDOW(ScValidityRefChildWin); + SFX_DECL_CHILDWINDOW(ScValidityRefChildWin); ~ScValidityRefChildWin(); - bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; } - bool LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; } - void Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); } + bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; } + bool LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; } + void Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); } void Show( USHORT nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } }; //-->Added by PengYunQuan for Validity Cell Range Picker diff --git a/sc/source/ui/inc/refundo.hxx b/sc/source/ui/inc/refundo.hxx index 8abbd5155342..7603e7d9e8b4 100644 --- a/sc/source/ui/inc/refundo.hxx +++ b/sc/source/ui/inc/refundo.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 @@ -46,22 +46,22 @@ class ScUnoRefList; class ScRefUndoData { private: - ScDBCollection* pDBCollection; - ScRangeName* pRangeName; - ScPrintRangeSaver* pPrintRanges; - ScDPCollection* pDPCollection; - ScConditionalFormatList* pCondFormList; - ScDetOpList* pDetOpList; - ScChartListenerCollection* pChartListenerCollection; - ScAreaLinkSaveCollection* pAreaLinks; + ScDBCollection* pDBCollection; + ScRangeName* pRangeName; + ScPrintRangeSaver* pPrintRanges; + ScDPCollection* pDPCollection; + ScConditionalFormatList* pCondFormList; + ScDetOpList* pDetOpList; + ScChartListenerCollection* pChartListenerCollection; + ScAreaLinkSaveCollection* pAreaLinks; ScUnoRefList* pUnoRefs; public: ScRefUndoData( const ScDocument* pDoc ); ~ScRefUndoData(); - void DeleteUnchanged( const ScDocument* pDoc ); - void DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst ); + void DeleteUnchanged( const ScDocument* pDoc ); + void DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst ); }; diff --git a/sc/source/ui/inc/retypepassdlg.hrc b/sc/source/ui/inc/retypepassdlg.hrc index f027b6bc7ded..76f7a1231613 100644 --- a/sc/source/ui/inc/retypepassdlg.hrc +++ b/sc/source/ui/inc/retypepassdlg.hrc @@ -1,7 +1,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/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 92a41599821f..11e7b81ca10c 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.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/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index 03867631aa24..1175d931861e 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.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 @@ -37,10 +37,10 @@ struct ScRangeFindData { - ScRange aRef; - USHORT nFlags; - xub_StrLen nSelStart; - xub_StrLen nSelEnd; + ScRange aRef; + USHORT nFlags; + xub_StrLen nSelStart; + xub_StrLen nSelEnd; ScRangeFindData( const ScRange& rR, USHORT nF, xub_StrLen nS, xub_StrLen nE ) : aRef(rR), nFlags(nF), nSelStart(nS), nSelEnd(nE) {} @@ -48,23 +48,23 @@ struct ScRangeFindData class ScRangeFindList { - List aEntries; - String aDocName; - BOOL bHidden; + List aEntries; + String aDocName; + BOOL bHidden; public: ScRangeFindList(const String& rName); ~ScRangeFindList(); - ULONG Count() const { return aEntries.Count(); } - void Insert( ScRangeFindData* pNew ) { aEntries.Insert(pNew, LIST_APPEND); } + ULONG Count() const { return aEntries.Count(); } + void Insert( ScRangeFindData* pNew ) { aEntries.Insert(pNew, LIST_APPEND); } ScRangeFindData* GetObject( ULONG nIndex ) const { return (ScRangeFindData*)aEntries.GetObject(nIndex); } - void SetHidden( BOOL bSet ) { bHidden = bSet; } + void SetHidden( BOOL bSet ) { bHidden = bSet; } - const String& GetDocName() const { return aDocName; } - BOOL IsHidden() const { return bHidden; } + const String& GetDocName() const { return aDocName; } + BOOL IsHidden() const { return bHidden; } static ColorData GetColorName( USHORT nIndex ); }; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index fac5b33220e7..031ab3470f64 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.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 @@ -53,23 +53,23 @@ public: private: FixedLine aFlName; - Edit aEdName; + Edit aEdName; FixedLine aFlComment; - MultiLineEdit aEdComment; + MultiLineEdit aEdComment; FixedLine aFlOptions; - CheckBox aCbShowFrame; - ColorListBox aLbColor; - //CheckBox aCbPrintFrame; - CheckBox aCbTwoWay; - //CheckBox aCbAttrib; - //CheckBox aCbValue; - CheckBox aCbCopyAll; + CheckBox aCbShowFrame; + ColorListBox aLbColor; + //CheckBox aCbPrintFrame; + CheckBox aCbTwoWay; + //CheckBox aCbAttrib; + //CheckBox aCbValue; + CheckBox aCbCopyAll; CheckBox aCbProtect; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - const String aDefScenarioName; - BOOL bIsEdit; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + const String aDefScenarioName; + BOOL bIsEdit; DECL_LINK( OkHdl, OKButton * ); DECL_LINK( EnableHdl, CheckBox * ); diff --git a/sc/source/ui/inc/scui_def.hxx b/sc/source/ui/inc/scui_def.hxx index 564b9f6eb362..8fe583383ea3 100644 --- a/sc/source/ui/inc/scui_def.hxx +++ b/sc/source/ui/inc/scui_def.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 @@ -32,28 +32,28 @@ #define SCRET_COLS 0x42 #define SCRET_ROWS 0x43 -#define FDS_OPT_NONE 0 // from filldlg.hxx -#define FDS_OPT_HORZ 1 // from filldlg.hxx -#define FDS_OPT_VERT 2 // from filldlg.hxx +#define FDS_OPT_NONE 0 // from filldlg.hxx +#define FDS_OPT_HORZ 1 // from filldlg.hxx +#define FDS_OPT_VERT 2 // from filldlg.hxx -#define INS_CONT_NOEMPTY 0x0100 //from inscodlg.hxx -#define INS_CONT_TRANS 0x0200 //from inscodlg.hxx -#define INS_CONT_LINK 0x0400 //from inscodlg.hxx +#define INS_CONT_NOEMPTY 0x0100 //from inscodlg.hxx +#define INS_CONT_TRANS 0x0200 //from inscodlg.hxx +#define INS_CONT_LINK 0x0400 //from inscodlg.hxx -#define SC_CELL_SHIFT_DISABLE_DOWN 0x01 //from inscodlg.hxx -#define SC_CELL_SHIFT_DISABLE_RIGHT 0x02 //from inscodlg.hxx +#define SC_CELL_SHIFT_DISABLE_DOWN 0x01 //from inscodlg.hxx +#define SC_CELL_SHIFT_DISABLE_RIGHT 0x02 //from inscodlg.hxx -#define NAME_TOP 1 //from namecrea.hxx -#define NAME_LEFT 2 //from namecrea.hxx -#define NAME_BOTTOM 4 //from namecrea.hxx -#define NAME_RIGHT 8 //from namecrea.hxx +#define NAME_TOP 1 //from namecrea.hxx +#define NAME_LEFT 2 //from namecrea.hxx +#define NAME_BOTTOM 4 //from namecrea.hxx +#define NAME_RIGHT 8 //from namecrea.hxx -#define BTN_PASTE_NAME 100 // from namepast.hxx -#define BTN_PASTE_LIST 101 // from namepast.hxx +#define BTN_PASTE_NAME 100 // from namepast.hxx +#define BTN_PASTE_LIST 101 // from namepast.hxx #define BTN_EXTEND_RANGE 150 #define BTN_CURRENT_SELECTION 151 -#define SCRET_REMOVE 0x42 //from subtdlg.hxx +#define SCRET_REMOVE 0x42 //from subtdlg.hxx #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 5e512e3f8763..9b113ddd5968 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.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/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 69c5f5cb6bd8..f0bbc720d128 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.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 @@ -32,8 +32,8 @@ class ScAutoFormatDlg : public ModalDialog { public: - ScAutoFormatDlg( Window* pParent, - ScAutoFormat* pAutoFormat, + ScAutoFormatDlg( Window* pParent, + ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc ); ~ScAutoFormatDlg(); @@ -43,38 +43,38 @@ public: private: FixedLine aFlFormat; - ListBox aLbFormat; - ScAutoFmtPreview* pWndPreview; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - MoreButton aBtnMore; + ListBox aLbFormat; + ScAutoFmtPreview* pWndPreview; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + MoreButton aBtnMore; FixedLine aFlFormatting; - CheckBox aBtnNumFormat; - CheckBox aBtnBorder; - CheckBox aBtnFont; - CheckBox aBtnPattern; - CheckBox aBtnAlignment; - CheckBox aBtnAdjust; - PushButton aBtnRename; - String aStrTitle; - String aStrLabel; - String aStrClose; - String aStrDelTitle; - String aStrDelMsg; - String aStrRename; + CheckBox aBtnNumFormat; + CheckBox aBtnBorder; + CheckBox aBtnFont; + CheckBox aBtnPattern; + CheckBox aBtnAlignment; + CheckBox aBtnAdjust; + PushButton aBtnRename; + String aStrTitle; + String aStrLabel; + String aStrClose; + String aStrDelTitle; + String aStrDelMsg; + String aStrRename; //------------------------ - ScAutoFormat* pFormat; - const ScAutoFormatData* pSelFmtData; - USHORT nIndex; - BOOL bCoreDataChanged; - BOOL bFmtInserted; + ScAutoFormat* pFormat; + const ScAutoFormatData* pSelFmtData; + USHORT nIndex; + BOOL bCoreDataChanged; + BOOL bFmtInserted; - void Init (); - void UpdateChecks (); + void Init (); + void UpdateChecks (); //------------------------ DECL_LINK( CheckHdl, Button * ); DECL_LINK( AddHdl, void * ); diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 605dec3cd7f6..3013e8385e21 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.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 @@ -39,10 +39,10 @@ class ScDelimiterTable; class ScImportOptionsDlg : public ModalDialog { public: - ScImportOptionsDlg( Window* pParent, + ScImportOptionsDlg( Window* pParent, BOOL bAscii = TRUE, - const ScImportOptions* pOptions = NULL, - const String* pStrTitle = NULL, + const ScImportOptions* pOptions = NULL, + const String* pStrTitle = NULL, BOOL bMultiByte = FALSE, BOOL bOnlyDbtoolsEncodings = FALSE, BOOL bImport = TRUE ); @@ -53,20 +53,20 @@ public: private: FixedLine aFlFieldOpt; - FixedText aFtFont; - SvxTextEncodingBox aLbFont; - FixedText aFtFieldSep; - ComboBox aEdFieldSep; - FixedText aFtTextSep; - ComboBox aEdTextSep; + FixedText aFtFont; + SvxTextEncodingBox aLbFont; + FixedText aFtFieldSep; + ComboBox aEdFieldSep; + FixedText aFtTextSep; + ComboBox aEdTextSep; CheckBox aCbFixed; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - CheckBox aCbShown; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + CheckBox aCbShown; - ScDelimiterTable* pFieldSepTab; - ScDelimiterTable* pTextSepTab; + ScDelimiterTable* pFieldSepTab; + ScDelimiterTable* pTextSepTab; private: USHORT GetCodeFromCombo( const ComboBox& rEd ) const; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 6c0d3768d7c3..e70e1384b488 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.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 @@ -34,19 +34,19 @@ //=================================================================== enum ScHFEntryId { - eNoneEntry , - ePageEntry , + eNoneEntry , + ePageEntry , ePagesEntry , eSheetEntry , eConfidentialEntry , eFileNamePageEntry , eExtFileNameEntry , - ePageSheetEntry , - ePageFileNameEntry , - ePageExtFileNameEntry , - eUserNameEntry , - eCreatedByEntry , - eEntryCount + ePageSheetEntry , + ePageFileNameEntry , + ePageExtFileNameEntry , + eUserNameEntry , + eCreatedByEntry , + eEntryCount }; class ScHeaderEditEngine; @@ -60,42 +60,42 @@ class ScAccessibleEditObject; class ScHFEditPage : public SfxTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); - void SetNumType(SvxNumType eNumType); - void ClearTextAreas(); + void SetNumType(SvxNumType eNumType); + void ClearTextAreas(); protected: - ScHFEditPage( Window* pParent, - USHORT nResId, - const SfxItemSet& rCoreSet, - USHORT nWhich, bool bHeader ); - virtual ~ScHFEditPage(); + ScHFEditPage( Window* pParent, + USHORT nResId, + const SfxItemSet& rCoreSet, + USHORT nWhich, bool bHeader ); + virtual ~ScHFEditPage(); private: - FixedText aFtLeft; - ScEditWindow aWndLeft; - FixedText aFtCenter; - ScEditWindow aWndCenter; - FixedText aFtRight; - ScEditWindow aWndRight; - FixedText maFtDefinedHF; + FixedText aFtLeft; + ScEditWindow aWndLeft; + FixedText aFtCenter; + ScEditWindow aWndCenter; + FixedText aFtRight; + ScEditWindow aWndRight; + FixedText maFtDefinedHF; ListBox maLbDefined; - FixedText maFtCustomHF; - ImageButton aBtnText; - ScExtIButton aBtnFile; - ImageButton aBtnTable; - ImageButton aBtnPage; - ImageButton aBtnLastPage; - ImageButton aBtnDate; - ImageButton aBtnTime; - FixedLine aFlInfo; - FixedInfo aFtInfo; - ScPopupMenu aPopUpFile; - - USHORT nWhich; - String aCmdArr[6]; + FixedText maFtCustomHF; + ImageButton aBtnText; + ScExtIButton aBtnFile; + ImageButton aBtnTable; + ImageButton aBtnPage; + ImageButton aBtnLastPage; + ImageButton aBtnDate; + ImageButton aBtnTime; + FixedLine aFlInfo; + FixedInfo aFtInfo; + ScPopupMenu aPopUpFile; + + USHORT nWhich; + String aCmdArr[6]; private: #ifdef _TPHFEDIT_CXX @@ -119,8 +119,8 @@ private: class ScRightHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); private: ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -131,8 +131,8 @@ private: class ScLeftHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); private: ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -143,8 +143,8 @@ private: class ScRightFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); private: ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -155,8 +155,8 @@ private: class ScLeftFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); private: ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 7fdd0e780e54..b920c6373833 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.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 @@ -31,7 +31,7 @@ #include <vcl/seleng.hxx> -#include "viewdata.hxx" // ScSplitPos +#include "viewdata.hxx" // ScSplitPos // --------------------------------------------------------------------------- @@ -42,76 +42,76 @@ class ScViewData; class ScViewSelectionEngine : public SelectionEngine { private: - ScSplitPos eWhich; + ScSplitPos eWhich; public: ScViewSelectionEngine( Window* pWindow, ScTabView* pView, ScSplitPos eSplitPos ); - ScSplitPos GetWhich() const { return eWhich; } - void SetWhich(ScSplitPos eNew) { eWhich = eNew; } + ScSplitPos GetWhich() const { return eWhich; } + void SetWhich(ScSplitPos eNew) { eWhich = eNew; } }; -class ScViewFunctionSet : public FunctionSet // View (Gridwin / Tastatur) +class ScViewFunctionSet : public FunctionSet // View (Gridwin / Tastatur) { private: - ScViewData* pViewData; - ScViewSelectionEngine* pEngine; + ScViewData* pViewData; + ScViewSelectionEngine* pEngine; - BOOL bAnchor; - BOOL bStarted; - ScAddress aAnchorPos; + BOOL bAnchor; + BOOL bStarted; + ScAddress aAnchorPos; - ScSplitPos GetWhich(); + ScSplitPos GetWhich(); public: ScViewFunctionSet( ScViewData* pNewViewData ); - void SetSelectionEngine( ScViewSelectionEngine* pSelEngine ); + void SetSelectionEngine( ScViewSelectionEngine* pSelEngine ); - void SetAnchor( SCCOL nPosX, SCROW nPosY ); - void SetAnchorFlag( BOOL bSet ); + void SetAnchor( SCCOL nPosX, SCROW nPosY ); + void SetAnchorFlag( BOOL bSet ); - virtual void BeginDrag(); - virtual void CreateAnchor(); - virtual void DestroyAnchor(); - virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); - virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual void BeginDrag(); + virtual void CreateAnchor(); + virtual void DestroyAnchor(); + virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); + virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); + virtual void DeselectAtPoint( const Point& rPointPixel ); + virtual void DeselectAll(); - BOOL SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScroll ); + BOOL SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScroll ); }; // --------------------------------------------------------------------------- -class ScHeaderFunctionSet : public FunctionSet // Spalten- / Zeilenkoepfe +class ScHeaderFunctionSet : public FunctionSet // Spalten- / Zeilenkoepfe { private: - ScViewData* pViewData; - BOOL bColumn; // Col- / Rowbar - ScSplitPos eWhich; + ScViewData* pViewData; + BOOL bColumn; // Col- / Rowbar + ScSplitPos eWhich; - BOOL bAnchor; - SCCOLROW nCursorPos; + BOOL bAnchor; + SCCOLROW nCursorPos; public: ScHeaderFunctionSet( ScViewData* pNewViewData ); - void SetColumn( BOOL bSet ); - void SetWhich( ScSplitPos eNew ); + void SetColumn( BOOL bSet ); + void SetWhich( ScSplitPos eNew ); - virtual void BeginDrag(); - virtual void CreateAnchor(); - virtual void DestroyAnchor(); - virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); - virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual void BeginDrag(); + virtual void CreateAnchor(); + virtual void DestroyAnchor(); + virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); + virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); + virtual void DeselectAtPoint( const Point& rPointPixel ); + virtual void DeselectAll(); - void SetAnchorFlag(BOOL bSet) { bAnchor = bSet; } + void SetAnchorFlag(BOOL bSet) { bAnchor = bSet; } }; diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx index f60b334bfed5..7b1addb8eb84 100644 --- a/sc/source/ui/inc/selectionstate.hxx +++ b/sc/source/ui/inc/selectionstate.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/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx index 4fda9372a05e..2ca51d96dfc7 100644 --- a/sc/source/ui/inc/seltrans.hxx +++ b/sc/source/ui/inc/seltrans.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 @@ -50,32 +50,32 @@ enum ScSelectionTransferMode class ScSelectionTransferObj : public TransferableHelper { private: - ScTabView* pView; - ScSelectionTransferMode eMode; - ScTransferObj* pCellData; - ScDrawTransferObj* pDrawData; + ScTabView* pView; + ScSelectionTransferMode eMode; + ScTransferObj* pCellData; + ScDrawTransferObj* pDrawData; ScSelectionTransferObj( ScTabView* pSource, ScSelectionTransferMode eNewMode ); - void CreateCellData(); - void CreateDrawData(); + void CreateCellData(); + void CreateDrawData(); public: // creates an object if the view has a valid selection, // returns NULL otherwise static ScSelectionTransferObj* CreateFromView( ScTabView* pSource ); - virtual ~ScSelectionTransferObj(); - - void ForgetView(); - BOOL StillValid(); - ScTabView* GetView() const { return pView; } + virtual ~ScSelectionTransferObj(); - ScTransferObj* GetCellData(); - ScDrawTransferObj* GetDrawData(); + void ForgetView(); + BOOL StillValid(); + ScTabView* GetView() const { return pView; } + + ScTransferObj* GetCellData(); + ScDrawTransferObj* GetDrawData(); - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); }; #endif diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx index 975781f05169..9080aed8d7e2 100644 --- a/sc/source/ui/inc/servobj.hxx +++ b/sc/source/ui/inc/servobj.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 @@ -52,12 +52,12 @@ class ScServerObject : public ::sfx2::SvLinkSource, public SfxListener { private: ScServerObjectSvtListenerForwarder aForwarder; - ScDocShell* pDocSh; - ScRange aRange; - String aItemStr; - BOOL bRefreshListener; + ScDocShell* pDocSh; + ScRange aRange; + String aItemStr; + BOOL bRefreshListener; - void Clear(); + void Clear(); public: ScServerObject( ScDocShell* pShell, const String& rItem ); diff --git a/sc/source/ui/inc/sharedocdlg.hrc b/sc/source/ui/inc/sharedocdlg.hrc index cc38e81bbddb..adf2ed06a31c 100644 --- a/sc/source/ui/inc/sharedocdlg.hrc +++ b/sc/source/ui/inc/sharedocdlg.hrc @@ -1,7 +1,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/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index e15fde82102b..47ac9ceac897 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.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/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index b4e2c1037509..5734c661e966 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.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 @@ -59,8 +59,8 @@ public: /** Inserts a string into the ListBox. */ void Insert( const String& rString, BOOL bSelected ); - USHORT GetSelectEntryCount() const; - String GetSelectEntry(USHORT nPos) const; + USHORT GetSelectEntryCount() const; + String GetSelectEntry(USHORT nPos) const; USHORT GetSelectEntryPos(USHORT nPos) const; }; diff --git a/sc/source/ui/inc/simpref.hrc b/sc/source/ui/inc/simpref.hrc index d6fb6d4412eb..058abc26475d 100644 --- a/sc/source/ui/inc/simpref.hrc +++ b/sc/source/ui/inc/simpref.hrc @@ -1,7 +1,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 @@ -28,10 +28,10 @@ #include "sc.hrc" // -> RID_SCDLG_SIMPLEREF #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_HELP 4 -#define FT_ASSIGN 10 -#define ED_ASSIGN 11 -#define RB_ASSIGN 12 +#define BTN_CANCEL 2 +#define BTN_ADD 3 +#define BTN_HELP 4 +#define FT_ASSIGN 10 +#define ED_ASSIGN 11 +#define RB_ASSIGN 12 diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index eadc59d90470..34d1165ca689 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.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 @@ -49,31 +49,31 @@ class ScDocument; class ScSimpleRefDlg: public ScAnyRefDlg { private: - Link aCloseHdl; - Link aDoneHdl; - Link aAbortedHdl; - Link aChangeHdl; - - FixedText aFtAssign; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - ScViewData* pViewData; - ScDocument* pDoc; - BOOL bRefInputMode; - - ScRange theCurArea; - BOOL bCloseFlag; - BOOL bAutoReOpen; - BOOL bCloseOnButtonUp; - BOOL bSingleCell; + Link aCloseHdl; + Link aDoneHdl; + Link aAbortedHdl; + Link aChangeHdl; + + FixedText aFtAssign; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + ScViewData* pViewData; + ScDocument* pDoc; + BOOL bRefInputMode; + + ScRange theCurArea; + BOOL bCloseFlag; + BOOL bAutoReOpen; + BOOL bCloseOnButtonUp; + BOOL bSingleCell; BOOL bMultiSelection; - void Init(); + void Init(); DECL_LINK( CancelBtnHdl, void * ); DECL_LINK( OkBtnHdl, void * ); @@ -81,32 +81,32 @@ private: protected: - virtual void RefInputDone( BOOL bForced = FALSE ); + virtual void RefInputDone( BOOL bForced = FALSE ); public: ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ); + ScViewData* ptrViewData ); ~ScSimpleRefDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); + virtual BOOL Close(); - void StartRefInput(); + void StartRefInput(); - virtual String GetRefString() const; - virtual void SetRefString(const String &rStr); + virtual String GetRefString() const; + virtual void SetRefString(const String &rStr); virtual void FillInfo(SfxChildWinInfo&) const; - void SetCloseHdl( const Link& rLink ); - void SetUnoLinks( const Link& rDone, const Link& rAbort, + void SetCloseHdl( const Link& rLink ); + void SetUnoLinks( const Link& rDone, const Link& rAbort, const Link& rChange ); void SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection ); - void SetAutoReOpen(BOOL bFlag) {bAutoReOpen=bFlag;} + void SetAutoReOpen(BOOL bFlag) {bAutoReOpen=bFlag;} }; diff --git a/sc/source/ui/inc/sizedev.hxx b/sc/source/ui/inc/sizedev.hxx index eb7a251fdd86..5beff55c99f7 100644 --- a/sc/source/ui/inc/sizedev.hxx +++ b/sc/source/ui/inc/sizedev.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 @@ -36,20 +36,20 @@ class ScDocShell; class ScSizeDeviceProvider { - OutputDevice* pDevice; - BOOL bOwner; - double nPPTX; - double nPPTY; - MapMode aOldMapMode; + OutputDevice* pDevice; + BOOL bOwner; + double nPPTX; + double nPPTY; + MapMode aOldMapMode; public: ScSizeDeviceProvider( ScDocShell* pDocSh ); ~ScSizeDeviceProvider(); - OutputDevice* GetDevice() const { return pDevice; } - double GetPPTX() const { return nPPTX; } - double GetPPTY() const { return nPPTY; } - BOOL IsPrinter() const { return !bOwner; } + OutputDevice* GetDevice() const { return pDevice; } + double GetPPTX() const { return nPPTX; } + double GetPPTY() const { return nPPTY; } + BOOL IsPrinter() const { return !bOwner; } }; #endif diff --git a/sc/source/ui/inc/solveroptions.hrc b/sc/source/ui/inc/solveroptions.hrc index e3be150ccd1b..0cf4e05617c3 100644 --- a/sc/source/ui/inc/solveroptions.hrc +++ b/sc/source/ui/inc/solveroptions.hrc @@ -1,7 +1,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/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 0d28b9e6f5ea..7a44c1cac6c2 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.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/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index a447cec257fd..ff2c332391c3 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.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/inc/solvrdlg.hrc b/sc/source/ui/inc/solvrdlg.hrc index 7139abd2a5f6..a04fa5aafb22 100644 --- a/sc/source/ui/inc/solvrdlg.hrc +++ b/sc/source/ui/inc/solvrdlg.hrc @@ -1,7 +1,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 @@ -27,20 +27,20 @@ #include "sc.hrc" // ->RID_SCDLG_SOLVER -#define ED_FORMULACELL 1 -#define ED_TARGETVAL 2 -#define ED_VARCELL 3 -#define FT_FORMULACELL 1 -#define FT_TARGETVAL 2 -#define FT_VARCELL 3 -#define RB_FORMULACELL 1 -#define RB_VARCELL 2 +#define ED_FORMULACELL 1 +#define ED_TARGETVAL 2 +#define ED_VARCELL 3 +#define FT_FORMULACELL 1 +#define FT_TARGETVAL 2 +#define FT_VARCELL 3 +#define RB_FORMULACELL 1 +#define RB_VARCELL 2 #define FL_VARIABLES 1 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 1 -#define STR_INVALIDVAL 1 -#define STR_INVALIDVAR 2 -#define STR_INVALIDFORM 3 -#define STR_NOFORMULA 4 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 1 +#define STR_INVALIDVAL 1 +#define STR_INVALIDVAR 2 +#define STR_INVALIDFORM 3 +#define STR_NOFORMULA 4 diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index a7f4cf8cec0d..6a00a2027dc8 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.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 @@ -58,51 +58,51 @@ public: ScAddress aCursorPos ); ~ScSolverDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual void SetActive(); + virtual BOOL Close(); private: FixedLine aFlVariables; - FixedText aFtFormulaCell; - formula::RefEdit aEdFormulaCell; - formula::RefButton aRBFormulaCell; + FixedText aFtFormulaCell; + formula::RefEdit aEdFormulaCell; + formula::RefButton aRBFormulaCell; - FixedText aFtTargetVal; - Edit aEdTargetVal; + FixedText aFtTargetVal; + Edit aEdTargetVal; - FixedText aFtVariableCell; - formula::RefEdit aEdVariableCell; - formula::RefButton aRBVariableCell; + FixedText aFtVariableCell; + formula::RefEdit aEdVariableCell; + formula::RefButton aRBVariableCell; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - ScAddress theFormulaCell; - ScAddress theVariableCell; - String theTargetValStr; + ScAddress theFormulaCell; + ScAddress theVariableCell; + String theTargetValStr; - ScDocument* pDoc; - const SCTAB nCurTab; - formula::RefEdit* pEdActive; - BOOL bDlgLostFocus; - const String errMsgInvalidVar; - const String errMsgInvalidForm; - const String errMsgNoFormula; - const String errMsgInvalidVal; + ScDocument* pDoc; + const SCTAB nCurTab; + formula::RefEdit* pEdActive; + BOOL bDlgLostFocus; + const String errMsgInvalidVar; + const String errMsgInvalidForm; + const String errMsgNoFormula; + const String errMsgInvalidVal; #ifdef _SOLVRDLG_CXX - void Init(); - BOOL CheckTargetValue( String& rStrVal ); - void RaiseError( ScSolverErr eError ); + void Init(); + BOOL CheckTargetValue( String& rStrVal ); + void RaiseError( ScSolverErr eError ); DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, Control* ); -#endif // _SOLVERDLG_CXX +#endif // _SOLVERDLG_CXX }; #endif // SC_SOLVRDLG_HXX diff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrc index d079ea560779..2e55f447778e 100644 --- a/sc/source/ui/inc/sortdlg.hrc +++ b/sc/source/ui/inc/sortdlg.hrc @@ -1,7 +1,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 @@ -35,33 +35,33 @@ // -> SCSTR_FIELD /* -#define RID_SCDLG_SORT 256 -#define RID_SCPAGE_SORT_FIELDS 257 -#define RID_SCPAGE_SORT_OPTIONS 258 +#define RID_SCDLG_SORT 256 +#define RID_SCPAGE_SORT_FIELDS 257 +#define RID_SCPAGE_SORT_OPTIONS 258 #define RID_SCDLG_SORT_WARNING */ -#define TP_FIELDS 1 -#define TP_OPTIONS 2 +#define TP_FIELDS 1 +#define TP_OPTIONS 2 // TP_SORT_FIELDS: #define FL_SORT1 1 #define FL_SORT2 2 #define FL_SORT3 3 -#define LB_SORT1 4 -#define LB_SORT2 5 -#define LB_SORT3 6 -#define BTN_UP1 7 -#define BTN_UP2 8 -#define BTN_UP3 9 -#define BTN_DOWN1 10 -#define BTN_DOWN2 11 -#define BTN_DOWN3 12 +#define LB_SORT1 4 +#define LB_SORT2 5 +#define LB_SORT3 6 +#define BTN_UP1 7 +#define BTN_UP2 8 +#define BTN_UP3 9 +#define BTN_DOWN1 10 +#define BTN_DOWN2 11 +#define BTN_DOWN3 12 // TP_SORT_OPTIONS: -#define FL_DIRECTION 1 -#define LB_SORT_USER 2 -#define LB_OUTAREA 3 +#define FL_DIRECTION 1 +#define LB_SORT_USER 2 +#define LB_OUTAREA 3 #define ED_OUTAREA 4 //#define FT_AREA_LABEL 5 //#define FT_AREA 6 @@ -78,7 +78,7 @@ #define LB_LANGUAGE 17 #define FT_ALGORITHM 18 #define LB_ALGORITHM 19 -#define BTN_NATURALSORT 20 +#define BTN_NATURALSORT 20 //#define RID_SCDLG_SORT_WARNING #define FT_TEXT 1 diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index 7812b2a24499..66a43fd4e53b 100644 --- a/sc/source/ui/inc/sortdlg.hxx +++ b/sc/source/ui/inc/sortdlg.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 @@ -47,25 +47,25 @@ class ScSortDlg : public SfxTabDialog { public: - ScSortDlg( Window* pParent, + ScSortDlg( Window* pParent, const SfxItemSet* pArgSet ); ~ScSortDlg(); - void SetHeaders( BOOL bHeaders ); - void SetByRows ( BOOL bByRows ); - BOOL GetHeaders() const; - BOOL GetByRows () const; + void SetHeaders( BOOL bHeaders ); + void SetByRows ( BOOL bByRows ); + BOOL GetHeaders() const; + BOOL GetByRows () const; private: - BOOL bIsHeaders; - BOOL bIsByRows; + BOOL bIsHeaders; + BOOL bIsByRows; }; -inline void ScSortDlg::SetHeaders( BOOL bHeaders ) { bIsHeaders = bHeaders; } -inline void ScSortDlg::SetByRows ( BOOL bByRows ) { bIsByRows = bByRows; } -inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; } -inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; } +inline void ScSortDlg::SetHeaders( BOOL bHeaders ) { bIsHeaders = bHeaders; } +inline void ScSortDlg::SetByRows ( BOOL bByRows ) { bIsByRows = bByRows; } +inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; } +inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; } class ScSortWarningDlg : public ModalDialog { diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index d525c62597f1..5a423bc66c87 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.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/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index e351c8ff2212..6c77586f3500 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.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/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index 77ebb2476091..ab780866b240 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.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/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index af022443a80a..70700987998f 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.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 @@ -43,7 +43,7 @@ class ScStringInputDlg : public ModalDialog { public: - ScStringInputDlg( Window* pParent, + ScStringInputDlg( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault, @@ -55,9 +55,9 @@ public: private: FixedText aFtEditTitle; Edit aEdInput; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; }; #include <layout/layout-post.hxx> diff --git a/sc/source/ui/inc/styledlg.hrc b/sc/source/ui/inc/styledlg.hrc index 4a954bb3afc1..6ce7ef4ac422 100644 --- a/sc/source/ui/inc/styledlg.hrc +++ b/sc/source/ui/inc/styledlg.hrc @@ -1,7 +1,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 @@ -30,9 +30,9 @@ #define TP_BORDER 5 #define TP_BACKGROUND 6 #define TP_PROTECTION 7 -#define TP_PAGE_STD 8 +#define TP_PAGE_STD 8 #define TP_PAGE_HEADER 9 -#define TP_PAGE_FOOTER 10 +#define TP_PAGE_FOOTER 10 #define TP_TABLE 11 #define TP_FONTEFF 12 #define TP_ASIAN 13 diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index ed39fbf51b2b..09a6ff191db3 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.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 @@ -41,14 +41,14 @@ class SfxStyleSheetBase; class ScStyleDlg : public SfxStyleDialog { public: - ScStyleDlg( Window* pParent, - SfxStyleSheetBase& rStyleBase, - USHORT nRscId ); + ScStyleDlg( Window* pParent, + SfxStyleSheetBase& rStyleBase, + USHORT nRscId ); ~ScStyleDlg(); protected: - virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); - virtual const SfxItemSet* GetRefreshedSet(); + virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); + virtual const SfxItemSet* GetRefreshedSet(); private: USHORT nDlgRsc; diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc index 4e5ad6d28d9e..1a77b40842f7 100644 --- a/sc/source/ui/inc/submenu.hrc +++ b/sc/source/ui/inc/submenu.hrc @@ -1,7 +1,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 @@ -25,44 +25,44 @@ * ************************************************************************/ -// IDs fuer Untermenues +// IDs fuer Untermenues -// 1 ist nicht erlaubt ???? -#define SUBMENU_EDIT 2 -#define SUBMENU_FILL 3 -#define SUBMENU_DELBREAK 4 -#define SUBMENU_VIEW 5 -#define SUBMENU_INSERT 6 -#define SUBMENU_INSBREAK 7 -#define SUBMENU_NAME 8 -#define SUBMENU_INSOBJ 9 -#define SUBMENU_DATA 10 -#define SUBMENU_FILTER 11 -#define SUBMENU_OUTLINE 12 -#define SUBMENU_PIVOT 13 -#define SUBMENU_EXTRA 14 -#define SUBMENU_AUDIT 15 -#define SUBMENU_PROTECT 16 -#define SUBMENU_ROW 17 -#define SUBMENU_COL 18 -#define SUBMENU_TAB 19 -#define SUBMENU_MERGE 20 -#define SUBMENU_AREA 21 -#define SUBMENU_MIRROR 22 -#define SUBMENU_OBJARRANGE 23 -#define SUBMENU_ANCHOR 24 -#define SUBMENU_POPARRANGE 25 -#define SUBMENU_OLEARRANGE 26 -#define SUBMENU_MAIL 27 -#define SUBMENU_OPTIONS 28 -#define SUBMENU_TOOLBARS 29 -#define SUBMENU_GRAPHIC 30 -#define SUBMENU_SPELLING 31 -#define SUBMENU_CELLCONT 32 -#define SUBMENU_OBJMIRROR 33 -#define SUBMENU_OBJALIGN 34 -#define SUBMENU_OBJANCHOR 35 -#define SUBMENU_SENDTO 36 -#define SUBMENU_CHANGES 37 +// 1 ist nicht erlaubt ???? +#define SUBMENU_EDIT 2 +#define SUBMENU_FILL 3 +#define SUBMENU_DELBREAK 4 +#define SUBMENU_VIEW 5 +#define SUBMENU_INSERT 6 +#define SUBMENU_INSBREAK 7 +#define SUBMENU_NAME 8 +#define SUBMENU_INSOBJ 9 +#define SUBMENU_DATA 10 +#define SUBMENU_FILTER 11 +#define SUBMENU_OUTLINE 12 +#define SUBMENU_PIVOT 13 +#define SUBMENU_EXTRA 14 +#define SUBMENU_AUDIT 15 +#define SUBMENU_PROTECT 16 +#define SUBMENU_ROW 17 +#define SUBMENU_COL 18 +#define SUBMENU_TAB 19 +#define SUBMENU_MERGE 20 +#define SUBMENU_AREA 21 +#define SUBMENU_MIRROR 22 +#define SUBMENU_OBJARRANGE 23 +#define SUBMENU_ANCHOR 24 +#define SUBMENU_POPARRANGE 25 +#define SUBMENU_OLEARRANGE 26 +#define SUBMENU_MAIL 27 +#define SUBMENU_OPTIONS 28 +#define SUBMENU_TOOLBARS 29 +#define SUBMENU_GRAPHIC 30 +#define SUBMENU_SPELLING 31 +#define SUBMENU_CELLCONT 32 +#define SUBMENU_OBJMIRROR 33 +#define SUBMENU_OBJALIGN 34 +#define SUBMENU_OBJANCHOR 35 +#define SUBMENU_SENDTO 36 +#define SUBMENU_CHANGES 37 #define SUBMENU_EDIT_TABLE 38 #define MN_TEMPLATES 39 diff --git a/sc/source/ui/inc/subtdlg.hrc b/sc/source/ui/inc/subtdlg.hrc index 66c63df48953..9970491e5df3 100644 --- a/sc/source/ui/inc/subtdlg.hrc +++ b/sc/source/ui/inc/subtdlg.hrc @@ -1,7 +1,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 @@ -34,7 +34,7 @@ */ // TabDialog -#define BTN_REMOVE 1 +#define BTN_REMOVE 1 #define PAGE_GROUP1 2 #define PAGE_GROUP2 3 #define PAGE_GROUP3 4 diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 8cff085ae0f0..614889066c09 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.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 @@ -41,10 +41,10 @@ class ScSubTotalDlg : public SfxTabDialog { public: - ScSubTotalDlg( Window* pParent, - const SfxItemSet* pArgSet ); + ScSubTotalDlg( Window* pParent, + const SfxItemSet* pArgSet ); private: - PushButton aBtnRemove; + PushButton aBtnRemove; DECL_LINK( RemoveHdl, PushButton * ); }; diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index e46c1e83f7e8..ec8b6f66a7a7 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index c9892ecbceec..18c583f441b3 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.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 @@ -38,37 +38,37 @@ class ScViewData; // --------------------------------------------------------------------------- -// initial size -#define SC_TABBAR_DEFWIDTH 270 +// initial size +#define SC_TABBAR_DEFWIDTH 270 class ScTabControl : public TabBar, public DropTargetHelper, public DragSourceHelper { private: - ScViewData* pViewData; + ScViewData* pViewData; USHORT nMouseClickPageId; /// Last page ID after mouse button down/up USHORT nSelPageIdByMouse; /// Selected page ID, if selected with mouse BOOL bErrorShown; - void DoDrag( const Region& rRegion ); + void DoDrag( const Region& rRegion ); - USHORT GetMaxId() const; - SCTAB GetPrivatDropPos(const Point& rPos ); + USHORT GetMaxId() const; + SCTAB GetPrivatDropPos(const Point& rPos ); protected: - virtual void Select(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Select(); + virtual void Command( const CommandEvent& rCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); virtual void Mirror(); public: @@ -78,8 +78,8 @@ public: using TabBar::StartDrag; void UpdateInputContext(); - void UpdateStatus(); - void ActivateView(BOOL bActivate); + void UpdateStatus(); + void ActivateView(BOOL bActivate); void SetSheetLayoutRTL( BOOL bSheetRTL ); }; diff --git a/sc/source/ui/inc/tabopdlg.hrc b/sc/source/ui/inc/tabopdlg.hrc index 5ae127b63e73..a2d3b7633cf9 100644 --- a/sc/source/ui/inc/tabopdlg.hrc +++ b/sc/source/ui/inc/tabopdlg.hrc @@ -1,7 +1,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 @@ -27,24 +27,24 @@ #include "sc.hrc" // ->RID_SCDLG_TABOP -#define ED_FORMULARANGE 1 -#define ED_ROWCELL 2 -#define ED_COLCELL 3 -#define FT_FORMULARANGE 1 -#define FT_ROWCELL 2 -#define FT_COLCELL 3 -#define RB_FORMULARANGE 1 -#define RB_ROWCELL 2 -#define RB_COLCELL 3 +#define ED_FORMULARANGE 1 +#define ED_ROWCELL 2 +#define ED_COLCELL 3 +#define FT_FORMULARANGE 1 +#define FT_ROWCELL 2 +#define FT_COLCELL 3 +#define RB_FORMULARANGE 1 +#define RB_ROWCELL 2 +#define RB_COLCELL 3 #define FL_VARIABLES 1 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 1 -#define STR_NOFORMULA 1 -#define STR_NOCOLROW 2 -#define STR_WRONGFORMULA 3 -#define STR_WRONGROWCOL 4 -#define STR_NOCOLFORMULA 5 -#define STR_NOROWFORMULA 6 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 1 +#define STR_NOFORMULA 1 +#define STR_NOCOLROW 2 +#define STR_WRONGFORMULA 3 +#define STR_WRONGROWCOL 4 +#define STR_NOCOLFORMULA 5 +#define STR_NOROWFORMULA 6 diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index c0f06f060184..0c8a666f5490 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.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 @@ -55,58 +55,58 @@ class ScTabOpDlg : public ScAnyRefDlg { public: ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScDocument* pDocument, - const ScRefAddress& rCursorPos ); + ScDocument* pDocument, + const ScRefAddress& rCursorPos ); ~ScTabOpDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const { return TRUE; } - virtual void SetActive(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual BOOL IsRefInputMode() const { return TRUE; } + virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL Close(); private: FixedLine aFlVariables; - FixedText aFtFormulaRange; - formula::RefEdit aEdFormulaRange; - formula::RefButton aRBFormulaRange; - - FixedText aFtRowCell; - formula::RefEdit aEdRowCell; - formula::RefButton aRBRowCell; - - FixedText aFtColCell; - formula::RefEdit aEdColCell; - formula::RefButton aRBColCell; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - ScRefAddress theFormulaCell; - ScRefAddress theFormulaEnd; - ScRefAddress theRowCell; - ScRefAddress theColCell; - - ScDocument* pDoc; - const SCTAB nCurTab; - formula::RefEdit* pEdActive; - BOOL bDlgLostFocus; - const String errMsgNoFormula; - const String errMsgNoColRow; - const String errMsgWrongFormula; - const String errMsgWrongRowCol; - const String errMsgNoColFormula; - const String errMsgNoRowFormula; + FixedText aFtFormulaRange; + formula::RefEdit aEdFormulaRange; + formula::RefButton aRBFormulaRange; + + FixedText aFtRowCell; + formula::RefEdit aEdRowCell; + formula::RefButton aRBRowCell; + + FixedText aFtColCell; + formula::RefEdit aEdColCell; + formula::RefButton aRBColCell; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + ScRefAddress theFormulaCell; + ScRefAddress theFormulaEnd; + ScRefAddress theRowCell; + ScRefAddress theColCell; + + ScDocument* pDoc; + const SCTAB nCurTab; + formula::RefEdit* pEdActive; + BOOL bDlgLostFocus; + const String errMsgNoFormula; + const String errMsgNoColRow; + const String errMsgWrongFormula; + const String errMsgWrongRowCol; + const String errMsgNoColFormula; + const String errMsgNoRowFormula; #ifdef _TABOPDLG_CXX - void Init(); - void RaiseError( ScTabOpErr eError ); + void Init(); + void RaiseError( ScTabOpErr eError ); DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, Control* ); -#endif // _TABOPDLG_CXX +#endif // _TABOPDLG_CXX }; #endif // SC_TABOPDLG_HXX diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 22ddc43e52c2..8075370709dc 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.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 @@ -38,43 +38,43 @@ class ScTabPageProtection : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rAttrSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs ); - virtual void Reset ( const SfxItemSet& ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rAttrSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs ); + virtual void Reset ( const SfxItemSet& ); protected: using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); private: - ScTabPageProtection( Window* pParent, - const SfxItemSet& rCoreAttrs ); + ScTabPageProtection( Window* pParent, + const SfxItemSet& rCoreAttrs ); ~ScTabPageProtection(); private: FixedLine aFlProtect; - TriStateBox aBtnHideCell; - TriStateBox aBtnProtect; - TriStateBox aBtnHideFormula; - FixedInfo aTxtHint; + TriStateBox aBtnHideCell; + TriStateBox aBtnProtect; + TriStateBox aBtnHideFormula; + FixedInfo aTxtHint; FixedLine aFlPrint; - TriStateBox aBtnHidePrint; - FixedInfo aTxtHint2; + TriStateBox aBtnHidePrint; + FixedInfo aTxtHint2; // aktueller Status: - BOOL bTriEnabled; // wenn vorher Dont-Care - BOOL bDontCare; // alles auf TriState - BOOL bProtect; // einzelne Einstellungen ueber TriState sichern - BOOL bHideForm; - BOOL bHideCell; - BOOL bHidePrint; + BOOL bTriEnabled; // wenn vorher Dont-Care + BOOL bDontCare; // alles auf TriState + BOOL bProtect; // einzelne Einstellungen ueber TriState sichern + BOOL bHideForm; + BOOL bHideCell; + BOOL bHidePrint; // Handler: DECL_LINK( ButtonClickHdl, TriStateBox* pBox ); - void UpdateButtons(); + void UpdateButtons(); }; diff --git a/sc/source/ui/inc/tabpopsh.hxx b/sc/source/ui/inc/tabpopsh.hxx index b9db71011897..241a68d6bfb8 100644 --- a/sc/source/ui/inc/tabpopsh.hxx +++ b/sc/source/ui/inc/tabpopsh.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 @@ -43,8 +43,8 @@ public: ScTabPopShell(SfxItemPool& rItemPool); ~ScTabPopShell(); - void DummyExec( SfxRequest& rReq ); - void DummyState( SfxItemSet& rSet ); + void DummyExec( SfxRequest& rReq ); + void DummyState( SfxItemSet& rSet ); }; diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index 9a369a0dd36f..52a5b7559ebe 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.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 @@ -37,22 +37,22 @@ class ScViewData; class ScTabSplitter : public Splitter { private: - ScViewData* pViewData; - BOOL bFixed; + ScViewData* pViewData; + BOOL bFixed; protected: - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Splitting( Point& rSplitPos ); + virtual void Splitting( Point& rSplitPos ); public: ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pData ); ~ScTabSplitter(); - void SetFixed(BOOL bSet); + void SetFixed(BOOL bSet); }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 8a4d79220cfd..e459c93398f0 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.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 @@ -30,10 +30,10 @@ #include <vcl/scrbar.hxx> -//REMOVE #ifndef SO2_DECL_SVINPLACECLIENT_DEFINED -//REMOVE #define SO2_DECL_SVINPLACECLIENT_DEFINED -//REMOVE SO2_DECL_REF(SvInPlaceClient) -//REMOVE #endif +//REMOVE #ifndef SO2_DECL_SVINPLACECLIENT_DEFINED +//REMOVE #define SO2_DECL_SVINPLACECLIENT_DEFINED +//REMOVE SO2_DECL_REF(SvInPlaceClient) +//REMOVE #endif #include <sfx2/ipclient.hxx> @@ -66,28 +66,28 @@ namespace chart2 { namespace data { struct HighlightedRange; }}}}} -#define SPLIT_HANDLE_SIZE 3 -#define SC_FORCEMODE_NONE 0xff +#define SPLIT_HANDLE_SIZE 3 +#define SC_FORCEMODE_NONE 0xff // --------------------------------------------------------------------------- -// Hilfs - Fenster +// Hilfs - Fenster class ScCornerButton : public Window { private: - ScViewData* pViewData; - BOOL bAdd; + ScViewData* pViewData; + BOOL bAdd; protected: - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); public: ScCornerButton( Window* pParent, ScViewData* pData, BOOL bAdditional ); ~ScCornerButton(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -96,106 +96,106 @@ public: class ScTabView { private: - Window* pFrameWin; // als erstes !!! - ScViewData aViewData; // muss ganz vorne stehen ! + Window* pFrameWin; // als erstes !!! + ScViewData aViewData; // muss ganz vorne stehen ! - ScViewSelectionEngine* pSelEngine; - ScViewFunctionSet aFunctionSet; + ScViewSelectionEngine* pSelEngine; + ScViewFunctionSet aFunctionSet; ScHeaderSelectionEngine* pHdrSelEng; - ScHeaderFunctionSet aHdrFunc; + ScHeaderFunctionSet aHdrFunc; SfxInPlaceClient* pIPClient; - ScDrawView* pDrawView; + ScDrawView* pDrawView; - Size aFrameSize; // wie bei DoResize uebergeben - Point aBorderPos; + Size aFrameSize; // wie bei DoResize uebergeben + Point aBorderPos; - BOOL bDrawSelMode; // nur Zeichenobjekte selektieren ? + BOOL bDrawSelMode; // nur Zeichenobjekte selektieren ? - FuPoor* pDrawActual; - FuPoor* pDrawOld; + FuPoor* pDrawActual; + FuPoor* pDrawOld; - ScGridWindow* pGridWin[4]; - ScColBar* pColBar[2]; - ScRowBar* pRowBar[2]; - ScOutlineWindow* pColOutline[2]; - ScOutlineWindow* pRowOutline[2]; - ScTabSplitter* pHSplitter; - ScTabSplitter* pVSplitter; - ScTabControl* pTabControl; - ScrollBar aVScrollTop; - ScrollBar aVScrollBottom; // anfangs sichtbar - ScrollBar aHScrollLeft; // anfangs sichtbar - ScrollBar aHScrollRight; - ScCornerButton aCornerButton; - ScCornerButton aTopButton; - ScrollBarBox aScrollBarBox; + ScGridWindow* pGridWin[4]; + ScColBar* pColBar[2]; + ScRowBar* pRowBar[2]; + ScOutlineWindow* pColOutline[2]; + ScOutlineWindow* pRowOutline[2]; + ScTabSplitter* pHSplitter; + ScTabSplitter* pVSplitter; + ScTabControl* pTabControl; + ScrollBar aVScrollTop; + ScrollBar aVScrollBottom; // anfangs sichtbar + ScrollBar aHScrollLeft; // anfangs sichtbar + ScrollBar aHScrollRight; + ScCornerButton aCornerButton; + ScCornerButton aTopButton; + ScrollBarBox aScrollBarBox; - ScHintWindow* pInputHintWindow; // Eingabemeldung bei Gueltigkeit + ScHintWindow* pInputHintWindow; // Eingabemeldung bei Gueltigkeit - ScPageBreakData* pPageBreakData; // fuer Seitenumbruch-Modus - ScHighlightRanges* pHighlightRanges; + ScPageBreakData* pPageBreakData; // fuer Seitenumbruch-Modus + ScHighlightRanges* pHighlightRanges; ScDocument* pBrushDocument; // cell formats for format paint brush SfxItemSet* pDrawBrushSet; // drawing object attributes for paint brush BOOL bLockPaintBrush; // keep for more than one use? - Timer aScrollTimer; - ScGridWindow* pTimerWindow; - MouseEvent aTimerMEvt; + Timer aScrollTimer; + ScGridWindow* pTimerWindow; + MouseEvent aTimerMEvt; - ULONG nTipVisible; + ULONG nTipVisible; - BOOL bDragging; // fuer Scrollbars - long nPrevDragPos; + BOOL bDragging; // fuer Scrollbars + long nPrevDragPos; - BOOL bIsBlockMode; // Block markieren - BOOL bBlockNeg; // wird Markierung aufgehoben? - BOOL bBlockCols; // werden ganze Spalten markiert? - BOOL bBlockRows; // werden ganze Zeilen markiert? + BOOL bIsBlockMode; // Block markieren + BOOL bBlockNeg; // wird Markierung aufgehoben? + BOOL bBlockCols; // werden ganze Spalten markiert? + BOOL bBlockRows; // werden ganze Zeilen markiert? - SCCOL nBlockStartX; + SCCOL nBlockStartX; SCCOL nBlockStartXOrig; - SCCOL nBlockEndX; + SCCOL nBlockEndX; - SCROW nBlockStartY; + SCROW nBlockStartY; SCROW nBlockStartYOrig; - SCROW nBlockEndY; + SCROW nBlockEndY; - SCTAB nBlockStartZ; - SCTAB nBlockEndZ; + SCTAB nBlockStartZ; + SCTAB nBlockEndZ; SCCOL nOldCurX; SCROW nOldCurY; double mfPendingTabBarWidth; // Tab bar width relative to frame window width. - BOOL bMinimized; - BOOL bInUpdateHeader; - BOOL bInActivatePart; - BOOL bInZoomUpdate; - BOOL bMoveIsShift; + BOOL bMinimized; + BOOL bInUpdateHeader; + BOOL bInActivatePart; + BOOL bInZoomUpdate; + BOOL bMoveIsShift; - void Init(); + void Init(); - void DoAddWin( ScGridWindow* pWin ); + void DoAddWin( ScGridWindow* pWin ); - void InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ); - DECL_LINK( ScrollHdl, ScrollBar* ); - DECL_LINK( EndScrollHdl, ScrollBar* ); + void InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ); + DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( EndScrollHdl, ScrollBar* ); - DECL_LINK( SplitHdl, Splitter* ); - void DoHSplit(long nSplitPos); - void DoVSplit(long nSplitPos); + DECL_LINK( SplitHdl, Splitter* ); + void DoHSplit(long nSplitPos); + void DoVSplit(long nSplitPos); - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK( TimerHdl, Timer* ); - void UpdateVarZoom(); + void UpdateVarZoom(); - static void SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL ); - static long GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL ); + static void SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL ); + static long GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL ); void GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPageX, SCsROW& rPageY); void GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, @@ -205,44 +205,44 @@ private: void SkipCursorVertical(SCsCOL& rCurX, SCsROW& rCurY, SCsROW nOldY, SCsROW nMovY); protected: - void UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL, + void UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL, const SCROW* pPosY = NULL ); - void HideTip(); - void ShowRefTip(); + void HideTip(); + void ShowRefTip(); - void ZoomChanged(); - void UpdateShow(); + void ZoomChanged(); + void UpdateShow(); void UpdateVisibleRange(); - void GetBorderSize( SvBorder& rBorder, const Size& rSize ); + void GetBorderSize( SvBorder& rBorder, const Size& rSize ); - void ResetDrawDragMode(); - BOOL IsDrawTextEdit() const; - void DrawEnableAnim(BOOL bSet); - //HMHvoid DrawShowMarkHdl(BOOL bShow); + void ResetDrawDragMode(); + BOOL IsDrawTextEdit() const; + void DrawEnableAnim(BOOL bSet); + //HMHvoid DrawShowMarkHdl(BOOL bShow); - void MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); + void MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); - void HideNoteMarker(); + void HideNoteMarker(); - void UpdateIMap( SdrObject* pObj ); + void UpdateIMap( SdrObject* pObj ); public: ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); ~ScTabView(); - void MakeDrawLayer(); + void MakeDrawLayer(); - void HideListBox(); + void HideListBox(); - BOOL HasHintWindow() const { return pInputHintWindow != NULL; } - void RemoveHintWindow(); - void TestHintWindow(); + BOOL HasHintWindow() const { return pInputHintWindow != NULL; } + void RemoveHintWindow(); + void TestHintWindow(); - DECL_LINK( TabBarResize, void* ); + DECL_LINK( TabBarResize, void* ); /** Sets an absolute tab bar width (in pixels). */ - void SetTabBarWidth( long nNewWidth ); + void SetTabBarWidth( long nNewWidth ); /** Sets a relative tab bar width. @param fRelTabBarWidth Tab bar width relative to frame window width (0.0 ... 1.0). */ void SetRelTabBarWidth( double fRelTabBarWidth ); @@ -256,262 +256,262 @@ public: /** Returns the pending tab bar width relative to the frame window width (0.0 ... 1.0). */ double GetPendingRelTabBarWidth() const; - void DoResize( const Point& rOffset, const Size& rSize, BOOL bInner = FALSE ); - void RepeatResize( BOOL bUpdateFix = TRUE ); - void UpdateFixPos(); - Point GetGridOffset() const; + void DoResize( const Point& rOffset, const Size& rSize, BOOL bInner = FALSE ); + void RepeatResize( BOOL bUpdateFix = TRUE ); + void UpdateFixPos(); + Point GetGridOffset() const; - BOOL IsDrawSelMode() const { return bDrawSelMode; } - void SetDrawSelMode(BOOL bNew) { bDrawSelMode = bNew; } + BOOL IsDrawSelMode() const { return bDrawSelMode; } + void SetDrawSelMode(BOOL bNew) { bDrawSelMode = bNew; } - void SetDrawFuncPtr(FuPoor* pFuncPtr) { pDrawActual = pFuncPtr; } - void SetDrawFuncOldPtr(FuPoor* pFuncPtr) { pDrawOld = pFuncPtr; } - FuPoor* GetDrawFuncPtr() { return pDrawActual; } - FuPoor* GetDrawFuncOldPtr() { return pDrawOld; } + void SetDrawFuncPtr(FuPoor* pFuncPtr) { pDrawActual = pFuncPtr; } + void SetDrawFuncOldPtr(FuPoor* pFuncPtr) { pDrawOld = pFuncPtr; } + FuPoor* GetDrawFuncPtr() { return pDrawActual; } + FuPoor* GetDrawFuncOldPtr() { return pDrawOld; } - void DrawDeselectAll(); - void DrawMarkListHasChanged(); - void UpdateAnchorHandles(); + void DrawDeselectAll(); + void DrawMarkListHasChanged(); + void UpdateAnchorHandles(); - ScPageBreakData* GetPageBreakData() { return pPageBreakData; } - ScHighlightRanges* GetHighlightRanges() { return pHighlightRanges; } + ScPageBreakData* GetPageBreakData() { return pPageBreakData; } + ScHighlightRanges* GetHighlightRanges() { return pHighlightRanges; } - void UpdatePageBreakData( BOOL bForcePaint = FALSE ); + void UpdatePageBreakData( BOOL bForcePaint = FALSE ); - void DrawMarkRect( const Rectangle& rRect ); + void DrawMarkRect( const Rectangle& rRect ); - ScViewData* GetViewData() { return &aViewData; } - const ScViewData* GetViewData() const { return &aViewData; } + ScViewData* GetViewData() { return &aViewData; } + const ScViewData* GetViewData() const { return &aViewData; } - ScViewFunctionSet* GetFunctionSet() { return &aFunctionSet; } - ScViewSelectionEngine* GetSelEngine() { return pSelEngine; } + ScViewFunctionSet* GetFunctionSet() { return &aFunctionSet; } + ScViewSelectionEngine* GetSelEngine() { return pSelEngine; } - BOOL SelMouseButtonDown( const MouseEvent& rMEvt ); + BOOL SelMouseButtonDown( const MouseEvent& rMEvt ); - ScDrawView* GetScDrawView() { return pDrawView; } - SdrView* GetSdrView(); // gegen CLOKs + ScDrawView* GetScDrawView() { return pDrawView; } + SdrView* GetSdrView(); // gegen CLOKs - BOOL IsMinimized() const { return bMinimized; } + BOOL IsMinimized() const { return bMinimized; } - void TabChanged(); - void SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll ); + void TabChanged(); + void SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll ); SC_DLLPUBLIC void RefreshZoom(); - void SetPagebreakMode( BOOL bSet ); + void SetPagebreakMode( BOOL bSet ); - void UpdateLayerLocks(); + void UpdateLayerLocks(); - void UpdateDrawTextOutliner(); - void DigitLanguageChanged(); + void UpdateDrawTextOutliner(); + void DigitLanguageChanged(); - void UpdateInputLine(); + void UpdateInputLine(); - void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, + void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, BOOL bPaint = TRUE ); - void DoneRefMode( BOOL bContinue = FALSE ); - void UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ); - void StopRefMode(); + void DoneRefMode( BOOL bContinue = FALSE ); + void UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ); + void StopRefMode(); - void StopMarking(); - void FakeButtonUp( ScSplitPos eWhich ); + void StopMarking(); + void FakeButtonUp( ScSplitPos eWhich ); - Window* GetActiveWin(); - Window* GetWindowByPos( ScSplitPos ePos ); + Window* GetActiveWin(); + Window* GetWindowByPos( ScSplitPos ePos ); - ScSplitPos FindWindow( Window* pWindow ) const; + ScSplitPos FindWindow( Window* pWindow ) const; - void SetActivePointer( const Pointer& rPointer ); + void SetActivePointer( const Pointer& rPointer ); - void ActiveGrabFocus(); + void ActiveGrabFocus(); - void ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ); + void ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ); - SC_DLLPUBLIC void SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew = FALSE ); + SC_DLLPUBLIC void SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew = FALSE ); - SC_DLLPUBLIC void CellContentChanged(); - void SelectionChanged(); - void CursorPosChanged(); - void UpdateInputContext(); + SC_DLLPUBLIC void CellContentChanged(); + void SelectionChanged(); + void CursorPosChanged(); + void UpdateInputContext(); - void CheckSelectionTransfer(); + void CheckSelectionTransfer(); - void InvertHorizontal( ScVSplitPos eWhich, long nDragPos ); - void InvertVertical( ScHSplitPos eWhich, long nDragPos ); + void InvertHorizontal( ScVSplitPos eWhich, long nDragPos ); + void InvertVertical( ScHSplitPos eWhich, long nDragPos ); - Point GetInsertPos(); + Point GetInsertPos(); Point GetChartInsertPos( const Size& rSize, const ScRange& rCellRange ); Point GetChartDialogPos( const Size& rDialogSize, const Rectangle& rLogicChart ); - void UpdateAutoFillMark(); + void UpdateAutoFillMark(); - void HideCursor(); // nur aktiver Teil - void ShowCursor(); - void HideAllCursors(); - void ShowAllCursors(); + void HideCursor(); // nur aktiver Teil + void ShowCursor(); + void HideAllCursors(); + void ShowAllCursors(); - void AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, + void AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, const ScSplitPos* pWhich = NULL ); SvxZoomType GetZoomType() const; void SetZoomType( SvxZoomType eNew, BOOL bAll ); - USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom ); + USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom ); -// void CalcZoom( SvxZoomType eType, USHORT& rZoom, SCCOL& rCol, SCROW& rRow ); +// void CalcZoom( SvxZoomType eType, USHORT& rZoom, SCCOL& rCol, SCROW& rRow ); sal_Bool HasPageFieldDataAtCursor() const; - void StartDataSelect(); + void StartDataSelect(); - // MoveCursorAbs - absolut - // MoveCursorRel - einzelne Zellen - // MoveCursorPage - Bildschirmseite - // MoveCursorArea - Datenblock - // MoveCursorEnd - links oben / benutzter Bereich + // MoveCursorAbs - absolut + // MoveCursorRel - einzelne Zellen + // MoveCursorPage - Bildschirmseite + // MoveCursorArea - Datenblock + // MoveCursorEnd - links oben / benutzter Bereich - SC_DLLPUBLIC void MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, + SC_DLLPUBLIC void MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, BOOL bShift, BOOL bControl, BOOL bKeepOld = FALSE, BOOL bKeepSel = FALSE ); - void MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, + void MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel = FALSE ); - void MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, + void MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel = FALSE ); - void MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, + void MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel = FALSE ); - void MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, + void MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel = FALSE ); - void MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift ); + void MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift ); - void MoveCursorEnter( BOOL bShift ); // Shift fuer Richtung (kein Markieren) + void MoveCursorEnter( BOOL bShift ); // Shift fuer Richtung (kein Markieren) BOOL MoveCursorKeyInput( const KeyEvent& rKeyEvent ); - void FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE ); + void FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE ); SC_DLLPUBLIC void SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE ); void SelectNextTab( short nDir, BOOL bExtendSelection = FALSE ); - void ActivateView( BOOL bActivate, BOOL bFirst ); - void ActivatePart( ScSplitPos eWhich ); - BOOL IsInActivatePart() const { return bInActivatePart; } + void ActivateView( BOOL bActivate, BOOL bFirst ); + void ActivatePart( ScSplitPos eWhich ); + BOOL IsInActivatePart() const { return bInActivatePart; } - void SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt ); - void ResetTimer(); + void SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt ); + void ResetTimer(); - void ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars = TRUE ); - void ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars = TRUE ); - SC_DLLPUBLIC void ScrollLines( long nDeltaX, long nDeltaY ); // aktives + void ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars = TRUE ); + void ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars = TRUE ); + SC_DLLPUBLIC void ScrollLines( long nDeltaX, long nDeltaY ); // aktives - BOOL ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ); + BOOL ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ); - void ScrollToObject( SdrObject* pDrawObj ); - void MakeVisible( const Rectangle& rHMMRect ); + void ScrollToObject( SdrObject* pDrawObj ); + void MakeVisible( const Rectangle& rHMMRect ); // Zeichnen - void InvertBlockMark(SCCOL nBlockStartX, SCROW nBlockStartY, + void InvertBlockMark(SCCOL nBlockStartX, SCROW nBlockStartY, SCCOL nBlockEndX, SCROW nBlockEndY); - void PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScUpdateMode eMode = SC_UPDATE_ALL ); - void PaintGrid(); + void PaintGrid(); - void PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ); - void PaintTop(); + void PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ); + void PaintTop(); - void PaintLeftArea( SCROW nStartRow, SCROW nEndRow ); - void PaintLeft(); + void PaintLeftArea( SCROW nStartRow, SCROW nEndRow ); + void PaintLeft(); - BOOL PaintExtras(); + BOOL PaintExtras(); - void RecalcPPT(); + void RecalcPPT(); - void CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress); + void CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress); void UpdateCopySourceOverlay(); void UpdateSelectionOverlay(); void UpdateShrinkOverlay(); void UpdateAllOverlays(); - void UpdateFormulas(); - void InterpretVisible(); - void CheckNeedsRepaint(); + void UpdateFormulas(); + void InterpretVisible(); + void CheckNeedsRepaint(); - void PaintRangeFinder( long nNumber = -1 ); - void AddHighlightRange( const ScRange& rRange, const Color& rColor ); - void ClearHighlightRanges(); + void PaintRangeFinder( long nNumber = -1 ); + void AddHighlightRange( const ScRange& rRange, const Color& rColor ); + void ClearHighlightRanges(); - void DoChartSelection( const ::com::sun::star::uno::Sequence< + void DoChartSelection( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::data::HighlightedRange > & rHilightRanges ); - long GetGridWidth( ScHSplitPos eWhich ); - long GetGridHeight( ScVSplitPos eWhich ); + long GetGridWidth( ScHSplitPos eWhich ); + long GetGridHeight( ScVSplitPos eWhich ); - void UpdateScrollBars(); - void SetNewVisArea(); + void UpdateScrollBars(); + void SetNewVisArea(); - void InvalidateAttribs(); + void InvalidateAttribs(); - void MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ); - void KillEditView( BOOL bNoPaint ); - void UpdateEditView(); + void MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ); + void KillEditView( BOOL bNoPaint ); + void UpdateEditView(); - // Bloecke + // Bloecke - void SelectAll( BOOL bContinue = FALSE ); - void SelectAllTables(); + void SelectAll( BOOL bContinue = FALSE ); + void SelectAllTables(); void DeselectAllTables(); - void MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, + void MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, BOOL bCols = FALSE, BOOL bRows = FALSE, BOOL bCellSelection = FALSE ); - void InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, + void InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, BOOL bTestNeg = FALSE, BOOL bCols = FALSE, BOOL bRows = FALSE ); - void InitOwnBlockMode(); - void DoneBlockMode( BOOL bContinue = FALSE ); + void InitOwnBlockMode(); + void DoneBlockMode( BOOL bContinue = FALSE ); - BOOL IsBlockMode() const { return bIsBlockMode; } + BOOL IsBlockMode() const { return bIsBlockMode; } void ExpandBlock(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode); void ExpandBlockPage(SCsCOL nMovX, SCsROW nMovY); void ExpandBlockArea(SCsCOL nMovX, SCsROW nMovY); - void MarkColumns(); - void MarkRows(); - void MarkDataArea( BOOL bIncludeCursor = TRUE ); - void MarkMatrixFormula(); - void Unmark(); + void MarkColumns(); + void MarkRows(); + void MarkDataArea( BOOL bIncludeCursor = TRUE ); + void MarkMatrixFormula(); + void Unmark(); void MarkRange( const ScRange& rRange, BOOL bSetCursor = TRUE, BOOL bContinue = FALSE ); - BOOL IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + BOOL IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - void PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void PaintBlock( BOOL bReset = FALSE ); + void PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + void PaintBlock( BOOL bReset = FALSE ); void SetMarkData( const ScMarkData& rNew ); void MarkDataChanged(); - void LockModifiers( USHORT nModifiers ); - USHORT GetLockedModifiers() const; - void ViewOptionsHasChanged( BOOL bHScrollChanged, + void LockModifiers( USHORT nModifiers ); + USHORT GetLockedModifiers() const; + void ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChanged = FALSE); - Point GetMousePosPixel(); + Point GetMousePosPixel(); - void SnapSplitPos( Point& rScreenPosPixel ); - void FreezeSplitters( BOOL bFreeze ); - void RemoveSplit(); - void SplitAtCursor(); - void SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ); - void InvalidateSplit(); + void SnapSplitPos( Point& rScreenPosPixel ); + void FreezeSplitters( BOOL bFreeze ); + void RemoveSplit(); + void SplitAtCursor(); + void SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ); + void InvalidateSplit(); - void ErrorMessage( USHORT nGlobStrId ); - Window* GetParentOrChild( USHORT nChildId ); + void ErrorMessage( USHORT nGlobStrId ); + Window* GetParentOrChild( USHORT nChildId ); - void EnableRefInput(BOOL bFlag=TRUE); + void EnableRefInput(BOOL bFlag=TRUE); - Window* GetFrameWin() const { return pFrameWin; } + Window* GetFrameWin() const { return pFrameWin; } BOOL HasPaintBrush() const { return pBrushDocument || pDrawBrushSet; } ScDocument* GetBrushDocument() const { return pBrushDocument; } diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index b4685657f577..1834959121c6 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.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 @@ -34,9 +34,9 @@ #include <sfx2/viewfac.hxx> #include <editeng/svxenum.hxx> #include "scdllapi.h" -#include "dbfunc.hxx" // -> tabview +#include "dbfunc.hxx" // -> tabview #include "target.hxx" -#include "rangelst.hxx" // ScRangeListRef +#include "rangelst.hxx" // ScRangeListRef #include "shellids.hxx" #include "tabprotection.hxx" // for ScPasswordHash @@ -101,92 +101,92 @@ enum ObjectSelectionType class ScTabViewShell: public SfxViewShell, public ScDBFunc { private: - static USHORT nInsertCtrlState; - static USHORT nInsCellsCtrlState; - static USHORT nInsObjCtrlState; + static USHORT nInsertCtrlState; + static USHORT nInsCellsCtrlState; + static USHORT nInsObjCtrlState; SvxHtmlOptions aHTMLOpt; - ObjectSelectionType eCurOST; - USHORT nDrawSfxId; - USHORT nCtrlSfxId; - USHORT nFormSfxId; + ObjectSelectionType eCurOST; + USHORT nDrawSfxId; + USHORT nCtrlSfxId; + USHORT nFormSfxId; String sDrawCustom; // current custom shape type - ScDrawShell* pDrawShell; - ScDrawTextObjectBar* pDrawTextShell; - ScEditShell* pEditShell; - ScPivotShell* pPivotShell; - ScAuditingShell* pAuditingShell; - ScDrawFormShell* pDrawFormShell; - ScCellShell* pCellShell; - ScOleObjectShell* pOleObjectShell; - ScChartShell* pChartShell; - ScGraphicShell* pGraphicShell; - ScMediaShell* pMediaShell; - ScPageBreakShell* pPageBreakShell; - svx::ExtrusionBar* pExtrusionBarShell; - svx::FontworkBar* pFontworkBarShell; - - FmFormShell* pFormShell; - - ScInputHandler* pInputHandler; // fuer OLE-Eingabezeile - - SvxBorderLine* pCurFrameLine; + ScDrawShell* pDrawShell; + ScDrawTextObjectBar* pDrawTextShell; + ScEditShell* pEditShell; + ScPivotShell* pPivotShell; + ScAuditingShell* pAuditingShell; + ScDrawFormShell* pDrawFormShell; + ScCellShell* pCellShell; + ScOleObjectShell* pOleObjectShell; + ScChartShell* pChartShell; + ScGraphicShell* pGraphicShell; + ScMediaShell* pMediaShell; + ScPageBreakShell* pPageBreakShell; + svx::ExtrusionBar* pExtrusionBarShell; + svx::FontworkBar* pFontworkBarShell; + + FmFormShell* pFormShell; + + ScInputHandler* pInputHandler; // fuer OLE-Eingabezeile + + SvxBorderLine* pCurFrameLine; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > xDisProvInterceptor; - Point aWinPos; + Point aWinPos; - ScTabViewTarget aTarget; - ScArea* pPivotSource; - ScDPObject* pDialogDPObject; + ScTabViewTarget aTarget; + ScArea* pPivotSource; + ScDPObject* pDialogDPObject; ScNavigatorSettings* pNavSettings; // used in first Activate - BOOL bFirstActivate; - - BOOL bActiveDrawSh; - BOOL bActiveDrawTextSh; - BOOL bActivePivotSh; - BOOL bActiveAuditingSh; - BOOL bActiveDrawFormSh; - BOOL bActiveOleObjectSh; - BOOL bActiveChartSh; - BOOL bActiveGraphicSh; - BOOL bActiveMediaSh; - BOOL bActiveEditSh; + BOOL bFirstActivate; + + BOOL bActiveDrawSh; + BOOL bActiveDrawTextSh; + BOOL bActivePivotSh; + BOOL bActiveAuditingSh; + BOOL bActiveDrawFormSh; + BOOL bActiveOleObjectSh; + BOOL bActiveChartSh; + BOOL bActiveGraphicSh; + BOOL bActiveMediaSh; + BOOL bActiveEditSh; BOOL bFormShellAtTop; // does the FormShell need to be on top? - BOOL bDontSwitch; // EditShell nicht abschalten - BOOL bInFormatDialog; // fuer GetSelectionText - BOOL bPrintSelected; // for result of SvxPrtQryBox + BOOL bDontSwitch; // EditShell nicht abschalten + BOOL bInFormatDialog; // fuer GetSelectionText + BOOL bPrintSelected; // for result of SvxPrtQryBox - BOOL bReadOnly; // um Status-Aenderungen zu erkennen + BOOL bReadOnly; // um Status-Aenderungen zu erkennen - SbxObject* pScSbxObject; + SbxObject* pScSbxObject; - BOOL bChartAreaValid; // wenn Chart aufgezogen wird - String aEditChartName; - ScRangeListRef aChartSource; - Rectangle aChartPos; - SCTAB nChartDestTab; - USHORT nCurRefDlgId; + BOOL bChartAreaValid; // wenn Chart aufgezogen wird + String aEditChartName; + ScRangeListRef aChartSource; + Rectangle aChartPos; + SCTAB nChartDestTab; + USHORT nCurRefDlgId; - SfxBroadcaster* pAccessibilityBroadcaster; + SfxBroadcaster* pAccessibilityBroadcaster; - static const int MASTERENUMCOMMANDS = 6; - String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; + static const int MASTERENUMCOMMANDS = 6; + String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; private: - void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); + void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); - SfxShell* GetMySubShell() const; + SfxShell* GetMySubShell() const; - void DoReadUserData( const String& rData ); + void DoReadUserData( const String& rData ); void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rSettings ); @@ -198,30 +198,30 @@ private: DECL_LINK( HtmlOptionsHdl, void * ); protected: - virtual void Activate(BOOL bMDI); - virtual void Deactivate(BOOL bMDI); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual void Activate(BOOL bMDI); + virtual void Deactivate(BOOL bMDI); + virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - virtual void ShowCursor(bool bOn); + virtual void ShowCursor(bool bOn); - virtual void Move(); // Benachrichtigung + virtual void Move(); // Benachrichtigung - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); // alt + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); // alt - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); // neu - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); // neu + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); - virtual void QueryObjAreaPixel( Rectangle& rRect ) const; + virtual void QueryObjAreaPixel( Rectangle& rRect ) const; - virtual Size GetOptimalSizePixel() const; + virtual Size GetOptimalSizePixel() const; virtual String GetSelectionText( BOOL bWholeWord ); - virtual BOOL HasSelection( BOOL bText ) const; + virtual BOOL HasSelection( BOOL bText ) const; virtual String GetDescription() const; - virtual void WriteUserData(String &, BOOL bBrowse = FALSE); - virtual void ReadUserData(const String &, BOOL bBrowse = FALSE); + virtual void WriteUserData(String &, BOOL bBrowse = FALSE); + virtual void ReadUserData(const String &, BOOL bBrowse = FALSE); virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -242,181 +242,181 @@ public: // aus einer allgemeinen Shell konstruieren und // soviel wie moeglich uebernehmen (SliderPos etc.): - ScTabViewShell( SfxViewFrame* pViewFrame, - SfxViewShell* pOldSh ); + ScTabViewShell( SfxViewFrame* pViewFrame, + SfxViewShell* pOldSh ); - virtual ~ScTabViewShell(); + virtual ~ScTabViewShell(); SC_DLLPUBLIC Window* GetDialogParent(); bool IsRefInputMode() const; - void ExecuteInputDirect(); + void ExecuteInputDirect(); - ScInputHandler* GetInputHandler() const; - void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE ); + ScInputHandler* GetInputHandler() const; + void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE ); void UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ); - BOOL TabKeyInput(const KeyEvent& rKEvt); - BOOL SfxKeyInput(const KeyEvent& rKEvt); + BOOL TabKeyInput(const KeyEvent& rKEvt); + BOOL SfxKeyInput(const KeyEvent& rKEvt); - void SetActive(); + void SetActive(); - SvxBorderLine* GetDefaultFrameLine() const { return pCurFrameLine; } - void SetDefaultFrameLine(const SvxBorderLine* pLine ); + SvxBorderLine* GetDefaultFrameLine() const { return pCurFrameLine; } + void SetDefaultFrameLine(const SvxBorderLine* pLine ); - SC_DLLPUBLIC void Execute( SfxRequest& rReq ); - SC_DLLPUBLIC void GetState( SfxItemSet& rSet ); + SC_DLLPUBLIC void Execute( SfxRequest& rReq ); + SC_DLLPUBLIC void GetState( SfxItemSet& rSet ); - void ExecuteTable( SfxRequest& rReq ); - void GetStateTable( SfxItemSet& rSet ); + void ExecuteTable( SfxRequest& rReq ); + void GetStateTable( SfxItemSet& rSet ); - void WindowChanged(); - void ExecDraw(SfxRequest&); - void ExecDrawIns(SfxRequest& rReq); - void GetDrawState(SfxItemSet &rSet); - void GetDrawInsState(SfxItemSet &rSet); - void ExecGallery(SfxRequest& rReq); // StarGallery - void GetGalleryState(SfxItemSet& rSet); + void WindowChanged(); + void ExecDraw(SfxRequest&); + void ExecDrawIns(SfxRequest& rReq); + void GetDrawState(SfxItemSet &rSet); + void GetDrawInsState(SfxItemSet &rSet); + void ExecGallery(SfxRequest& rReq); // StarGallery + void GetGalleryState(SfxItemSet& rSet); - void ExecChildWin(SfxRequest& rReq); - void GetChildWinState( SfxItemSet& rSet ); + void ExecChildWin(SfxRequest& rReq); + void GetChildWinState( SfxItemSet& rSet ); - void ExecImageMap( SfxRequest& rReq ); - void GetImageMapState( SfxItemSet& rSet ); + void ExecImageMap( SfxRequest& rReq ); + void GetImageMapState( SfxItemSet& rSet ); - void ExecTbx( SfxRequest& rReq ); - void GetTbxState( SfxItemSet& rSet ); + void ExecTbx( SfxRequest& rReq ); + void GetTbxState( SfxItemSet& rSet ); - void ExecuteSave( SfxRequest& rReq ); - void GetSaveState( SfxItemSet& rSet ); - void ExecSearch( SfxRequest& rReq ); + void ExecuteSave( SfxRequest& rReq ); + void GetSaveState( SfxItemSet& rSet ); + void ExecSearch( SfxRequest& rReq ); - SC_DLLPUBLIC void ExecuteUndo(SfxRequest& rReq); - void GetUndoState(SfxItemSet &rSet); + SC_DLLPUBLIC void ExecuteUndo(SfxRequest& rReq); + void GetUndoState(SfxItemSet &rSet); - void ExecuteSbx( SfxRequest& rReq ); - void GetSbxState( SfxItemSet& rSet ); + void ExecuteSbx( SfxRequest& rReq ); + void GetSbxState( SfxItemSet& rSet ); - void ExecuteObject(SfxRequest& rReq); - void GetObjectState(SfxItemSet &rSet); + void ExecuteObject(SfxRequest& rReq); + void GetObjectState(SfxItemSet &rSet); - void ExecDrawOpt(SfxRequest& rReq); - void GetDrawOptState(SfxItemSet &rSet); + void ExecDrawOpt(SfxRequest& rReq); + void GetDrawOptState(SfxItemSet &rSet); - void SetDrawShell( BOOL bActive ); - void SetDrawTextShell( BOOL bActive ); + void SetDrawShell( BOOL bActive ); + void SetDrawTextShell( BOOL bActive ); - void SetPivotShell( BOOL bActive ); - ScArea* GetPivotSource(){return pPivotSource;} - void SetPivotSource(ScArea* pSrc){pPivotSource=pSrc;} - void SetDialogDPObject( const ScDPObject* pObj ); + void SetPivotShell( BOOL bActive ); + ScArea* GetPivotSource(){return pPivotSource;} + void SetPivotSource(ScArea* pSrc){pPivotSource=pSrc;} + void SetDialogDPObject( const ScDPObject* pObj ); const ScDPObject* GetDialogDPObject() const { return pDialogDPObject; } - BOOL GetDontSwitch(){return bDontSwitch;} - void SetDontSwitch(BOOL bFlag){bDontSwitch=bFlag;} + BOOL GetDontSwitch(){return bDontSwitch;} + void SetDontSwitch(BOOL bFlag){bDontSwitch=bFlag;} - void SetAuditShell( BOOL bActive ); - void SetDrawFormShell( BOOL bActive ); - void SetEditShell(EditView* pView, BOOL bActive ); - void SetOleObjectShell( BOOL bActive ); - void SetChartShell( BOOL bActive ); - void SetGraphicShell( BOOL bActive ); - void SetMediaShell( BOOL bActive ); + void SetAuditShell( BOOL bActive ); + void SetDrawFormShell( BOOL bActive ); + void SetEditShell(EditView* pView, BOOL bActive ); + void SetOleObjectShell( BOOL bActive ); + void SetChartShell( BOOL bActive ); + void SetGraphicShell( BOOL bActive ); + void SetMediaShell( BOOL bActive ); - void SetDrawShellOrSub(); - void SetCurSubShell( ObjectSelectionType eOST, BOOL bForce = FALSE ); + void SetDrawShellOrSub(); + void SetCurSubShell( ObjectSelectionType eOST, BOOL bForce = FALSE ); void SetFormShellAtTop( BOOL bSet ); ObjectSelectionType GetCurObjectSelectionType(); - virtual ErrCode DoVerb(long nVerb); + virtual ErrCode DoVerb(long nVerb); - void StopEditShell(); - BOOL IsDrawTextShell() const; - BOOL IsAuditShell() const; + void StopEditShell(); + BOOL IsDrawTextShell() const; + BOOL IsAuditShell() const; - void SetDrawTextUndo( SfxUndoManager* pUndoMgr ); + void SetDrawTextUndo( SfxUndoManager* pUndoMgr ); - void FillFieldData( ScHeaderFieldData& rData ); + void FillFieldData( ScHeaderFieldData& rData ); - void SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ); - BOOL GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const; + void SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ); + BOOL GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const; - void SetEditChartName(const String& aStr){aEditChartName=aStr;} + void SetEditChartName(const String& aStr){aEditChartName=aStr;} virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); ScNavigatorSettings* GetNavigatorSettings(); // Drucken: - virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - virtual USHORT SetPrinter( SfxPrinter* pNewPrinter, + virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); + virtual USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false ); - virtual PrintDialog* CreatePrintDialog( Window* pParent ); + virtual PrintDialog* CreatePrintDialog( Window* pParent ); virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); - virtual void PreparePrint( PrintDialog* pPrintDialog = NULL ); - virtual ErrCode DoPrint( SfxPrinter *pPrinter, + virtual void PreparePrint( PrintDialog* pPrintDialog = NULL ); + virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); virtual USHORT Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog = NULL ); - void ConnectObject( SdrOle2Obj* pObj ); - BOOL ActivateObject( SdrOle2Obj* pObj, long nVerb ); + void ConnectObject( SdrOle2Obj* pObj ); + BOOL ActivateObject( SdrOle2Obj* pObj, long nVerb ); void DeactivateOle(); SC_DLLPUBLIC static ScTabViewShell* GetActiveViewShell(); - SfxModelessDialog* CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, + SfxModelessDialog* CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo, Window* pParent, USHORT nSlotId ); - void UpdateOleZoom(); + void UpdateOleZoom(); inline SbxObject* GetScSbxObject() const { return pScSbxObject; } - inline void SetScSbxObject( SbxObject* pOb ) + inline void SetScSbxObject( SbxObject* pOb ) { pScSbxObject = pOb; } - FmFormShell* GetFormShell() const { return pFormShell; } + FmFormShell* GetFormShell() const { return pFormShell; } - void InsertURL( const String& rName, const String& rURL, const String& rTarget, + void InsertURL( const String& rName, const String& rURL, const String& rTarget, USHORT nMode ); - void InsertURLButton( const String& rName, const String& rURL, const String& rTarget, + void InsertURLButton( const String& rName, const String& rURL, const String& rTarget, const Point* pInsPos = NULL ); - void InsertURLField( const String& rName, const String& rURL, const String& rTarget ); + void InsertURLField( const String& rName, const String& rURL, const String& rTarget ); - BOOL SelectObject( const String& rName ); + BOOL SelectObject( const String& rName ); - void SetInFormatDialog(BOOL bFlag) {bInFormatDialog=bFlag;} + void SetInFormatDialog(BOOL bFlag) {bInFormatDialog=bFlag;} BOOL IsInFormatDialog() {return bInFormatDialog;} - void ForceMove() { Move(); } + void ForceMove() { Move(); } - void MakeNumberInfoItem ( ScDocument* pDoc, - ScViewData* pViewData, - SvxNumberInfoItem** ppItem ); + void MakeNumberInfoItem ( ScDocument* pDoc, + ScViewData* pViewData, + SvxNumberInfoItem** ppItem ); - void UpdateNumberFormatter ( ScDocument* pDoc, - const SvxNumberInfoItem& rInfoItem ); + void UpdateNumberFormatter ( ScDocument* pDoc, + const SvxNumberInfoItem& rInfoItem ); - void ExecuteCellFormatDlg ( SfxRequest& rReq, USHORT nTabPage = 0xffff ); + void ExecuteCellFormatDlg ( SfxRequest& rReq, USHORT nTabPage = 0xffff ); - BOOL GetFunction( String& rFuncStr, sal_uInt16 nErrCode = 0 ); + BOOL GetFunction( String& rFuncStr, sal_uInt16 nErrCode = 0 ); - void StartSimpleRefDialog( const String& rTitle, const String& rInitVal, + void StartSimpleRefDialog( const String& rTitle, const String& rInitVal, BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection ); - void StopSimpleRefDialog(); + void StopSimpleRefDialog(); - void SetCurRefDlgId( USHORT nNew ); + void SetCurRefDlgId( USHORT nNew ); - void AddAccessibilityObject( SfxListener& rObject ); - void RemoveAccessibilityObject( SfxListener& rObject ); - void BroadcastAccessibility( const SfxHint &rHint ); - BOOL HasAccessibilityObjects(); + void AddAccessibilityObject( SfxListener& rObject ); + void RemoveAccessibilityObject( SfxListener& rObject ); + void BroadcastAccessibility( const SfxHint &rHint ); + BOOL HasAccessibilityObjects(); bool ExecuteRetypePassDlg(ScPasswordHash eDesiredHash); diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx index f01793b80206..0c0fa423a4e9 100644 --- a/sc/source/ui/inc/target.hxx +++ b/sc/source/ui/inc/target.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 @@ -36,15 +36,15 @@ class ScTabViewShell; class ScTabViewTarget : public SfxRepeatTarget { private: - ScTabViewShell* pViewShell; + ScTabViewShell* pViewShell; public: TYPEINFO(); ScTabViewTarget( ScTabViewShell* pShell ) : pViewShell( pShell ) {} - virtual ~ScTabViewTarget(); + virtual ~ScTabViewTarget(); - ScTabViewShell* GetViewShell() const { return pViewShell; } + ScTabViewShell* GetViewShell() const { return pViewShell; } }; diff --git a/sc/source/ui/inc/tbinsert.hrc b/sc/source/ui/inc/tbinsert.hrc index 44c0d295cfc6..b80e6fb5863b 100644 --- a/sc/source/ui/inc/tbinsert.hrc +++ b/sc/source/ui/inc/tbinsert.hrc @@ -1,7 +1,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 @@ -25,8 +25,8 @@ * ************************************************************************/ -#define RID_TOOLBOX_INSERT 1 -#define RID_TOOLBOX_INSCELLS 2 -#define RID_TOOLBOX_INSOBJ 3 +#define RID_TOOLBOX_INSERT 1 +#define RID_TOOLBOX_INSCELLS 2 +#define RID_TOOLBOX_INSOBJ 3 diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx index 605710063872..0a0ec8296719 100644 --- a/sc/source/ui/inc/tbinsert.hxx +++ b/sc/source/ui/inc/tbinsert.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 @@ -37,10 +37,10 @@ class ScTbxInsertCtrl : public SfxToolBoxControl { - USHORT nLastSlotId; + USHORT nLastSlotId; using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( BOOL bMod1 = FALSE ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -48,9 +48,9 @@ public: ScTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); ~ScTbxInsertCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -61,17 +61,17 @@ public: /* class ScTbxInsertPopup : public SfxPopupWindow { - SfxToolBoxManager aTbx; - ResId aRIdWinTemp; - ResId aRIdTbxTemp; + SfxToolBoxManager aTbx; + ResId aRIdWinTemp; + ResId aRIdTbxTemp; - Link aTbxClickHdl; + Link aTbxClickHdl; DECL_LINK( TbxSelectHdl, ToolBox* ); DECL_LINK( TbxClickHdl, ToolBox* ); protected: - virtual void PopupModeEnd(); + virtual void PopupModeEnd(); public: ScTbxInsertPopup( USHORT nId, WindowAlign eAlign, diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 32581f1dc792..af7572b997f4 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.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 @@ -65,7 +65,7 @@ private: void DoPaint( const Rectangle& rRect ); public: - ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, + ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , USHORT nCurrentZoom ); ~ScZoomSliderWnd(); void UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ); diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index 24b68650ce16..79e93fa67261 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.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 @@ -34,16 +34,16 @@ class SfxObjectShell; // -// Zeichen-Tab-Dialog +// Zeichen-Tab-Dialog // class ScCharDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; - const SfxObjectShell& rDocShell; + const SfxItemSet& rOutAttrs; + const SfxObjectShell& rDocShell; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: ScCharDlg( Window* pParent, const SfxItemSet* pAttr, @@ -52,15 +52,15 @@ public: }; // -// Absatz-Tab-Dialog +// Absatz-Tab-Dialog // class ScParagraphDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); diff --git a/sc/source/ui/inc/textimportoptions.hrc b/sc/source/ui/inc/textimportoptions.hrc index 93c554ef5c45..eb981c1c4dc7 100644 --- a/sc/source/ui/inc/textimportoptions.hrc +++ b/sc/source/ui/inc/textimportoptions.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index c36c8fa5096d..84091358b531 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 12e12c8750b8..796b6fba3913 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.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 @@ -44,51 +44,51 @@ class ScDocOptions; class ScTpCalcOptions : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rCoreSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); private: - ScTpCalcOptions( Window* pParent, - const SfxItemSet& rCoreSet ); + ScTpCalcOptions( Window* pParent, + const SfxItemSet& rCoreSet ); ~ScTpCalcOptions(); private: FixedLine aGbZRefs; CheckBox aBtnIterate; - FixedText aFtSteps; - NumericField aEdSteps; - FixedText aFtEps; + FixedText aFtSteps; + NumericField aEdSteps; + FixedText aFtEps; ScDoubleField aEdEps; FixedLine aSeparatorFL; FixedLine aGbDate; RadioButton aBtnDateStd; - RadioButton aBtnDateSc10; - RadioButton aBtnDate1904; + RadioButton aBtnDateSc10; + RadioButton aBtnDate1904; FixedLine aHSeparatorFL; CheckBox aBtnCase; - CheckBox aBtnCalc; - CheckBox aBtnMatch; + CheckBox aBtnCalc; + CheckBox aBtnMatch; CheckBox aBtnRegex; - CheckBox aBtnLookUp; - CheckBox aBtnGeneralPrec; + CheckBox aBtnLookUp; + CheckBox aBtnGeneralPrec; - FixedText aFtPrec; - NumericField aEdPrec; + FixedText aFtPrec; + NumericField aEdPrec; - ScDocOptions* pOldOptions; - ScDocOptions* pLocalOptions; - USHORT nWhichCalc; + ScDocOptions* pOldOptions; + ScDocOptions* pLocalOptions; + USHORT nWhichCalc; #ifdef _TPCALC_CXX private: - void Init(); + void Init(); //------------------------------------ // Handler: diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 5b7576320b13..7b1c5419572b 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.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 @@ -39,13 +39,13 @@ class ScStyleDlg; class ScHFPage : public SvxHFPage { public: - virtual ~ScHFPage(); + virtual ~ScHFPage(); - virtual void Reset( const SfxItemSet& rSet ); - virtual BOOL FillItemSet( SfxItemSet& rOutSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rOutSet ); - void SetPageStyle( const String& rName ) { aStrPageStyle = rName; } - void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } + void SetPageStyle( const String& rName ) { aStrPageStyle = rName; } + void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } protected: ScHFPage( Window* pParent, @@ -57,15 +57,15 @@ protected: // using SvxHFPage::DeactivatePage; virtual void ActivatePage(); virtual void DeactivatePage(); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& rSet ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); private: - PushButton aBtnEdit; - SfxItemSet aDataSet; - String aStrPageStyle; - USHORT nPageUsage; - const ScStyleDlg* pStyleDlg; + PushButton aBtnEdit; + SfxItemSet aDataSet; + String aStrPageStyle; + USHORT nPageUsage; + const ScStyleDlg* pStyleDlg; #ifdef _TPHF_CXX private: @@ -80,8 +80,8 @@ private: class ScHeaderPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); private: ScHeaderPage( Window* pParent, const SfxItemSet& rSet ); @@ -92,8 +92,8 @@ private: class ScFooterPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); private: ScFooterPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index c9dfa06cc3b6..00154cfa89f0 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.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 @@ -68,32 +68,32 @@ public: ~ScEditWindow(); using Control::SetFont; - void SetFont( const ScPatternAttr& rPattern ); + void SetFont( const ScPatternAttr& rPattern ); using Control::SetText; - void SetText( const EditTextObject& rTextObject ); - EditTextObject* CreateTextObject(); - void SetCharAttriutes(); + void SetText( const EditTextObject& rTextObject ); + EditTextObject* CreateTextObject(); + void SetCharAttriutes(); - void InsertField( const SvxFieldItem& rFld ); + void InsertField( const SvxFieldItem& rFld ); - void SetNumType(SvxNumType eNumType); + void SetNumType(SvxNumType eNumType); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); inline ScHeaderEditEngine* GetEditEngine() const {return pEdEngine;} protected: - virtual void Paint( const Rectangle& rRec ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void GetFocus(); + virtual void Paint( const Rectangle& rRec ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void GetFocus(); virtual void LoseFocus(); private: - ScHeaderEditEngine* pEdEngine; - EditView* pEdView; + ScHeaderEditEngine* pEdEngine; + EditView* pEdView; ScEditWindowLocation eLocation; bool mbRTL; @@ -106,33 +106,33 @@ class SC_DLLPUBLIC ScExtIButton : public ImageButton { private: - Timer aTimer; - ScPopupMenu* pPopupMenu; - Link aMLink; - USHORT nSelected; + Timer aTimer; + ScPopupMenu* pPopupMenu; + Link aMLink; + USHORT nSelected; SC_DLLPRIVATE DECL_LINK( TimerHdl, Timer*); protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt); - virtual void Click(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt); + virtual void Click(); - virtual void StartPopup(); + virtual void StartPopup(); public: ScExtIButton(Window* pParent, const ResId& rResId ); - void SetPopupMenu(ScPopupMenu* pPopUp); + void SetPopupMenu(ScPopupMenu* pPopUp); - USHORT GetSelected(); + USHORT GetSelected(); void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } const Link& GetMenuHdl() const { return aMLink; } - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); }; #endif // SC_TPHFEDIT_HXX diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index bbd2f471c1e9..2e60d9018be9 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.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 @@ -36,21 +36,21 @@ class ScTpPrintOptions : public SfxTabPage { - FixedLine aPagesFL; - CheckBox aSkipEmptyPagesCB; - FixedLine aSheetsFL; - CheckBox aSelectedSheetsCB; + FixedLine aPagesFL; + CheckBox aSkipEmptyPagesCB; + FixedLine aSheetsFL; + CheckBox aSelectedSheetsCB; ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreSet ); ~ScTpPrintOptions(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rCoreSet ); - virtual void Reset( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); + virtual BOOL FillItemSet( SfxItemSet& rCoreSet ); + virtual void Reset( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pSet = NULL ); }; #endif diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index f34d1236210a..fff158322a13 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.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 @@ -44,7 +44,7 @@ //------------------------------------------------------------------------ // +1 because one field is reserved for the "- undefined -" entry -#define SC_MAXFIELDS MAXCOLCOUNT+1 +#define SC_MAXFIELDS MAXCOLCOUNT+1 class ScViewData; class ScSortDlg; @@ -56,66 +56,66 @@ struct ScSortParam; class ScTabPageSortFields : public SfxTabPage { public: - ScTabPageSortFields( Window* pParent, - const SfxItemSet& rArgSet ); + ScTabPageSortFields( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTabPageSortFields(); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); protected: // fuer Datenaustausch (sollte noch umgestellt werden!) -// virtual void ActivatePage ( const SfxItemSet& rSet ); +// virtual void ActivatePage ( const SfxItemSet& rSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage (); - virtual int DeactivatePage ( SfxItemSet* pSet = 0); + virtual void ActivatePage (); + virtual int DeactivatePage ( SfxItemSet* pSet = 0); private: FixedLine aFlSort1; - ListBox aLbSort1; - RadioButton aBtnUp1; - RadioButton aBtnDown1; + ListBox aLbSort1; + RadioButton aBtnUp1; + RadioButton aBtnDown1; FixedLine aFlSort2; - ListBox aLbSort2; - RadioButton aBtnUp2; - RadioButton aBtnDown2; + ListBox aLbSort2; + RadioButton aBtnUp2; + RadioButton aBtnDown2; FixedLine aFlSort3; - ListBox aLbSort3; - RadioButton aBtnUp3; - RadioButton aBtnDown3; - - String aStrUndefined; - String aStrColumn; - String aStrRow; - - const USHORT nWhichSort; - ScSortDlg* pDlg; - ScViewData* pViewData; - const ScSortParam& rSortData; - SCCOLROW nFieldArr[SC_MAXFIELDS]; - USHORT nFieldCount; - SCCOL nFirstCol; - SCROW nFirstRow; - BOOL bHasHeader; - BOOL bSortByRows; - - ListBox* aSortLbArr[3]; - RadioButton* aDirBtnArr[3][2]; + ListBox aLbSort3; + RadioButton aBtnUp3; + RadioButton aBtnDown3; + + String aStrUndefined; + String aStrColumn; + String aStrRow; + + const USHORT nWhichSort; + ScSortDlg* pDlg; + ScViewData* pViewData; + const ScSortParam& rSortData; + SCCOLROW nFieldArr[SC_MAXFIELDS]; + USHORT nFieldCount; + SCCOL nFirstCol; + SCROW nFirstRow; + BOOL bHasHeader; + BOOL bSortByRows; + + ListBox* aSortLbArr[3]; + RadioButton* aDirBtnArr[3][2]; FixedLine* aFlArr[3]; #ifdef _TPSORT_CXX private: - void Init (); - void DisableField ( USHORT nField ); - void EnableField ( USHORT nField ); - void FillFieldLists (); - USHORT GetFieldSelPos ( SCCOLROW nField ); + void Init (); + void DisableField ( USHORT nField ); + void EnableField ( USHORT nField ); + void FillFieldLists (); + USHORT GetFieldSelPos ( SCCOLROW nField ); // Handler ------------------------ DECL_LINK( SelectHdl, ListBox * ); @@ -140,32 +140,32 @@ class CollatorWrapper; class ScTabPageSortOptions : public SfxTabPage { public: - ScTabPageSortOptions( Window* pParent, - const SfxItemSet& rArgSet ); + ScTabPageSortOptions( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTabPageSortOptions(); #undef SfxTabPage #define SfxTabPage ::SfxTabPage - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); protected: // fuer Datenaustausch (sollte noch umgestellt werden!) -// virtual void ActivatePage ( const SfxItemSet& rSet ); +// virtual void ActivatePage ( const SfxItemSet& rSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage (); - virtual int DeactivatePage ( SfxItemSet* pSet = 0); + virtual void ActivatePage (); + virtual int DeactivatePage ( SfxItemSet* pSet = 0); private: CheckBox aBtnCase; CheckBox aBtnHeader; CheckBox aBtnFormats; - CheckBox aBtnNaturalSort; + CheckBox aBtnNaturalSort; CheckBox aBtnCopyResult; ListBox aLbOutPos; @@ -191,26 +191,26 @@ private: String aStrNoName; String aStrAreaLabel; - const USHORT nWhichSort; - const ScSortParam& rSortData; - ScViewData* pViewData; - ScDocument* pDoc; - ScSortDlg* pDlg; - ScAddress theOutPos; + const USHORT nWhichSort; + const ScSortParam& rSortData; + ScViewData* pViewData; + ScDocument* pDoc; + ScSortDlg* pDlg; + ScAddress theOutPos; - CollatorRessource* pColRes; - CollatorWrapper* pColWrap; + CollatorRessource* pColRes; + CollatorWrapper* pColWrap; #ifdef _TPSORT_CXX private: - void Init (); - void FillUserSortListBox (); - void FillOutPosList (); + void Init (); + void FillUserSortListBox (); + void FillOutPosList (); // Handler ------------------------ DECL_LINK( EnableHdl, CheckBox * ); DECL_LINK( SelOutPosHdl, ListBox * ); - void EdOutPosModHdl ( Edit* pEd ); + void EdOutPosModHdl ( Edit* pEd ); DECL_LINK( SortDirHdl, RadioButton * ); DECL_LINK( FillAlgorHdl, void * ); #endif diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 4016e682176b..10fa3998b8e9 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.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/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 1a2bd22c4a5b..99efeb57b694 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.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 @@ -37,7 +37,7 @@ //------------------------------------------------------------------------ // +1 because one field is reserved for the "- none -" entry -#define SC_MAXFIELDS MAXCOLCOUNT+1 +#define SC_MAXFIELDS MAXCOLCOUNT+1 class ScViewData; class ScDocument; @@ -54,35 +54,35 @@ protected: public: virtual ~ScTpSubTotalGroup(); - static USHORT* GetRanges (); - BOOL DoReset ( USHORT nGroupNo, - const SfxItemSet& rArgSet ); - BOOL DoFillItemSet ( USHORT nGroupNo, - SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + BOOL DoReset ( USHORT nGroupNo, + const SfxItemSet& rArgSet ); + BOOL DoFillItemSet ( USHORT nGroupNo, + SfxItemSet& rArgSet ); protected: - FixedText aFtGroup; - ListBox aLbGroup; - FixedText aFtColumns; - SvxCheckListBox aLbColumns; - FixedText aFtFunctions; - ListBox aLbFunctions; - const String aStrNone; - const String aStrColumn; - - ScViewData* pViewData; - ScDocument* pDoc; - - const USHORT nWhichSubTotals; - const ScSubTotalParam& rSubTotalData; - SCCOL nFieldArr[SC_MAXFIELDS]; - const USHORT nFieldCount; + FixedText aFtGroup; + ListBox aLbGroup; + FixedText aFtColumns; + SvxCheckListBox aLbColumns; + FixedText aFtFunctions; + ListBox aLbFunctions; + const String aStrNone; + const String aStrColumn; + + ScViewData* pViewData; + ScDocument* pDoc; + + const USHORT nWhichSubTotals; + const ScSubTotalParam& rSubTotalData; + SCCOL nFieldArr[SC_MAXFIELDS]; + const USHORT nFieldCount; private: - void Init (); - void FillListBoxes (); - ScSubTotalFunc LbPosToFunc ( USHORT nPos ); - USHORT FuncToLbPos ( ScSubTotalFunc eFunc ); - USHORT GetFieldSelPos ( SCCOL nField ); + void Init (); + void FillListBoxes (); + ScSubTotalFunc LbPosToFunc ( USHORT nPos ); + USHORT FuncToLbPos ( ScSubTotalFunc eFunc ); + USHORT GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ DECL_LINK( SelectHdl, ListBox * ); @@ -94,16 +94,16 @@ private: class ScTpSubTotalGroup1 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup1( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup1( Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup1(); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //------------------------------------------------------------------------ @@ -111,16 +111,16 @@ public: class ScTpSubTotalGroup2 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup2( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup2( Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup2(); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //------------------------------------------------------------------------ @@ -128,16 +128,16 @@ public: class ScTpSubTotalGroup3 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup3( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup3( Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup3(); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //======================================================================== @@ -146,38 +146,38 @@ public: class ScTpSubTotalOptions : public SfxTabPage { protected: - ScTpSubTotalOptions( Window* pParent, + ScTpSubTotalOptions( Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalOptions(); - static USHORT* GetRanges (); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); private: FixedLine aFlGroup; - CheckBox aBtnPagebreak; - CheckBox aBtnCase; - CheckBox aBtnSort; + CheckBox aBtnPagebreak; + CheckBox aBtnCase; + CheckBox aBtnSort; FixedLine aFlSort; - RadioButton aBtnAscending; - RadioButton aBtnDescending; - CheckBox aBtnFormats; - CheckBox aBtnUserDef; - ListBox aLbUserDef; + RadioButton aBtnAscending; + RadioButton aBtnDescending; + CheckBox aBtnFormats; + CheckBox aBtnUserDef; + ListBox aLbUserDef; - ScViewData* pViewData; - ScDocument* pDoc; - const USHORT nWhichSubTotals; - const ScSubTotalParam& rSubTotalData; + ScViewData* pViewData; + ScDocument* pDoc; + const USHORT nWhichSubTotals; + const ScSubTotalParam& rSubTotalData; private: - void Init (); - void FillUserSortListBox (); + void Init (); + void FillUserSortListBox (); // Handler ------------------------ DECL_LINK( CheckHdl, CheckBox * ); diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 007fb3f795c1..d891050ddf34 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.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 @@ -56,13 +56,13 @@ public: class ScTablePage : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rCoreSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); virtual void DataChanged ( const DataChangedEvent& rDCEvt ); private: @@ -73,25 +73,25 @@ private: private: FixedLine aFlPageDir; - RadioButton aBtnTopDown; - RadioButton aBtnLeftRight; + RadioButton aBtnTopDown; + RadioButton aBtnLeftRight; FixedImage aBmpPageDir; Image aImgLeftRight; Image aImgTopDown; Image aImgLeftRightHC; Image aImgTopDownHC; - CheckBox aBtnPageNo; - NumericField aEdPageNo; + CheckBox aBtnPageNo; + NumericField aEdPageNo; FixedLine aFlPrint; - CheckBox aBtnHeaders; - CheckBox aBtnGrid; - CheckBox aBtnNotes; - CheckBox aBtnObjects; - CheckBox aBtnCharts; - CheckBox aBtnDrawings; - CheckBox aBtnFormulas; - CheckBox aBtnNullVals; + CheckBox aBtnHeaders; + CheckBox aBtnGrid; + CheckBox aBtnNotes; + CheckBox aBtnObjects; + CheckBox aBtnCharts; + CheckBox aBtnDrawings; + CheckBox aBtnFormulas; + CheckBox aBtnNullVals; FixedLine aFlScale; FixedText aFtScaleMode; diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 2e277a14af8d..998b88706ec3 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.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 @@ -45,70 +45,70 @@ class ScRangeUtil; class ScTpUserLists : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rAttrSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs ); - virtual void Reset ( const SfxItemSet& rCoreAttrs ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rAttrSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs ); + virtual void Reset ( const SfxItemSet& rCoreAttrs ); using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); private: - ScTpUserLists( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpUserLists( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTpUserLists(); private: - FixedText aFtLists; - ListBox aLbLists; - FixedText aFtEntries; - MultiLineEdit aEdEntries; - FixedText aFtCopyFrom; - Edit aEdCopyFrom; - PushButton aBtnNew; - PushButton aBtnAdd; - PushButton aBtnRemove; - PushButton aBtnCopy; - - const String aStrQueryRemove; - const String aStrNew; - const String aStrCancel; - const String aStrAdd; - const String aStrModify; - const String aStrCopyList; - const String aStrCopyFrom; - const String aStrCopyErr; - - const USHORT nWhichUserLists; - ScUserList* pUserLists; - - ScDocument* pDoc; - ScViewData* pViewData; - ScRangeUtil* pRangeUtil; - String aStrSelectedArea; - - BOOL bModifyMode; - BOOL bCancelMode; - BOOL bCopyDone; - USHORT nCancelPos; + FixedText aFtLists; + ListBox aLbLists; + FixedText aFtEntries; + MultiLineEdit aEdEntries; + FixedText aFtCopyFrom; + Edit aEdCopyFrom; + PushButton aBtnNew; + PushButton aBtnAdd; + PushButton aBtnRemove; + PushButton aBtnCopy; + + const String aStrQueryRemove; + const String aStrNew; + const String aStrCancel; + const String aStrAdd; + const String aStrModify; + const String aStrCopyList; + const String aStrCopyFrom; + const String aStrCopyErr; + + const USHORT nWhichUserLists; + ScUserList* pUserLists; + + ScDocument* pDoc; + ScViewData* pViewData; + ScRangeUtil* pRangeUtil; + String aStrSelectedArea; + + BOOL bModifyMode; + BOOL bCancelMode; + BOOL bCopyDone; + USHORT nCancelPos; #ifdef _TPUSRLST_CXX private: - void Init (); - USHORT UpdateUserListBox (); - void UpdateEntries ( USHORT nList ); - void MakeListStr ( String& rListStr ); - void AddNewList ( const String& rEntriesStr ); - void RemoveList ( USHORT nList ); - void ModifyList ( USHORT nSelList, + void Init (); + USHORT UpdateUserListBox (); + void UpdateEntries ( USHORT nList ); + void MakeListStr ( String& rListStr ); + void AddNewList ( const String& rEntriesStr ); + void RemoveList ( USHORT nList ); + void ModifyList ( USHORT nSelList, const String& rEntriesStr ); - void CopyListFromArea ( const ScRefAddress& rStartPos, + void CopyListFromArea ( const ScRefAddress& rStartPos, const ScRefAddress& rEndPos ); // Handler: - DECL_LINK( LbSelectHdl, ListBox* ); - DECL_LINK( BtnClickHdl, PushButton* ); - DECL_LINK( EdEntriesModHdl, MultiLineEdit* ); + DECL_LINK( LbSelectHdl, ListBox* ); + DECL_LINK( BtnClickHdl, PushButton* ); + DECL_LINK( EdEntriesModHdl, MultiLineEdit* ); #endif }; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 43a75433adda..b56989eff4a9 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.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 @@ -47,13 +47,13 @@ class ScViewOptions; class ScTpContentOptions : public SfxTabPage { FixedLine aLinesGB; - CheckBox aGridCB; - FixedText aColorFT; - ColorListBox aColorLB; - CheckBox aBreakCB; - CheckBox aGuideLineCB; - CheckBox aHandleCB; - CheckBox aBigHandleCB; + CheckBox aGridCB; + FixedText aColorFT; + ColorListBox aColorLB; + CheckBox aBreakCB; + CheckBox aGuideLineCB; + CheckBox aHandleCB; + CheckBox aBigHandleCB; FixedLine aSeparator1FL; @@ -80,11 +80,11 @@ class ScTpContentOptions : public SfxTabPage FixedLine aSeparator2FL; FixedLine aWindowGB; - CheckBox aRowColHeaderCB; - CheckBox aHScrollCB; - CheckBox aVScrollCB; - CheckBox aTblRegCB; - CheckBox aOutlineCB; + CheckBox aRowColHeaderCB; + CheckBox aHScrollCB; + CheckBox aVScrollCB; + CheckBox aTblRegCB; + CheckBox aOutlineCB; ScViewOptions* pLocalOptions; @@ -93,19 +93,19 @@ class ScTpContentOptions : public SfxTabPage DECL_LINK( SelLbObjHdl, ListBox* ); DECL_LINK( CBHdl, CheckBox* ); - ScTpContentOptions( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpContentOptions( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTpContentOptions(); public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rCoreSet ); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; @@ -129,16 +129,16 @@ class ScTpLayoutOptions : public SfxTabPage RadioButton aNeverRB; FixedLine aOptionsGB; - CheckBox aAlignCB; - ListBox aAlignLB; - CheckBox aEditModeCB; - CheckBox aFormatCB; + CheckBox aAlignCB; + ListBox aAlignLB; + CheckBox aEditModeCB; + CheckBox aFormatCB; CheckBox aExpRefCB; - CheckBox aMarkHdrCB; - CheckBox aTextFmtCB; + CheckBox aMarkHdrCB; + CheckBox aTextFmtCB; CheckBox aReplWarnCB; - SvxStringArray aUnitArr; + SvxStringArray aUnitArr; DECL_LINK( CBHdl, CheckBox* ); @@ -147,21 +147,21 @@ class ScTpLayoutOptions : public SfxTabPage ScDocument *pDoc; - DECL_LINK( UpdateHdl, CheckBox* ); + DECL_LINK( UpdateHdl, CheckBox* ); - ScTpLayoutOptions( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpLayoutOptions( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTpLayoutOptions(); public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rCoreSet ); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); void SetDocument(ScDocument* pPtr){pDoc = pPtr;} diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 04a2eac1df29..4e0f9c96a82b 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.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 @@ -48,26 +48,26 @@ namespace com { namespace sun { namespace star { class ScTransferObj : public TransferableHelper { private: - ScDocument* pDoc; - ScRange aBlock; - SCROW nNonFiltered; // non-filtered rows - TransferableDataHelper aOleData; - TransferableObjectDescriptor aObjDesc; -//REMOVE SvEmbeddedObjectRef aDocShellRef; -//REMOVE SvEmbeddedObjectRef aDrawPersistRef; - SfxObjectShellRef aDocShellRef; - SfxObjectShellRef aDrawPersistRef; + ScDocument* pDoc; + ScRange aBlock; + SCROW nNonFiltered; // non-filtered rows + TransferableDataHelper aOleData; + TransferableObjectDescriptor aObjDesc; +//REMOVE SvEmbeddedObjectRef aDocShellRef; +//REMOVE SvEmbeddedObjectRef aDrawPersistRef; + SfxObjectShellRef aDocShellRef; + SfxObjectShellRef aDrawPersistRef; com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> xDragSourceRanges; - SCCOL nDragHandleX; - SCROW nDragHandleY; - SCTAB nVisibleTab; - USHORT nDragSourceFlags; - BOOL bDragWasInternal; - BOOL bUsedForLink; + SCCOL nDragHandleX; + SCROW nDragHandleY; + SCTAB nVisibleTab; + USHORT nDragSourceFlags; + BOOL bDragWasInternal; + BOOL bUsedForLink; bool bHasFiltered; // if has filtered rows - void InitDocShell(); - static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY, + void InitDocShell(); + static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, ScDocument* pDestDoc=0, SCCOL nSubX=0, SCROW nSubY=0 ); @@ -79,35 +79,35 @@ public: ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc ); virtual ~ScTransferObj(); - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); + virtual void DragFinished( sal_Int8 nDropAction ); - ScDocument* GetDocument() { return pDoc; } // owned by ScTransferObj - const ScRange& GetRange() const { return aBlock; } - SCROW GetNonFilteredRows() const { return nNonFiltered; } - SCCOL GetDragHandleX() const { return nDragHandleX; } - SCROW GetDragHandleY() const { return nDragHandleY; } - SCTAB GetVisibleTab() const { return nVisibleTab; } - USHORT GetDragSourceFlags() const { return nDragSourceFlags; } + ScDocument* GetDocument() { return pDoc; } // owned by ScTransferObj + const ScRange& GetRange() const { return aBlock; } + SCROW GetNonFilteredRows() const { return nNonFiltered; } + SCCOL GetDragHandleX() const { return nDragHandleX; } + SCROW GetDragHandleY() const { return nDragHandleY; } + SCTAB GetVisibleTab() const { return nVisibleTab; } + USHORT GetDragSourceFlags() const { return nDragSourceFlags; } bool HasFilteredRows() const { return bHasFiltered; } - ScDocShell* GetSourceDocShell(); - ScDocument* GetSourceDocument(); - ScMarkData GetSourceMarkData(); + ScDocShell* GetSourceDocShell(); + ScDocument* GetSourceDocument(); + ScMarkData GetSourceMarkData(); - void SetDrawPersist( const SfxObjectShellRef& rRef ); - void SetDragHandlePos( SCCOL nX, SCROW nY ); - void SetVisibleTab( SCTAB nNew ); - void SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark ); - void SetDragSourceFlags( USHORT nFlags ); - void SetDragWasInternal(); + void SetDrawPersist( const SfxObjectShellRef& rRef ); + void SetDragHandlePos( SCCOL nX, SCROW nY ); + void SetVisibleTab( SCTAB nNew ); + void SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark ); + void SetDragSourceFlags( USHORT nFlags ); + void SetDragWasInternal(); static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( Window* pUIWin ); - static SfxObjectShell* SetDrawClipDoc( BOOL bAnyOle ); // update ScGlobal::pDrawClipDocShellRef + static SfxObjectShell* SetDrawClipDoc( BOOL bAnyOle ); // update ScGlobal::pDrawClipDocShellRef virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException ); static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); }; diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx index 2e5f418ea5bd..c2d363f49917 100644 --- a/sc/source/ui/inc/ui_pch.hxx +++ b/sc/source/ui/inc/ui_pch.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 @@ -26,7 +26,7 @@ * ************************************************************************/ -// ItemID-Defines etc. muessen immer ganz vorne stehen +// ItemID-Defines etc. muessen immer ganz vorne stehen #include "scitems.hxx" diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 4c6ae0914780..a06398ce54a8 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.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 @@ -51,7 +51,7 @@ class ScInputStatusItem : public SfxPoolItem ScAddress aStartPos; ScAddress aEndPos; String aString; - EditTextObject* pEditData; + EditTextObject* pEditData; public: TYPEINFO(); @@ -70,27 +70,27 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScAddress& GetPos() const { return aCursorPos; } + const ScAddress& GetPos() const { return aCursorPos; } const ScAddress& GetStartPos() const { return aStartPos; } - const ScAddress& GetEndPos() const { return aEndPos; } + const ScAddress& GetEndPos() const { return aEndPos; } SCTAB GetTab() const { return aCursorPos.Tab(); } SCCOL GetCol() const { return aCursorPos.Col(); } SCROW GetRow() const { return aCursorPos.Row(); } SCCOL GetStartCol() const { return aStartPos.Col(); } SCROW GetStartRow() const { return aStartPos.Row(); } - SCCOL GetEndCol() const { return aEndPos.Col(); } - SCROW GetEndRow() const { return aEndPos.Row(); } + SCCOL GetEndCol() const { return aEndPos.Col(); } + SCROW GetEndRow() const { return aEndPos.Row(); } const String& GetString() const { return aString; } - const EditTextObject* GetEditData() const { return pEditData; } + const EditTextObject* GetEditData() const { return pEditData; } }; -#define SC_TAB_INSERTED 1 -#define SC_TAB_DELETED 2 -#define SC_TAB_MOVED 3 -#define SC_TAB_COPIED 4 -#define SC_TAB_HIDDEN 5 +#define SC_TAB_INSERTED 1 +#define SC_TAB_DELETED 2 +#define SC_TAB_MOVED 3 +#define SC_TAB_COPIED 4 +#define SC_TAB_HIDDEN 5 class ScTablesHint : public SfxHint { @@ -103,15 +103,15 @@ public: ScTablesHint(USHORT nNewId, SCTAB nTable1, SCTAB nTable2=0); ~ScTablesHint(); - USHORT GetId() const { return nId; } - SCTAB GetTab1() const { return nTab1; } - SCTAB GetTab2() const { return nTab2; } + USHORT GetId() const { return nId; } + SCTAB GetTab1() const { return nTab1; } + SCTAB GetTab2() const { return nTab2; } }; class ScEditViewHint : public SfxHint { - ScEditEngineDefaulter* pEditEngine; - ScAddress aCursorPos; + ScEditEngineDefaulter* pEditEngine; + ScAddress aCursorPos; public: TYPEINFO(); @@ -121,7 +121,7 @@ public: SCCOL GetCol() const { return aCursorPos.Col(); } SCROW GetRow() const { return aCursorPos.Row(); } SCTAB GetTab() const { return aCursorPos.Tab(); } - ScEditEngineDefaulter* GetEngine() const { return pEditEngine; } + ScEditEngineDefaulter* GetEngine() const { return pEditEngine; } private: ScEditViewHint(); // disabled @@ -137,8 +137,8 @@ public: ScIndexHint(USHORT nNewId, USHORT nIdx); ~ScIndexHint(); - USHORT GetId() const { return nId; } - USHORT GetIndex() const { return nIndex; } + USHORT GetId() const { return nId; } + USHORT GetIndex() const { return nIndex; } }; //---------------------------------------------------------------------------- @@ -148,11 +148,11 @@ class SC_DLLPUBLIC ScSortItem : public SfxPoolItem { public: TYPEINFO(); - ScSortItem( USHORT nWhich, - ScViewData* ptrViewData, - const ScSortParam* pSortData ); - ScSortItem( USHORT nWhich, - const ScSortParam* pSortData ); + ScSortItem( USHORT nWhich, + ScViewData* ptrViewData, + const ScSortParam* pSortData ); + ScSortItem( USHORT nWhich, + const ScSortParam* pSortData ); ScSortItem( const ScSortItem& rItem ); ~ScSortItem(); @@ -161,12 +161,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const; - ScViewData* GetViewData () const { return pViewData; } - const ScSortParam& GetSortData () const { return theSortData; } + ScViewData* GetViewData () const { return pViewData; } + const ScSortParam& GetSortData () const { return theSortData; } private: - ScViewData* pViewData; - ScSortParam theSortData; + ScViewData* pViewData; + ScSortParam theSortData; }; //---------------------------------------------------------------------------- @@ -176,11 +176,11 @@ class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem { public: TYPEINFO(); - ScQueryItem( USHORT nWhich, - ScViewData* ptrViewData, - const ScQueryParam* pQueryData ); - ScQueryItem( USHORT nWhich, - const ScQueryParam* pQueryData ); + ScQueryItem( USHORT nWhich, + ScViewData* ptrViewData, + const ScQueryParam* pQueryData ); + ScQueryItem( USHORT nWhich, + const ScQueryParam* pQueryData ); ScQueryItem( const ScQueryItem& rItem ); ~ScQueryItem(); @@ -188,17 +188,17 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - ScViewData* GetViewData () const { return pViewData; } - const ScQueryParam& GetQueryData() const { return theQueryData; } + ScViewData* GetViewData () const { return pViewData; } + const ScQueryParam& GetQueryData() const { return theQueryData; } - BOOL GetAdvancedQuerySource(ScRange& rSource) const; - void SetAdvancedQuerySource(const ScRange* pSource); + BOOL GetAdvancedQuerySource(ScRange& rSource) const; + void SetAdvancedQuerySource(const ScRange* pSource); private: - ScViewData* pViewData; - ScQueryParam theQueryData; - BOOL bIsAdvanced; - ScRange aAdvSource; + ScViewData* pViewData; + ScQueryParam theQueryData; + BOOL bIsAdvanced; + ScRange aAdvSource; }; //---------------------------------------------------------------------------- @@ -208,12 +208,12 @@ class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem { public: TYPEINFO(); - ScSubTotalItem( USHORT nWhich, - ScViewData* ptrViewData, - const ScSubTotalParam* pSubTotalData ); - ScSubTotalItem( USHORT nWhich, - const ScSubTotalParam* pSubTotalData ); - ScSubTotalItem( const ScSubTotalItem& rItem ); + ScSubTotalItem( USHORT nWhich, + ScViewData* ptrViewData, + const ScSubTotalParam* pSubTotalData ); + ScSubTotalItem( USHORT nWhich, + const ScSubTotalParam* pSubTotalData ); + ScSubTotalItem( const ScSubTotalItem& rItem ); ~ScSubTotalItem(); virtual String GetValueText() const; @@ -221,12 +221,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const; - ScViewData* GetViewData () const { return pViewData; } - const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } + ScViewData* GetViewData () const { return pViewData; } + const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } private: - ScViewData* pViewData; - ScSubTotalParam theSubTotalData; + ScViewData* pViewData; + ScSubTotalParam theSubTotalData; }; //---------------------------------------------------------------------------- @@ -244,11 +244,11 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - void SetUserList ( const ScUserList& rUserList ); - ScUserList* GetUserList () const { return pUserList; } + void SetUserList ( const ScUserList& rUserList ); + ScUserList* GetUserList () const { return pUserList; } private: - ScUserList* pUserList; + ScUserList* pUserList; }; //---------------------------------------------------------------------------- @@ -258,9 +258,9 @@ class ScConsolidateItem : public SfxPoolItem { public: TYPEINFO(); - ScConsolidateItem( USHORT nWhich, + ScConsolidateItem( USHORT nWhich, const ScConsolidateParam* pParam ); - ScConsolidateItem( const ScConsolidateItem& rItem ); + ScConsolidateItem( const ScConsolidateItem& rItem ); ~ScConsolidateItem(); virtual String GetValueText() const; @@ -270,7 +270,7 @@ public: const ScConsolidateParam& GetData() const { return theConsData; } private: - ScConsolidateParam theConsData; + ScConsolidateParam theConsData; }; //---------------------------------------------------------------------------- @@ -282,21 +282,21 @@ public: TYPEINFO(); ScPivotItem( USHORT nWhich, const ScDPSaveData* pData, const ScRange* pRange, BOOL bNew ); - ScPivotItem( const ScPivotItem& rItem ); + ScPivotItem( const ScPivotItem& rItem ); ~ScPivotItem(); virtual String GetValueText() const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScDPSaveData& GetData() const { return *pSaveData; } - const ScRange& GetDestRange() const { return aDestRange; } - BOOL IsNewSheet() const { return bNewSheet; } + const ScDPSaveData& GetData() const { return *pSaveData; } + const ScRange& GetDestRange() const { return aDestRange; } + BOOL IsNewSheet() const { return bNewSheet; } private: - ScDPSaveData* pSaveData; - ScRange aDestRange; - BOOL bNewSheet; + ScDPSaveData* pSaveData; + ScRange aDestRange; + BOOL bNewSheet; }; //---------------------------------------------------------------------------- @@ -306,9 +306,9 @@ class ScSolveItem : public SfxPoolItem { public: TYPEINFO(); - ScSolveItem( USHORT nWhich, + ScSolveItem( USHORT nWhich, const ScSolveParam* pParam ); - ScSolveItem( const ScSolveItem& rItem ); + ScSolveItem( const ScSolveItem& rItem ); ~ScSolveItem(); virtual String GetValueText() const; @@ -318,7 +318,7 @@ public: const ScSolveParam& GetData() const { return theSolveData; } private: - ScSolveParam theSolveData; + ScSolveParam theSolveData; }; //---------------------------------------------------------------------------- @@ -328,9 +328,9 @@ class ScTabOpItem : public SfxPoolItem { public: TYPEINFO(); - ScTabOpItem( USHORT nWhich, + ScTabOpItem( USHORT nWhich, const ScTabOpParam* pParam ); - ScTabOpItem( const ScTabOpItem& rItem ); + ScTabOpItem( const ScTabOpItem& rItem ); ~ScTabOpItem(); virtual String GetValueText() const; @@ -340,7 +340,7 @@ public: const ScTabOpParam& GetData() const { return theTabOpData; } private: - ScTabOpParam theTabOpData; + ScTabOpParam theTabOpData; }; //---------------------------------------------------------------------------- @@ -351,7 +351,7 @@ class ScCondFrmtItem : public SfxPoolItem public: TYPEINFO(); ScCondFrmtItem( USHORT nWhich, -//! const ScConditionalFormat* pCondFrmt ); +//! const ScConditionalFormat* pCondFrmt ); const ScConditionalFormat& rCondFrmt ); ScCondFrmtItem( const ScCondFrmtItem& rItem ); ~ScCondFrmtItem(); @@ -360,10 +360,10 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScConditionalFormat& GetData() const { return theCondFrmtData; } + const ScConditionalFormat& GetData() const { return theCondFrmtData; } private: - ScConditionalFormat theCondFrmtData; + ScConditionalFormat theCondFrmtData; }; diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 385f0892f5c3..d00f1fba00d1 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.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 @@ -46,21 +46,21 @@ class ScSimpleUndo: public SfxUndoAction public: TYPEINFO(); ScSimpleUndo( ScDocShell* pDocSh ); - virtual ~ScSimpleUndo(); + virtual ~ScSimpleUndo(); - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL Merge( SfxUndoAction *pNextAction ); protected: - ScDocShell* pDocShell; - SfxUndoAction* pDetectiveUndo; + ScDocShell* pDocShell; + SfxUndoAction* pDetectiveUndo; - void BeginUndo(); - void EndUndo(); - void BeginRedo(); - void EndRedo(); + void BeginUndo(); + void EndUndo(); + void BeginRedo(); + void EndRedo(); - static void ShowTable( SCTAB nTab ); - static void ShowTable( const ScRange& rRange ); + static void ShowTable( SCTAB nTab ); + static void ShowTable( const ScRange& rRange ); }; //---------------------------------------------------------------------------- @@ -73,20 +73,20 @@ public: TYPEINFO(); ScBlockUndo( ScDocShell* pDocSh, const ScRange& rRange, ScBlockUndoMode eBlockMode ); - virtual ~ScBlockUndo(); + virtual ~ScBlockUndo(); protected: - ScRange aBlockRange; - SdrUndoAction* pDrawUndo; - ScBlockUndoMode eMode; + ScRange aBlockRange; + SdrUndoAction* pDrawUndo; + ScBlockUndoMode eMode; - void BeginUndo(); - void EndUndo(); -// void BeginRedo(); - void EndRedo(); + void BeginUndo(); + void EndUndo(); +// void BeginRedo(); + void EndRedo(); - BOOL AdjustHeight(); - void ShowBlock(); + BOOL AdjustHeight(); + void ShowBlock(); }; //---------------------------------------------------------------------------- @@ -117,28 +117,28 @@ public: enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST }; -class ScMoveUndo: public ScSimpleUndo // mit Referenzen +class ScMoveUndo: public ScSimpleUndo // mit Referenzen { public: TYPEINFO(); ScMoveUndo( ScDocShell* pDocSh, ScDocument* pRefDoc, ScRefUndoData* pRefData, ScMoveUndoMode eRefMode ); - virtual ~ScMoveUndo(); + virtual ~ScMoveUndo(); protected: - SdrUndoAction* pDrawUndo; - ScDocument* pRefUndoDoc; - ScRefUndoData* pRefUndoData; - ScMoveUndoMode eMode; + SdrUndoAction* pDrawUndo; + ScDocument* pRefUndoDoc; + ScRefUndoData* pRefUndoData; + ScMoveUndoMode eMode; - void BeginUndo(); - void EndUndo(); -// void BeginRedo(); -// void EndRedo(); + void BeginUndo(); + void EndUndo(); +// void BeginRedo(); +// void EndRedo(); private: - void UndoRef(); + void UndoRef(); }; //---------------------------------------------------------------------------- diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index a6eb727a7554..b07fb0172b1e 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.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 @@ -61,29 +61,29 @@ public: const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData, BOOL bNewPartOfPaste ); - virtual ~ScUndoInsertCells(); + virtual ~ScUndoInsertCells(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat( SfxRepeatTarget& rTarget ); + virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual String GetComment() const; + virtual String GetComment() const; - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL Merge( SfxUndoAction *pNextAction ); private: - ScRange aEffRange; + ScRange aEffRange; SCTAB nCount; SCTAB* pTabs; SCTAB* pScenarios; - ULONG nEndChangeAction; - InsCellCmd eCmd; - BOOL bPartOfPaste; - SfxUndoAction* pPasteUndo; + ULONG nEndChangeAction; + InsCellCmd eCmd; + BOOL bPartOfPaste; + SfxUndoAction* pPasteUndo; - void DoChange ( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange ( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -92,28 +92,28 @@ class ScUndoDeleteCells: public ScMoveUndo public: TYPEINFO(); ScUndoDeleteCells( ScDocShell* pNewDocShell, - const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, + const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData ); - virtual ~ScUndoDeleteCells(); + virtual ~ScUndoDeleteCells(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aEffRange; + ScRange aEffRange; SCTAB nCount; SCTAB* pTabs; SCTAB* pScenarios; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - DelCellCmd eCmd; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + DelCellCmd eCmd; - void DoChange ( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange ( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -125,26 +125,26 @@ public: BOOL bNewRows, BOOL bNeedsRefresh, SCTAB nNewTab, const SCCOLROW* pRng, SCCOLROW nRngCnt, ScDocument* pUndoDocument, ScRefUndoData* pRefData ); - virtual ~ScUndoDeleteMulti(); + virtual ~ScUndoDeleteMulti(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - BOOL bRows; + BOOL bRows; BOOL bRefresh; - SCTAB nTab; - SCCOLROW* pRanges; - SCCOLROW nRangeCnt; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + SCTAB nTab; + SCCOLROW* pRanges; + SCCOLROW nRangeCnt; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void DoChange() const; - void SetChangeTrack(); + void DoChange() const; + void SetChangeTrack(); }; @@ -157,24 +157,24 @@ public: ScAddress aOldEnd, // end position without adjustment const ScMarkData& rMark, // selected sheets ScDocument* pNewUndoDoc ); - virtual ~ScUndoCut(); + virtual ~ScUndoCut(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: ScMarkData aMarkData; - ScDocument* pUndoDoc; - ScRange aExtendedRange; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + ScDocument* pUndoDoc; + ScRange aExtendedRange; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -208,29 +208,29 @@ public: ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3, BOOL bRedoIsFilled = TRUE, const ScUndoPasteOptions* pOptions = NULL ); - virtual ~ScUndoPaste(); + virtual ~ScUndoPaste(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; - USHORT nFlags; - ScRefUndoData* pRefUndoData; - ScRefUndoData* pRefRedoData; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - BOOL bRedoFilled; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; + USHORT nFlags; + ScRefUndoData* pRefUndoData; + ScRefUndoData* pRefRedoData; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + BOOL bRedoFilled; ScUndoPasteOptions aPasteOptions; - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -242,27 +242,27 @@ public: const ScRange& rRange, ScAddress aNewDestPos, BOOL bNewCut, ScDocument* pUndoDocument, ScRefUndoData* pRefData, BOOL bScenario ); - virtual ~ScUndoDragDrop(); + virtual ~ScUndoDragDrop(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aSrcRange; - ScRange aDestRange; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - BOOL bCut; - BOOL bKeepScenarioFlags; + ScRange aSrcRange; + ScRange aDestRange; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + BOOL bCut; + BOOL bKeepScenarioFlags; - void PaintArea( ScRange aRange, USHORT nExtFlags ) const; - void DoUndo( ScRange aRange ) const; + void PaintArea( ScRange aRange, USHORT nExtFlags ) const; + void DoUndo( ScRange aRange ) const; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -275,27 +275,27 @@ public: const ScRange& rRange, ScDocument* pNewUndoDoc, BOOL bNewMulti, USHORT nNewFlags, BOOL bObjects ); - virtual ~ScUndoDeleteContents(); + virtual ~ScUndoDeleteContents(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aRange; - ScMarkData aMarkData; - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten - SdrUndoAction* pDrawUndo; // geloeschte Objekte - ULONG nStartChangeAction; - ULONG nEndChangeAction; - USHORT nFlags; - BOOL bMulti; // Mehrfachselektion + ScRange aRange; + ScMarkData aMarkData; + ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten + SdrUndoAction* pDrawUndo; // geloeschte Objekte + ULONG nStartChangeAction; + ULONG nEndChangeAction; + USHORT nFlags; + BOOL bMulti; // Mehrfachselektion - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -309,30 +309,30 @@ public: SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, BOOL bNewMulti, SCTAB nSrc, USHORT nFlg, USHORT nFunc, BOOL bSkip, BOOL bLink ); - virtual ~ScUndoFillTable(); + virtual ~ScUndoFillTable(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aRange; - ScMarkData aMarkData; - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten - ULONG nStartChangeAction; - ULONG nEndChangeAction; - USHORT nFlags; - USHORT nFunction; - SCTAB nSrcTab; - BOOL bMulti; // Mehrfachselektion - BOOL bSkipEmpty; - BOOL bAsLink; + ScRange aRange; + ScMarkData aMarkData; + ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten + ULONG nStartChangeAction; + ULONG nEndChangeAction; + USHORT nFlags; + USHORT nFunction; + SCTAB nSrcTab; + BOOL bMulti; // Mehrfachselektion + BOOL bSkipEmpty; + BOOL bAsLink; - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -348,27 +348,27 @@ public: const ScPatternAttr* pNewApply, const SvxBoxItem* pNewOuter = NULL, const SvxBoxInfoItem* pNewInner = NULL ); - virtual ~ScUndoSelectionAttr(); + virtual ~ScUndoSelectionAttr(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; ScEditDataArray* GetDataArray(); private: - ScMarkData aMarkData; - ScRange aRange; + ScMarkData aMarkData; + ScRange aRange; ScEditDataArray aDataArray; - ScDocument* pUndoDoc; - BOOL bMulti; - ScPatternAttr* pApplyPattern; - SvxBoxItem* pLineOuter; - SvxBoxInfoItem* pLineInner; + ScDocument* pUndoDoc; + BOOL bMulti; + ScPatternAttr* pApplyPattern; + SvxBoxItem* pLineOuter; + SvxBoxInfoItem* pLineInner; - void DoChange( const BOOL bUndo ); + void DoChange( const BOOL bUndo ); void ChangeEditData( const bool bUndo ); }; @@ -386,29 +386,29 @@ public: ScOutlineTable* pNewUndoTab, ScSizeMode eNewMode, USHORT nNewSizeTwips, BOOL bNewWidth ); - virtual ~ScUndoWidthOrHeight(); + virtual ~ScUndoWidthOrHeight(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; virtual String GetComment() const; private: - ScMarkData aMarkData; - SCCOLROW nStart; - SCCOLROW nEnd; - SCTAB nStartTab; - SCTAB nEndTab; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTab; - SCCOLROW nRangeCnt; - SCCOLROW* pRanges; - USHORT nNewSize; - BOOL bWidth; - ScSizeMode eMode; - SdrUndoAction* pDrawUndo; + ScMarkData aMarkData; + SCCOLROW nStart; + SCCOLROW nEnd; + SCTAB nStartTab; + SCTAB nEndTab; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTab; + SCCOLROW nRangeCnt; + SCCOLROW* pRanges; + USHORT nNewSize; + BOOL bWidth; + ScSizeMode eMode; + SdrUndoAction* pDrawUndo; }; @@ -423,30 +423,30 @@ public: FillCmd eNewFillCmd, FillDateCmd eNewFillDateCmd, double fNewStartValue, double fNewStepValue, double fNewMaxValue, USHORT nMaxShIndex ); - virtual ~ScUndoAutoFill(); + virtual ~ScUndoAutoFill(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aSource; - ScMarkData aMarkData; - ScDocument* pUndoDoc; - FillDir eFillDir; - FillCmd eFillCmd; - FillDateCmd eFillDateCmd; - double fStartValue; - double fStepValue; - double fMaxValue; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - USHORT nMaxSharedIndex; + ScRange aSource; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + FillDir eFillDir; + FillCmd eFillCmd; + FillDateCmd eFillDateCmd; + double fStartValue; + double fStepValue; + double fMaxValue; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + USHORT nMaxSharedIndex; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -456,22 +456,22 @@ public: TYPEINFO(); ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo); - virtual ~ScUndoMerge(); + virtual ~ScUndoMerge(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: ScCellMergeOption maOption; bool mbMergeContents; // Merge contents in Redo(). - ScDocument* mpUndoDoc; // wenn Daten zusammengefasst + ScDocument* mpUndoDoc; // wenn Daten zusammengefasst SdrUndoAction* mpDrawUndo; - void DoChange( bool bUndo ) const; + void DoChange( bool bUndo ) const; }; @@ -483,20 +483,20 @@ public: const ScRange& rRange, ScDocument* pNewUndoDoc, const ScMarkData& rMark, BOOL bNewSize, USHORT nNewFormatNo ); - virtual ~ScUndoAutoFormat(); + virtual ~ScUndoAutoFormat(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; // geloeschte Daten - ScMarkData aMarkData; - BOOL bSize; - USHORT nFormatNo; + ScDocument* pUndoDoc; // geloeschte Daten + ScMarkData aMarkData; + BOOL bSize; + USHORT nFormatNo; }; @@ -509,25 +509,25 @@ public: SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, const String& rNewUndoStr, ScDocument* pNewUndoDoc, const SvxSearchItem* pItem ); - virtual ~ScUndoReplace(); + virtual ~ScUndoReplace(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aCursorPos; - ScMarkData aMarkData; - String aUndoStr; // Daten bei Einfachmarkierung - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten - SvxSearchItem* pSearchItem; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + ScAddress aCursorPos; + ScMarkData aMarkData; + String aUndoStr; // Daten bei Einfachmarkierung + ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten + SvxSearchItem* pSearchItem; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -544,23 +544,23 @@ public: const ScRefAddress& rRowCell, const ScRefAddress& rColCell, BYTE nMode ); - virtual ~ScUndoTabOp(); + virtual ~ScUndoTabOp(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aRange; - ScDocument* pUndoDoc; // geloeschte Daten - ScRefAddress theFormulaCell; - ScRefAddress theFormulaEnd; - ScRefAddress theRowCell; - ScRefAddress theColCell; - BYTE nMode; + ScRange aRange; + ScDocument* pUndoDoc; // geloeschte Daten + ScRefAddress theFormulaCell; + ScRefAddress theFormulaEnd; + ScRefAddress theRowCell; + ScRefAddress theColCell; + BYTE nMode; }; @@ -634,20 +634,20 @@ public: ScUndoListNames( ScDocShell* pNewDocShell, const ScRange& rRange, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc ); - virtual ~ScUndoListNames(); + virtual ~ScUndoListNames(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; - void DoChange( ScDocument* pSrcDoc ) const; + void DoChange( ScDocument* pSrcDoc ) const; }; @@ -659,20 +659,20 @@ public: const ScMarkData& rMark, const ScArea& rDestArea, ScDocument* pNewUndoDoc, const String& rNewName ); - virtual ~ScUndoUseScenario(); + virtual ~ScUndoUseScenario(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; virtual String GetComment() const; private: - ScDocument* pUndoDoc; - ScRange aRange; - ScMarkData aMarkData; - String aName; + ScDocument* pUndoDoc; + ScRange aRange; + ScMarkData aMarkData; + String aName; }; @@ -685,23 +685,23 @@ public: const ScRange& rRange, const String& rName, ScDocument* pNewUndoDoc ); - virtual ~ScUndoSelectionStyle(); + virtual ~ScUndoSelectionStyle(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; - virtual USHORT GetId() const; + virtual String GetComment() const; + virtual USHORT GetId() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - String aStyleName; - ScRange aRange; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + String aStyleName; + ScRange aRange; - void DoChange( const BOOL bUndo ); + void DoChange( const BOOL bUndo ); }; @@ -711,18 +711,18 @@ public: TYPEINFO(); ScUndoRefreshLink( ScDocShell* pNewDocShell, ScDocument* pNewUndoDoc ); - virtual ~ScUndoRefreshLink(); + virtual ~ScUndoRefreshLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; }; @@ -734,23 +734,23 @@ public: const ScRange& rArea, ScDocument* pNewUndoDoc, const String& rForm ); - virtual ~ScUndoEnterMatrix(); + virtual ~ScUndoEnterMatrix(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; - String aFormula; + ScDocument* pUndoDoc; + String aFormula; formula::FormulaGrammar::AddressConvention eConv; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -763,22 +763,22 @@ public: const String& rFlt, const String& rOpt, const String& rArea, const ScRange& rDestRange, ULONG nRefreshDelay ); - virtual ~ScUndoInsertAreaLink(); + virtual ~ScUndoInsertAreaLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aDocName; - String aFltName; - String aOptions; - String aAreaName; - ScRange aRange; - ULONG nRefreshDelay; + String aDocName; + String aFltName; + String aOptions; + String aAreaName; + ScRange aRange; + ULONG nRefreshDelay; }; @@ -791,26 +791,26 @@ public: const String& rFlt, const String& rOpt, const String& rArea, const ScRange& rDestRange, ULONG nRefreshDelay ); - virtual ~ScUndoRemoveAreaLink(); + virtual ~ScUndoRemoveAreaLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aDocName; - String aFltName; - String aOptions; - String aAreaName; - ScRange aRange; - ULONG nRefreshDelay; + String aDocName; + String aFltName; + String aOptions; + String aAreaName; + ScRange aRange; + ULONG nRefreshDelay; }; -class ScUndoUpdateAreaLink : public ScSimpleUndo //! auch BlockUndo umstellen? +class ScUndoUpdateAreaLink : public ScSimpleUndo //! auch BlockUndo umstellen? { public: TYPEINFO(); @@ -825,33 +825,33 @@ public: ULONG nNewRD, ScDocument* pUndo, ScDocument* pRedo, BOOL bDoInsert ); - virtual ~ScUndoUpdateAreaLink(); + virtual ~ScUndoUpdateAreaLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aOldDoc; - String aOldFlt; - String aOldOpt; - String aOldArea; - ScRange aOldRange; - String aNewDoc; - String aNewFlt; - String aNewOpt; - String aNewArea; - ScRange aNewRange; - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; - ULONG nOldRefresh; - ULONG nNewRefresh; - BOOL bWithInsert; - - void DoChange( const BOOL bUndo ) const; + String aOldDoc; + String aOldFlt; + String aOldOpt; + String aOldArea; + ScRange aOldRange; + String aNewDoc; + String aNewFlt; + String aNewOpt; + String aNewArea; + ScRange aNewRange; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; + ULONG nOldRefresh; + ULONG nNewRefresh; + BOOL bWithInsert; + + void DoChange( const BOOL bUndo ) const; }; @@ -861,19 +861,19 @@ public: TYPEINFO(); ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, BOOL bIncrement ); - virtual ~ScUndoIndent(); + virtual ~ScUndoIndent(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - BOOL bIsIncrement; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + BOOL bIsIncrement; }; @@ -883,19 +883,19 @@ public: TYPEINFO(); ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, sal_Int32 nType ); - virtual ~ScUndoTransliterate(); + virtual ~ScUndoTransliterate(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - sal_Int32 nTransliterationType; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + sal_Int32 nTransliterationType; }; @@ -905,19 +905,19 @@ public: TYPEINFO(); ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, const USHORT* pW ); - virtual ~ScUndoClearItems(); + virtual ~ScUndoClearItems(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - USHORT* pWhich; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + USHORT* pWhich; }; @@ -927,18 +927,18 @@ public: TYPEINFO(); ScUndoRemoveBreaks( ScDocShell* pNewDocShell, SCTAB nNewTab, ScDocument* pNewUndoDoc ); - virtual ~ScUndoRemoveBreaks(); + virtual ~ScUndoRemoveBreaks(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScDocument* pUndoDoc; + SCTAB nTab; + ScDocument* pUndoDoc; }; @@ -949,20 +949,20 @@ public: ScUndoRemoveMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, ScDocument* pNewUndoDoc ); - virtual ~ScUndoRemoveMerge(); + virtual ~ScUndoRemoveMerge(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: void SetCurTab(); ScCellMergeOption maOption; - ScDocument* pUndoDoc; + ScDocument* pUndoDoc; }; @@ -975,20 +975,20 @@ public: ScDocument* pNewUndoDoc, const SvxBoxItem& rNewOuter, const SvxBoxInfoItem& rNewInner ); - virtual ~ScUndoBorder(); + virtual ~ScUndoBorder(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; - ScRangeList* pRanges; - SvxBoxItem* pOuter; - SvxBoxInfoItem* pInner; + ScDocument* pUndoDoc; + ScRangeList* pRanges; + SvxBoxItem* pOuter; + SvxBoxInfoItem* pInner; }; diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 0def8a3d67ba..0d00af997d74 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.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 @@ -53,14 +53,14 @@ public: SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat, const ScPatternAttr* pApplyPat, BOOL bAutomatic ); - virtual ~ScUndoCursorAttr(); + virtual ~ScUndoCursorAttr(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; /** once the objects are passed to this class, their life-cycle is managed by this class; the calling function must pass new'ed @@ -68,17 +68,17 @@ public: void SetEditData( EditTextObject* pOld, EditTextObject* pNew ); private: - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - ScPatternAttr* pOldPattern; - ScPatternAttr* pNewPattern; - ScPatternAttr* pApplyPattern; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + ScPatternAttr* pOldPattern; + ScPatternAttr* pNewPattern; + ScPatternAttr* pApplyPattern; ::boost::shared_ptr<EditTextObject> pOldEditData; ::boost::shared_ptr<EditTextObject> pNewEditData; - BOOL bIsAutomatic; + BOOL bIsAutomatic; - void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const; + void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const; }; @@ -91,30 +91,30 @@ public: SCTAB nNewCount, SCTAB* pNewTabs, ScBaseCell** ppOldData, BOOL* pHasForm, ULONG* pOldForm, const String& rNewStr, EditTextObject* pObj = NULL ); - virtual ~ScUndoEnterData(); + virtual ~ScUndoEnterData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aNewString; - SCTAB* pTabs; - ScBaseCell** ppOldCells; - BOOL* pHasFormat; - ULONG* pOldFormats; - EditTextObject* pNewEditData; - ULONG nEndChangeAction; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - SCTAB nCount; // markierte Tabellen - - void DoChange() const; - void SetChangeTrack(); + String aNewString; + SCTAB* pTabs; + ScBaseCell** ppOldCells; + BOOL* pHasFormat; + ULONG* pOldFormats; + EditTextObject* pNewEditData; + ULONG nEndChangeAction; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + SCTAB nCount; // markierte Tabellen + + void DoChange() const; + void SetChangeTrack(); }; @@ -125,23 +125,23 @@ public: ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos, ScBaseCell* pUndoCell, double nVal, BOOL bHeight ); - virtual ~ScUndoEnterValue(); + virtual ~ScUndoEnterValue(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aPos; - ScBaseCell* pOldCell; - double nValue; - ULONG nEndChangeAction; - BOOL bNeedHeight; + ScAddress aPos; + ScBaseCell* pOldCell; + double nValue; + ULONG nEndChangeAction; + BOOL bNeedHeight; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -152,23 +152,23 @@ public: ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos, ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, BOOL bHeight ); - virtual ~ScUndoPutCell(); + virtual ~ScUndoPutCell(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aPos; - ScBaseCell* pOldCell; - ScBaseCell* pEnteredCell; - ULONG nEndChangeAction; - BOOL bNeedHeight; + ScAddress aPos; + ScBaseCell* pOldCell; + ScBaseCell* pEnteredCell; + ULONG nEndChangeAction; + BOOL bNeedHeight; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -179,23 +179,23 @@ public: ScUndoPageBreak( ScDocShell* pNewDocShell, SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, BOOL bNewColumn, BOOL bNewInsert ); - virtual ~ScUndoPageBreak(); + virtual ~ScUndoPageBreak(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - BOOL bColumn; // Spalten- oder Zeilenumbruch - BOOL bInsert; // Einfuegen oder Loeschen + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + BOOL bColumn; // Spalten- oder Zeilenumbruch + BOOL bInsert; // Einfuegen oder Loeschen - void DoChange( BOOL bInsert ) const; + void DoChange( BOOL bInsert ) const; }; class ScUndoPrintZoom: public ScSimpleUndo @@ -204,23 +204,23 @@ public: TYPEINFO(); ScUndoPrintZoom( ScDocShell* pNewDocShell, SCTAB nT, USHORT nOS, USHORT nOP, USHORT nNS, USHORT nNP ); - virtual ~ScUndoPrintZoom(); + virtual ~ScUndoPrintZoom(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - USHORT nOldScale; - USHORT nOldPages; - USHORT nNewScale; - USHORT nNewPages; + SCTAB nTab; + USHORT nOldScale; + USHORT nOldPages; + USHORT nNewScale; + USHORT nNewPages; - void DoChange( BOOL bUndo ); + void DoChange( BOOL bUndo ); }; class ScUndoThesaurus: public ScSimpleUndo @@ -231,28 +231,28 @@ public: SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, const String& rNewUndoStr, const EditTextObject* pUndoTObj, const String& rNewRedoStr, const EditTextObject* pRedoTObj); - virtual ~ScUndoThesaurus(); + virtual ~ScUndoThesaurus(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - String aUndoStr; // Daten bei StringZelle - EditTextObject* pUndoTObject; // bei EditZelle - String aRedoStr; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + String aUndoStr; // Daten bei StringZelle + EditTextObject* pUndoTObject; // bei EditZelle + String aRedoStr; EditTextObject* pRedoTObject; - ULONG nEndChangeAction; + ULONG nEndChangeAction; - void DoChange( BOOL bUndo, const String& rStr, + void DoChange( BOOL bUndo, const String& rStr, const EditTextObject* pTObj ); - void SetChangeTrack( ScBaseCell* pOldCell ); + void SetChangeTrack( ScBaseCell* pOldCell ); }; // ============================================================================ @@ -307,18 +307,18 @@ class ScUndoShowHideNote : public ScSimpleUndo public: TYPEINFO(); ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow ); - virtual ~ScUndoShowHideNote(); + virtual ~ScUndoShowHideNote(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat( SfxRepeatTarget& rTarget ); + virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress maPos; - bool mbShown; + ScAddress maPos; + bool mbShown; }; // ============================================================================ @@ -330,21 +330,21 @@ public: ScUndoDetective( ScDocShell* pNewDocShell, SdrUndoAction* pDraw, const ScDetOpData* pOperation, ScDetOpList* pUndoList = NULL ); - virtual ~ScUndoDetective(); + virtual ~ScUndoDetective(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - BOOL bIsDelete; - ScDetOpList* pOldList; - USHORT nAction; - ScAddress aPos; - SdrUndoAction* pDrawUndo; + BOOL bIsDelete; + ScDetOpList* pOldList; + USHORT nAction; + ScAddress aPos; + SdrUndoAction* pDrawUndo; }; @@ -354,20 +354,20 @@ public: TYPEINFO(); ScUndoRangeNames( ScDocShell* pNewDocShell, ScRangeName* pOld, ScRangeName* pNew ); - virtual ~ScUndoRangeNames(); + virtual ~ScUndoRangeNames(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRangeName* pOldRanges; - ScRangeName* pNewRanges; + ScRangeName* pOldRanges; + ScRangeName* pNewRanges; - void DoChange( BOOL bUndo ); + void DoChange( BOOL bUndo ); }; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 05e4b9eff433..5f76bccb5fae 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.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 @@ -30,8 +30,8 @@ #define SC_UNDODAT_HXX #include "undobase.hxx" -#include "rangeutl.hxx" // ScArea -#include "rangelst.hxx" // ScRangeListRef +#include "rangeutl.hxx" // ScArea +#include "rangelst.hxx" // ScRangeListRef #include "markdata.hxx" #include "sortparam.hxx" #include "queryparam.hxx" @@ -56,24 +56,24 @@ public: SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, ScDocument* pNewUndoDoc, BOOL bNewColumns, USHORT nNewLevel, USHORT nNewEntry, BOOL bNewShow ); - virtual ~ScUndoDoOutline(); + virtual ~ScUndoDoOutline(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCCOLROW nStart; - SCCOLROW nEnd; - SCTAB nTab; - ScDocument* pUndoDoc; - BOOL bColumns; - USHORT nLevel; - USHORT nEntry; - BOOL bShow; + SCCOLROW nStart; + SCCOLROW nEnd; + SCTAB nTab; + ScDocument* pUndoDoc; + BOOL bColumns; + USHORT nLevel; + USHORT nEntry; + BOOL bShow; }; @@ -86,21 +86,21 @@ public: SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScOutlineTable* pNewUndoTab, BOOL bNewColumns, BOOL bNewMake ); - virtual ~ScUndoMakeOutline(); + virtual ~ScUndoMakeOutline(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScOutlineTable* pUndoTable; - BOOL bColumns; - BOOL bMake; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScOutlineTable* pUndoTable; + BOOL bColumns; + BOOL bMake; }; @@ -112,23 +112,23 @@ public: SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, BOOL bNewColumns, USHORT nNewLevel ); - virtual ~ScUndoOutlineLevel(); + virtual ~ScUndoOutlineLevel(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCCOLROW nStart; - SCCOLROW nEnd; - SCTAB nTab; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; - BOOL bColumns; - USHORT nLevel; + SCCOLROW nStart; + SCCOLROW nEnd; + SCTAB nTab; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; + BOOL bColumns; + USHORT nLevel; }; @@ -141,21 +141,21 @@ public: SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, BOOL bNewShow ); - virtual ~ScUndoOutlineBlock(); + virtual ~ScUndoOutlineBlock(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; - BOOL bShow; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; + BOOL bShow; }; @@ -167,20 +167,20 @@ public: SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab ); - virtual ~ScUndoRemoveAllOutlines(); + virtual ~ScUndoRemoveAllOutlines(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; }; @@ -192,20 +192,20 @@ public: SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab ); - virtual ~ScUndoAutoOutline(); + virtual ~ScUndoAutoOutline(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; }; @@ -216,26 +216,26 @@ public: ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScSubTotalParam& rNewParam, SCROW nNewEndY, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, -// ScDBData* pNewData, +// ScDBData* pNewData, ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB ); - virtual ~ScUndoSubTotals(); + virtual ~ScUndoSubTotals(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScSubTotalParam aParam; // Original uebergebener Parameter - SCROW nNewEndRow; // Ergebnis-Groesse - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; -// ScDBData* pUndoDBData; - ScRangeName* pUndoRange; - ScDBCollection* pUndoDB; + SCTAB nTab; + ScSubTotalParam aParam; // Original uebergebener Parameter + SCROW nNewEndRow; // Ergebnis-Groesse + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; +// ScDBData* pUndoDBData; + ScRangeName* pUndoRange; + ScDBCollection* pUndoDB; }; @@ -247,23 +247,23 @@ public: const ScSortParam& rParam, BOOL bQuery, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, const ScRange* pDest = NULL ); - virtual ~ScUndoSort(); + virtual ~ScUndoSort(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScSortParam aSortParam; - BOOL bRepeatQuery; - ScDocument* pUndoDoc; - ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich - BOOL bDestArea; - ScRange aDestRange; + SCTAB nTab; + ScSortParam aSortParam; + BOOL bRepeatQuery; + ScDocument* pUndoDoc; + ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich + BOOL bDestArea; + ScRange aDestRange; }; @@ -275,26 +275,26 @@ public: const ScQueryParam& rParam, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, const ScRange* pOld, BOOL bSize, const ScRange* pAdvSrc ); - virtual ~ScUndoQuery(); + virtual ~ScUndoQuery(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: SdrUndoAction* pDrawUndo; - SCTAB nTab; - ScQueryParam aQueryParam; - ScDocument* pUndoDoc; - ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich - ScRange aOldDest; - ScRange aAdvSource; - BOOL bIsAdvanced; - BOOL bDestArea; - BOOL bDoSize; + SCTAB nTab; + ScQueryParam aQueryParam; + ScDocument* pUndoDoc; + ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich + ScRange aOldDest; + ScRange aAdvSource; + BOOL bIsAdvanced; + BOOL bDestArea; + BOOL bDoSize; }; @@ -327,14 +327,14 @@ public: TYPEINFO(); ScUndoDBData( ScDocShell* pNewDocShell, ScDBCollection* pNewUndoColl, ScDBCollection* pNewRedoColl ); - virtual ~ScUndoDBData(); + virtual ~ScUndoDBData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: ScDBCollection* pUndoColl; @@ -351,26 +351,26 @@ public: SCCOL nNewFormula, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, ScDBData* pNewUndoData, ScDBData* pNewRedoData ); - virtual ~ScUndoImportData(); + virtual ~ScUndoImportData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScImportParam aImportParam; - SCCOL nEndCol; - SCROW nEndRow; - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; - ScDBData* pUndoDBData; - ScDBData* pRedoDBData; - SCCOL nFormulaCols; - BOOL bRedoFilled; + SCTAB nTab; + ScImportParam aImportParam; + SCCOL nEndCol; + SCROW nEndRow; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; + ScDBData* pUndoDBData; + ScDBData* pRedoDBData; + SCCOL nFormulaCols; + BOOL bRedoFilled; }; @@ -384,27 +384,27 @@ public: ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB, const ScRange* pOldQ, const ScRange* pNewQ ); - virtual ~ScUndoRepeatDB(); + virtual ~ScUndoRepeatDB(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - SCROW nNewEndRow; - ScAddress aCursorPos; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; - ScRangeName* pUndoRange; - ScDBCollection* pUndoDB; - ScRange aOldQuery; - ScRange aNewQuery; - BOOL bQuerySize; + ScAddress aBlockStart; + ScAddress aBlockEnd; + SCROW nNewEndRow; + ScAddress aCursorPos; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; + ScRangeName* pUndoRange; + ScDBCollection* pUndoDB; + ScRange aOldQuery; + ScRange aNewQuery; + BOOL bQuerySize; }; @@ -416,21 +416,21 @@ public: ScDocument* pOldDoc, ScDocument* pNewDoc, const ScDPObject* pOldObj, const ScDPObject* pNewObj, BOOL bMove ); - virtual ~ScUndoDataPilot(); + virtual ~ScUndoDataPilot(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pOldUndoDoc; - ScDocument* pNewUndoDoc; - ScDPObject* pOldDPObject; - ScDPObject* pNewDPObject; - BOOL bAllowMove; + ScDocument* pOldUndoDoc; + ScDocument* pNewUndoDoc; + ScDPObject* pOldDPObject; + ScDPObject* pNewDPObject; + BOOL bAllowMove; }; @@ -443,23 +443,23 @@ public: ScDocument* pNewUndoDoc, BOOL bReference, SCROW nInsCount, ScOutlineTable* pTab, ScDBData* pData ); - virtual ~ScUndoConsolidate(); + virtual ~ScUndoConsolidate(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScArea aDestArea; - ScDocument* pUndoDoc; - ScConsolidateParam aParam; - BOOL bInsRef; - SCSIZE nInsertCount; - ScOutlineTable* pUndoTab; - ScDBData* pUndoData; + ScArea aDestArea; + ScDocument* pUndoDoc; + ScConsolidateParam aParam; + BOOL bInsRef; + SCSIZE nInsertCount; + ScOutlineTable* pUndoTab; + ScDBData* pUndoData; }; @@ -473,27 +473,27 @@ public: ScUndoChartData( ScDocShell* pNewDocShell, const String& rName, const ScRangeListRef& rNew, BOOL bColHdr, BOOL bRowHdr, BOOL bAdd ); - virtual ~ScUndoChartData(); + virtual ~ScUndoChartData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aChartName; - ScRangeListRef aOldRangeListRef; - BOOL bOldColHeaders; - BOOL bOldRowHeaders; -// ScRange aNewRange; - ScRangeListRef aNewRangeListRef; - BOOL bNewColHeaders; - BOOL bNewRowHeaders; - BOOL bAddRange; - - void Init(); + String aChartName; + ScRangeListRef aOldRangeListRef; + BOOL bOldColHeaders; + BOOL bOldRowHeaders; +// ScRange aNewRange; + ScRangeListRef aNewRangeListRef; + BOOL bNewColHeaders; + BOOL bNewRowHeaders; + BOOL bAddRange; + + void Init(); }; // amelia @@ -510,28 +510,28 @@ public: ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3, BOOL bRedoIsFilled = TRUE ); - virtual ~ScUndoDataForm(); + virtual ~ScUndoDataForm(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; - USHORT nFlags; - ScRefUndoData* pRefUndoData; - ScRefUndoData* pRefRedoData; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - BOOL bRedoFilled; - - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + ScMarkData aMarkData; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; + USHORT nFlags; + ScRefUndoData* pRefUndoData; + ScRefUndoData* pRefRedoData; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + BOOL bRedoFilled; + + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 565766e3bccb..7a7015442e68 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.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 @@ -35,27 +35,27 @@ class ScDocShell; class ScUndoDraw: public SfxUndoAction { - SfxUndoAction* pDrawUndo; - ScDocShell* pDocShell; + SfxUndoAction* pDrawUndo; + ScDocShell* pDocShell; public: TYPEINFO(); ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh ); - virtual ~ScUndoDraw(); + virtual ~ScUndoDraw(); - SfxUndoAction* GetDrawUndo() { return pDrawUndo; } - void ForgetDrawUndo(); + SfxUndoAction* GetDrawUndo() { return pDrawUndo; } + void ForgetDrawUndo(); - virtual BOOL IsLinked(); - virtual void SetLinked( BOOL bIsLinked ); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL IsLinked(); + virtual void SetLinked( BOOL bIsLinked ); + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual BOOL Merge( SfxUndoAction *pNextAction ); virtual String GetComment() const; - virtual String GetRepeatComment(SfxRepeatTarget&) const; - virtual USHORT GetId() const; + virtual String GetRepeatComment(SfxRepeatTarget&) const; + virtual USHORT GetId() const; }; diff --git a/sc/source/ui/inc/undoolk.hxx b/sc/source/ui/inc/undoolk.hxx index 132c0c1ac70c..373c72266873 100644 --- a/sc/source/ui/inc/undoolk.hxx +++ b/sc/source/ui/inc/undoolk.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 @@ -34,11 +34,11 @@ class SdrUndoAction; class ScDocument; -SdrUndoAction* GetSdrUndoAction ( ScDocument* pDoc ); -void DoSdrUndoAction ( SdrUndoAction* pUndoAction, ScDocument* pDoc ); -void RedoSdrUndoAction ( SdrUndoAction* pUndoAction ); -void DeleteSdrUndoAction ( SdrUndoAction* pUndoAction ); -void EnableDrawAdjust ( ScDocument* pDoc, BOOL bEnable ); +SdrUndoAction* GetSdrUndoAction ( ScDocument* pDoc ); +void DoSdrUndoAction ( SdrUndoAction* pUndoAction, ScDocument* pDoc ); +void RedoSdrUndoAction ( SdrUndoAction* pUndoAction ); +void DeleteSdrUndoAction ( SdrUndoAction* pUndoAction ); +void EnableDrawAdjust ( ScDocument* pDoc, BOOL bEnable ); diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 9e3b3ed9f87e..d247c86642f8 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.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 @@ -40,31 +40,31 @@ class SfxStyleSheetBase; class ScStyleSaveData { private: - String aName; - String aParent; - SfxItemSet* pItems; + String aName; + String aParent; + SfxItemSet* pItems; public: ScStyleSaveData(); ScStyleSaveData( const ScStyleSaveData& rOther ); ~ScStyleSaveData(); - ScStyleSaveData& operator=( const ScStyleSaveData& rOther ); + ScStyleSaveData& operator=( const ScStyleSaveData& rOther ); - void InitFromStyle( const SfxStyleSheetBase* pSource ); + void InitFromStyle( const SfxStyleSheetBase* pSource ); - const String& GetName() const { return aName; } - const String& GetParent() const { return aParent; } - const SfxItemSet* GetItems() const { return pItems; } + const String& GetName() const { return aName; } + const String& GetParent() const { return aParent; } + const SfxItemSet* GetItems() const { return pItems; } }; class ScUndoModifyStyle: public ScSimpleUndo { private: - SfxStyleFamily eFamily; - ScStyleSaveData aOldData; - ScStyleSaveData aNewData; + SfxStyleFamily eFamily; + ScStyleSaveData aOldData; + ScStyleSaveData aNewData; - static void DoChange( ScDocShell* pDocSh, + static void DoChange( ScDocShell* pDocSh, const String& rName, SfxStyleFamily eStyleFamily, const ScStyleSaveData& rData ); @@ -74,14 +74,14 @@ public: SfxStyleFamily eFam, const ScStyleSaveData& rOld, const ScStyleSaveData& rNew ); - virtual ~ScUndoModifyStyle(); + virtual ~ScUndoModifyStyle(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; }; class ScUndoApplyPageStyle: public ScSimpleUndo @@ -89,16 +89,16 @@ class ScUndoApplyPageStyle: public ScSimpleUndo public: TYPEINFO(); ScUndoApplyPageStyle( ScDocShell* pDocSh, const String& rNewStyle ); - virtual ~ScUndoApplyPageStyle(); + virtual ~ScUndoApplyPageStyle(); void AddSheetAction( SCTAB nTab, const String& rOld ); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: struct ApplyStyleEntry diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 029754663b72..d725386f36dd 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.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 @@ -72,23 +72,23 @@ public: SCTAB nTabNum, BOOL bApp, const String& rNewName); - virtual ~ScUndoInsertTab(); + virtual ~ScUndoInsertTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String sNewName; - SdrUndoAction* pDrawUndo; - ULONG nEndChangeAction; - SCTAB nTab; - BOOL bAppend; + String sNewName; + SdrUndoAction* pDrawUndo; + ULONG nEndChangeAction; + SCTAB nTab; + BOOL bAppend; - void SetChangeTrack(); + void SetChangeTrack(); }; class ScUndoInsertTables : public ScSimpleUndo @@ -100,52 +100,52 @@ public: SCTAB nTabNum, BOOL bApp, SvStrings *pNewNameList); - virtual ~ScUndoInsertTables(); + virtual ~ScUndoInsertTables(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SdrUndoAction* pDrawUndo; - SvStrings* pNameList; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - SCTAB nTab; - BOOL bAppend; + SdrUndoAction* pDrawUndo; + SvStrings* pNameList; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + SCTAB nTab; + BOOL bAppend; - void SetChangeTrack(); + void SetChangeTrack(); }; -class ScUndoDeleteTab: public ScMoveUndo // Draw vom Move fuer geloeschte Tabelle +class ScUndoDeleteTab: public ScMoveUndo // Draw vom Move fuer geloeschte Tabelle { public: TYPEINFO(); ScUndoDeleteTab( ScDocShell* pNewDocShell, - const SvShorts &theTabs, //SCTAB nNewTab, + const SvShorts &theTabs, //SCTAB nNewTab, ScDocument* pUndoDocument, ScRefUndoData* pRefData ); - virtual ~ScUndoDeleteTab(); + virtual ~ScUndoDeleteTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SvShorts theTabs; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + SvShorts theTabs; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -158,19 +158,19 @@ public: SCTAB nT, const String& rOldName, const String& rNewName); - virtual ~ScUndoRenameTab(); + virtual ~ScUndoRenameTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - String sOldName; - String sNewName; + SCTAB nTab; + String sOldName; + String sNewName; void DoChange( SCTAB nTab, const String& rName ) const; }; @@ -183,18 +183,18 @@ public: ScUndoMoveTab( ScDocShell* pNewDocShell, const SvShorts &aOldTab, const SvShorts &aNewTab); - virtual ~ScUndoMoveTab(); + virtual ~ScUndoMoveTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SvShorts theOldTabs; - SvShorts theNewTabs; + SvShorts theOldTabs; + SvShorts theNewTabs; void DoChange( BOOL bUndo ) const; }; @@ -208,19 +208,19 @@ public: const SvShorts &aOldTab, const SvShorts &aNewTab); - virtual ~ScUndoCopyTab(); + virtual ~ScUndoCopyTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SdrUndoAction* pDrawUndo; - SvShorts theOldTabs; - SvShorts theNewTabs; + SdrUndoAction* pDrawUndo; + SvShorts theOldTabs; + SvShorts theNewTabs; void DoChange() const; }; @@ -244,7 +244,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; -virtual String GetComment() const; +virtual String GetComment() const; private: ScUndoTabColorInfo::List aTabColorList; @@ -263,23 +263,23 @@ public: const String& rN, const String& rC, const Color& rCol, USHORT nF, const ScMarkData& rMark ); - virtual ~ScUndoMakeScenario(); + virtual ~ScUndoMakeScenario(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nSrcTab; - SCTAB nDestTab; - String aName; - String aComment; - Color aColor; - USHORT nFlags; - ScMarkData aMarkData; + SCTAB nSrcTab; + SCTAB nDestTab; + String aName; + String aComment; + Color aColor; + USHORT nFlags; + ScMarkData aMarkData; SdrUndoAction* pDrawUndo; }; @@ -292,21 +292,21 @@ public: ScDocShell* pShell, SCTAB nNewTab, SCTAB nNewCount, BOOL bNewLink ); - virtual ~ScUndoImportTab(); + virtual ~ScUndoImportTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - SCTAB nCount; - BOOL bLink; - ScDocument* pRedoDoc; - SdrUndoAction* pDrawUndo; + SCTAB nTab; + SCTAB nCount; + BOOL bLink; + ScDocument* pRedoDoc; + SdrUndoAction* pDrawUndo; void DoChange() const; }; @@ -316,27 +316,27 @@ class ScUndoRemoveLink : public ScSimpleUndo { public: TYPEINFO(); - ScUndoRemoveLink( // vor dem Loeschen aufrufen! + ScUndoRemoveLink( // vor dem Loeschen aufrufen! ScDocShell* pShell, const String& rDoc ); - virtual ~ScUndoRemoveLink(); + virtual ~ScUndoRemoveLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aDocName; - String aFltName; - String aOptions; - ULONG nRefreshDelay; - USHORT nCount; - SCTAB* pTabs; - BYTE* pModes; - String* pTabNames; + String aDocName; + String aFltName; + String aOptions; + ULONG nRefreshDelay; + USHORT nCount; + SCTAB* pTabs; + BYTE* pModes; + String* pTabNames; void DoChange( BOOL bLink ) const; }; @@ -349,18 +349,18 @@ public: ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewShow ); - virtual ~ScUndoShowHideTab(); + virtual ~ScUndoShowHideTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - BOOL bShow; + SCTAB nTab; + BOOL bShow; void DoChange( BOOL bShow ) const; }; @@ -373,19 +373,19 @@ class ScUndoDocProtect : public ScSimpleUndo { public: ScUndoDocProtect(ScDocShell* pShell, ::std::auto_ptr<ScDocProtection> pProtectSettings); - virtual ~ScUndoDocProtect(); + virtual ~ScUndoDocProtect(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: ::std::auto_ptr<ScDocProtection> mpProtectSettings; - void DoProtect(bool bProtect); + void DoProtect(bool bProtect); }; // ============================================================================ @@ -395,22 +395,22 @@ private: class ScUndoTabProtect : public ScSimpleUndo { public: - ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, + ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, ::std::auto_ptr<ScTableProtection> pProtectSettings); - virtual ~ScUndoTabProtect(); + virtual ~ScUndoTabProtect(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: SCTAB mnTab; ::std::auto_ptr<ScTableProtection> mpProtectSettings; - void DoProtect(bool bProtect); + void DoProtect(bool bProtect); }; @@ -420,19 +420,19 @@ public: TYPEINFO(); ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab, ScPrintRangeSaver* pOld, ScPrintRangeSaver* pNew ); - virtual ~ScUndoPrintRange(); + virtual ~ScUndoPrintRange(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScPrintRangeSaver* pOldRanges; - ScPrintRangeSaver* pNewRanges; + SCTAB nTab; + ScPrintRangeSaver* pOldRanges; + ScPrintRangeSaver* pNewRanges; void DoChange( BOOL bUndo ); }; @@ -449,25 +449,25 @@ public: const Color& rOCol, const Color& rNCol, USHORT nOF, USHORT nNF ); - virtual ~ScUndoScenarioFlags(); + virtual ~ScUndoScenarioFlags(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - String aOldName; - String aNewName; - String aOldComment; - String aNewComment; - Color aOldColor; - Color aNewColor; - USHORT nOldFlags; - USHORT nNewFlags; + SCTAB nTab; + String aOldName; + String aNewName; + String aOldComment; + String aNewComment; + Color aOldColor; + Color aNewColor; + USHORT nOldFlags; + USHORT nNewFlags; }; @@ -479,21 +479,21 @@ public: ScDocShell* pNewDocShell, const String& rPN, const String& rON, const String& rNN ); - virtual ~ScUndoRenameObject(); + virtual ~ScUndoRenameObject(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aPersistName; // to find object (works only for OLE objects) - String aOldName; - String aNewName; + String aPersistName; // to find object (works only for OLE objects) + String aOldName; + String aNewName; - SdrObject* GetObject(); + SdrObject* GetObject(); }; @@ -502,18 +502,18 @@ class ScUndoLayoutRTL : public ScSimpleUndo public: TYPEINFO(); ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRTL ); - virtual ~ScUndoLayoutRTL(); + virtual ~ScUndoLayoutRTL(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - BOOL bRTL; + SCTAB nTab; + BOOL bRTL; void DoChange( BOOL bNew ); }; diff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxx index 48985a132fe3..c963d6010d1e 100644 --- a/sc/source/ui/inc/undoutil.hxx +++ b/sc/source/ui/inc/undoutil.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 @@ -42,7 +42,7 @@ class ScDocument; class ScUndoUtil { public: - // Block markieren (unsichtbar, muss repainted werden) + // Block markieren (unsichtbar, muss repainted werden) static void MarkSimpleBlock( ScDocShell* pDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ ); @@ -52,12 +52,12 @@ public: static void MarkSimpleBlock( ScDocShell* pDocShell, const ScRange& rRange ); - // Bereich +1 painten + // Bereich +1 painten static void PaintMore( ScDocShell* pDocShell, const ScRange& rRange ); - // DB-Bereich im Dokument suchen ("unbenannt" oder nach Bereich) - // legt neu an, wenn nicht gefunden + // DB-Bereich im Dokument suchen ("unbenannt" oder nach Bereich) + // legt neu an, wenn nicht gefunden static ScDBData* GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); }; diff --git a/sc/source/ui/inc/validate.hrc b/sc/source/ui/inc/validate.hrc index 45e5dda39c2d..0af2a1481a52 100644 --- a/sc/source/ui/inc/validate.hrc +++ b/sc/source/ui/inc/validate.hrc @@ -1,7 +1,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 @@ -59,7 +59,7 @@ #define EDT_LIST 29 #define FT_SOURCEHINT 30 //<!--Added by PengYunQuan for Validity Cell Range Picker -#define RB_VALIDITY_REF 88 +#define RB_VALIDITY_REF 88 //-->Added by PengYunQuan for Validity Cell Range Picker /* Position indexes for "Allow" list box. diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 1f7e714bb6e0..19dd63b84df4 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.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 @@ -41,51 +41,51 @@ // ============================================================================ //<!--Added by PengYunQuan for Validity Cell Range Picker -struct ScRefHandlerCaller{ +struct ScRefHandlerCaller{ virtual ~ScRefHandlerCaller(){} }; class ScRefHandlerHelper { protected: - ScRefHandlerCaller *m_pHandler; + ScRefHandlerCaller *m_pHandler; void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , ScDocument* ); void (ScRefHandlerCaller::*m_pSetActiveHdl)(); void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( ScRefEdit* pEdit, ScRefButton* pButton ); void (ScRefHandlerCaller::*m_pRefInputStartPostHdl)( ScRefEdit* pEdit, ScRefButton* pButton ); void (ScRefHandlerCaller::*m_pRefInputDonePreHdl)(); void (ScRefHandlerCaller::*m_pRefInputDonePostHdl)(); - + public: typedef void (ScRefHandlerCaller::*PFUNCSETREFHDLTYPE)( const ScRange& , ScDocument* ); - typedef void (ScRefHandlerCaller::*PCOMMONHDLTYPE)(); - typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( ScRefEdit* pEdit, ScRefButton* pButton ); + typedef void (ScRefHandlerCaller::*PCOMMONHDLTYPE)(); + typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( ScRefEdit* pEdit, ScRefButton* pButton ); - PFUNCSETREFHDLTYPE SetSetRefHdl( PFUNCSETREFHDLTYPE pNewHdl ) + PFUNCSETREFHDLTYPE SetSetRefHdl( PFUNCSETREFHDLTYPE pNewHdl ) { PFUNCSETREFHDLTYPE pOldHdl = m_pSetReferenceHdl; m_pSetReferenceHdl = pNewHdl; return pOldHdl; } - PCOMMONHDLTYPE SetSetActHdl( PCOMMONHDLTYPE pNewHdl ) + PCOMMONHDLTYPE SetSetActHdl( PCOMMONHDLTYPE pNewHdl ) { PCOMMONHDLTYPE pOldHdl = m_pSetActiveHdl; m_pSetActiveHdl = pNewHdl; return pOldHdl; } - ScRefHandlerCaller *SetHandler( ScRefHandlerCaller *pNewHandler ) + ScRefHandlerCaller *SetHandler( ScRefHandlerCaller *pNewHandler ) { - ScRefHandlerCaller *pOldHandler = m_pHandler; + ScRefHandlerCaller *pOldHandler = m_pHandler; m_pHandler = pNewHandler; return pOldHandler; } - void SetRefInputStartPreHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPreHdl = pNewHdl; } - void SetRefInputDonePostHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePostHdl = pNewHdl; } - void SetRefInputStartPostHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPostHdl = pNewHdl; } - void SetRefInputDonePreHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePreHdl = pNewHdl; } + void SetRefInputStartPreHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPreHdl = pNewHdl; } + void SetRefInputDonePostHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePostHdl = pNewHdl; } + void SetRefInputStartPostHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPostHdl = pNewHdl; } + void SetRefInputDonePreHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePreHdl = pNewHdl; } - ScRefHandlerHelper():m_pHandler(NULL), m_pSetReferenceHdl( NULL ), m_pSetActiveHdl(NULL), m_pRefInputStartPreHdl( NULL ), m_pRefInputStartPostHdl( NULL ), m_pRefInputDonePreHdl( NULL ), m_pRefInputDonePostHdl( NULL ){} + ScRefHandlerHelper():m_pHandler(NULL), m_pSetReferenceHdl( NULL ), m_pSetActiveHdl(NULL), m_pRefInputStartPreHdl( NULL ), m_pRefInputStartPostHdl( NULL ), m_pRefInputDonePreHdl( NULL ), m_pRefInputDonePostHdl( NULL ){} }; //-->Added by PengYunQuan for Validity Cell Range Picker @@ -96,17 +96,17 @@ class ScValidationDlg :public ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false //-->Modified by PengYunQuan for Validity Cell Range Picker { //<!--Added by PengYunQuan for Validity Cell Range Picker - typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase; + typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase; //Start_Moddify by liliang 03/26/2008 SODC_13677_2 DECL_LINK( OkHdl, Button * ); //End_Moddify by liliang 03/26/2008 SODC_13677_2 - bool m_bOwnRefHdlr:1; + bool m_bOwnRefHdlr:1; ScTabViewShell *m_pTabVwSh; - bool m_bRefInputting:1; - bool EnterRefStatus(); - bool LeaveRefStatus(); + bool m_bRefInputting:1; + bool EnterRefStatus(); + bool LeaveRefStatus(); //-->Added by PengYunQuan for Validity Cell Range Picker public: //<!--Modified by PengYunQuan for Validity Cell Range Picker @@ -116,13 +116,13 @@ public: //<!--Added by PengYunQuan for Validity Cell Range Picker virtual ~ScValidationDlg(); inline static ScValidationDlg * Find1AliveObject( Window *pAncestor ); - bool IsAlive(); - inline ScTabViewShell * GetTabViewShell(); + bool IsAlive(); + inline ScTabViewShell * GetTabViewShell(); - bool SetupRefDlg(); - bool RemoveRefDlg( BOOL bRestoreModal = TRUE ); + bool SetupRefDlg(); + bool RemoveRefDlg( BOOL bRestoreModal = TRUE ); - virtual void SetModal( BOOL bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } + virtual void SetModal( BOOL bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) { @@ -136,7 +136,7 @@ public: (m_pHandler->*m_pSetActiveHdl)(); } - void CloseRefDialog() + void CloseRefDialog() { DBG_ASSERT( false, "should not execute here!!!when the edit kill focus, should remove refhandler.\r\n" ); @@ -146,7 +146,7 @@ public: Close(); } - bool IsRefInputting(){ return m_bRefInputting; } + bool IsRefInputting(){ return m_bRefInputting; } virtual void RefInputStart( ScRefEdit* pEdit, ScRefButton* pButton = NULL ) { @@ -244,8 +244,8 @@ private: //<!--Added by PengYunQuan for Validity Cell Range Picker DECL_LINK( EditSetFocusHdl, Edit *); DECL_LINK( KillFocusHdl, Window *); - void OnClick( Button *pBtn ); - ScRefEdit *m_pRefEdit; + void OnClick( Button *pBtn ); + ScRefEdit *m_pRefEdit; class ScRefButtonEx:public ::ScRefButton { void Click(); @@ -255,18 +255,18 @@ private: friend class ScRefButtonEx; void SetReferenceHdl( const ScRange& , ScDocument* ); void SetActiveHdl(); - void RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton ); - void RefInputDonePreHdl(); - void RefInputDonePostHdl(); + void RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton ); + void RefInputDonePreHdl(); + void RefInputDonePostHdl(); ScValidationDlg * GetValidationDlg(); //TYPEINFO(); - void TidyListBoxes(); + void TidyListBoxes(); public: - USHORT GetAllowEntryPos(); - String GetMinText(); - void SetupRefDlg(); - void RemoveRefDlg(); + USHORT GetAllowEntryPos(); + String GetMinText(); + void SetupRefDlg(); + void RemoveRefDlg(); //-->Added by PengYunQuan for Validity Cell Range Picker }; @@ -276,16 +276,16 @@ public: class ScTPValidationHelp : public SfxTabPage { private: - TriStateBox aTsbHelp; + TriStateBox aTsbHelp; FixedLine aFlContent; - FixedText aFtTitle; - Edit aEdtTitle; - FixedText aFtInputHelp; - MultiLineEdit aEdInputHelp; + FixedText aFtTitle; + Edit aEdtTitle; + FixedText aFtInputHelp; + MultiLineEdit aEdInputHelp; const SfxItemSet& mrArgSet; - void Init(); + void Init(); // Handler ------------------------ // DECL_LINK( SelectHdl, ListBox * ); @@ -294,10 +294,10 @@ public: ScTPValidationHelp( Window* pParent, const SfxItemSet& rArgSet ); ~ScTPValidationHelp(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //================================================================== @@ -305,19 +305,19 @@ public: class ScTPValidationError : public SfxTabPage { private: - TriStateBox aTsbShow; + TriStateBox aTsbShow; FixedLine aFlContent; - FixedText aFtAction; - ListBox aLbAction; - PushButton aBtnSearch; - FixedText aFtTitle; - Edit aEdtTitle; - FixedText aFtError; - MultiLineEdit aEdError; + FixedText aFtAction; + ListBox aLbAction; + PushButton aBtnSearch; + FixedText aFtTitle; + Edit aEdtTitle; + FixedText aFtError; + MultiLineEdit aEdError; const SfxItemSet& mrArgSet; - void Init(); + void Init(); // Handler ------------------------ DECL_LINK( SelectActionHdl, ListBox * ); @@ -327,10 +327,10 @@ public: ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet ); ~ScTPValidationError(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //<!--Added by PengYunQuan for Validity Cell Range Picker diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index e754c8346294..bd3893afb3d4 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.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 @@ -36,16 +36,16 @@ // --------------------------------------------------------------------------- -#define SC_SLIDER_SIZE 2 -#define SC_SMALL3DSHADOW COL_BLACK -#define SC_SIZE_NONE 65535 +#define SC_SLIDER_SIZE 2 +#define SC_SMALL3DSHADOW COL_BLACK +#define SC_SIZE_NONE 65535 const SCCOL SC_TABSTART_NONE = SCCOL_MAX; -#define SC_FILL_NONE 0 -#define SC_FILL_FILL 1 -#define SC_FILL_EMBED_LT 2 -#define SC_FILL_EMBED_RB 3 -#define SC_FILL_MATRIX 4 +#define SC_FILL_NONE 0 +#define SC_FILL_FILL 1 +#define SC_FILL_EMBED_LT 2 +#define SC_FILL_EMBED_RB 3 +#define SC_FILL_MATRIX 4 enum ScSplitMode { SC_SPLIT_NONE = 0, SC_SPLIT_NORMAL, SC_SPLIT_FIX }; @@ -58,10 +58,10 @@ inline ScVSplitPos WhichV( ScSplitPos ePos ); inline ScSplitPos Which( ScHSplitPos eHPos ); inline ScSplitPos Which( ScVSplitPos eVPos ); -// Bildschirmverhalten bei Cursorbewegungen: +// Bildschirmverhalten bei Cursorbewegungen: enum ScFollowMode { SC_FOLLOW_NONE, SC_FOLLOW_LINE, SC_FOLLOW_FIX, SC_FOLLOW_JUMP }; -// Mausmodi um Bereiche zu selektieren +// Mausmodi um Bereiche zu selektieren enum ScRefType { SC_REFTYPE_NONE, SC_REFTYPE_REF, SC_REFTYPE_FILL, SC_REFTYPE_EMBED_LT, SC_REFTYPE_EMBED_RB }; @@ -114,7 +114,7 @@ class ScViewData; //-------------------------------------------------------------------------- -class ScViewDataTable // Daten pro Tabelle +class ScViewDataTable // Daten pro Tabelle { friend class ScViewData; private: @@ -124,32 +124,32 @@ private: Fraction aPageZoomX; // zoom in page break preview mode Fraction aPageZoomY; - long nTPosX[2]; // MapMode - Offset (Twips) - long nTPosY[2]; - long nMPosX[2]; // MapMode - Offset (1/100 mm) - long nMPosY[2]; - long nPixPosX[2]; // Offset in Pixeln - long nPixPosY[2]; - long nHSplitPos; - long nVSplitPos; - - ScSplitMode eHSplitMode; - ScSplitMode eVSplitMode; - ScSplitPos eWhichActive; - - SCCOL nFixPosX; // Zellposition des Splitters beim Fixieren - SCROW nFixPosY; - - SCCOL nCurX; - SCROW nCurY; - SCCOL nOldCurX; - SCROW nOldCurY; - SCCOL nPosX[2]; - SCROW nPosY[2]; + long nTPosX[2]; // MapMode - Offset (Twips) + long nTPosY[2]; + long nMPosX[2]; // MapMode - Offset (1/100 mm) + long nMPosY[2]; + long nPixPosX[2]; // Offset in Pixeln + long nPixPosY[2]; + long nHSplitPos; + long nVSplitPos; + + ScSplitMode eHSplitMode; + ScSplitMode eVSplitMode; + ScSplitPos eWhichActive; + + SCCOL nFixPosX; // Zellposition des Splitters beim Fixieren + SCROW nFixPosY; + + SCCOL nCurX; + SCROW nCurY; + SCCOL nOldCurX; + SCROW nOldCurY; + SCCOL nPosX[2]; + SCROW nPosY[2]; bool bShowGrid; // per-sheet show grid-lines option. - BOOL bOldCurValid; // "virtuelle" Cursorpos. bei zusammengefassten + BOOL bOldCurValid; // "virtuelle" Cursorpos. bei zusammengefassten ScViewDataTable(); ~ScViewDataTable(); @@ -168,26 +168,26 @@ private: class SC_DLLPUBLIC ScViewData { private: - double nPPTX, nPPTY; // Scaling-Faktoren + double nPPTX, nPPTY; // Scaling-Faktoren - ScViewDataTable* pTabData[MAXTABCOUNT]; - ScViewDataTable* pThisTab; // Daten der angezeigten Tabelle - ScDocShell* pDocShell; - ScDocument* pDoc; - ScDBFunc* pView; - ScTabViewShell* pViewShell; - EditView* pEditView[4]; // gehoert dem Fenster - ScViewOptions* pOptions; - EditView* pSpellingView; + ScViewDataTable* pTabData[MAXTABCOUNT]; + ScViewDataTable* pThisTab; // Daten der angezeigten Tabelle + ScDocShell* pDocShell; + ScDocument* pDoc; + ScDBFunc* pView; + ScTabViewShell* pViewShell; + EditView* pEditView[4]; // gehoert dem Fenster + ScViewOptions* pOptions; + EditView* pSpellingView; - ScMarkData aMarkData; + ScMarkData aMarkData; - long nEditMargin; + long nEditMargin; - Size aScenButSize; // Groesse eines Szenario-Buttons + Size aScenButSize; // Groesse eines Szenario-Buttons - Size aScrSize; - MapMode aLogicMode; // skalierter 1/100mm-MapMode + Size aScrSize; + MapMode aLogicMode; // skalierter 1/100mm-MapMode SvxZoomType eDefZoomType; // default zoom and type for missing TabData Fraction aDefZoomX; @@ -195,44 +195,44 @@ private: Fraction aDefPageZoomX; // zoom in page break preview mode Fraction aDefPageZoomY; - ScRefType eRefType; - - SCTAB nTabNo; // angezeigte Tabelle - SCTAB nRefTabNo; // Tabelle auf die sich RefInput bezieht - SCCOL nRefStartX; - SCROW nRefStartY; - SCTAB nRefStartZ; - SCCOL nRefEndX; - SCROW nRefEndY; - SCTAB nRefEndZ; - SCCOL nFillStartX; // Fill-Cursor - SCROW nFillStartY; - SCCOL nFillEndX; - SCROW nFillEndY; - SCCOL nEditCol; // Position dazu - SCROW nEditRow; - SCCOL nEditStartCol; - SCCOL nEditEndCol; // Ende der Edit-View - SCROW nEditEndRow; - SCCOL nTabStartCol; // fuer Enter nach Tab - ScRange aDelRange; // fuer AutoFill-Loeschen + ScRefType eRefType; + + SCTAB nTabNo; // angezeigte Tabelle + SCTAB nRefTabNo; // Tabelle auf die sich RefInput bezieht + SCCOL nRefStartX; + SCROW nRefStartY; + SCTAB nRefStartZ; + SCCOL nRefEndX; + SCROW nRefEndY; + SCTAB nRefEndZ; + SCCOL nFillStartX; // Fill-Cursor + SCROW nFillStartY; + SCCOL nFillEndX; + SCROW nFillEndY; + SCCOL nEditCol; // Position dazu + SCROW nEditRow; + SCCOL nEditStartCol; + SCCOL nEditEndCol; // Ende der Edit-View + SCROW nEditEndRow; + SCCOL nTabStartCol; // fuer Enter nach Tab + ScRange aDelRange; // fuer AutoFill-Loeschen ScPasteFlags nPasteFlags; ScSplitPos eEditActivePart; // the part that was active when edit mode was started - BOOL bEditActive[4]; // aktiv? - BOOL bActive; // aktives Fenster ? - BOOL bIsRefMode; // Referenzeingabe - BOOL bDelMarkValid; // nur gueltig bei SC_REFTYPE_FILL - BYTE nFillMode; // Modus - BOOL bPagebreak; // Seitenumbruch-Vorschaumodus + BOOL bEditActive[4]; // aktiv? + BOOL bActive; // aktives Fenster ? + BOOL bIsRefMode; // Referenzeingabe + BOOL bDelMarkValid; // nur gueltig bei SC_REFTYPE_FILL + BYTE nFillMode; // Modus + BOOL bPagebreak; // Seitenumbruch-Vorschaumodus - BOOL bSelCtrlMouseClick; // special selection handling for ctrl-mouse-click + BOOL bSelCtrlMouseClick; // special selection handling for ctrl-mouse-click SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, EditStatus*); SC_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*); - SC_DLLPRIVATE void CalcPPT(); + SC_DLLPRIVATE void CalcPPT(); SC_DLLPRIVATE void CreateTabData( SCTAB nNewTab ); SC_DLLPRIVATE void CreateTabData( std::vector< SCTAB >& rvTabs ); SC_DLLPRIVATE void CreateSelectedTabData(); @@ -242,82 +242,82 @@ public: ScViewData( const ScViewData& rViewData ); ~ScViewData(); - void InitData( ScDocument* pDocument ); + void InitData( ScDocument* pDocument ); - ScDocShell* GetDocShell() const { return pDocShell; } - ScDBFunc* GetView() const { return pView; } - ScTabViewShell* GetViewShell() const { return pViewShell; } + ScDocShell* GetDocShell() const { return pDocShell; } + ScDBFunc* GetView() const { return pView; } + ScTabViewShell* GetViewShell() const { return pViewShell; } SfxObjectShell* GetSfxDocShell() const; - SfxBindings& GetBindings(); // from ViewShell's ViewFrame - SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame + SfxBindings& GetBindings(); // from ViewShell's ViewFrame + SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame - ScMarkData& GetMarkData() { return aMarkData; } + ScMarkData& GetMarkData() { return aMarkData; } const ScMarkData& GetMarkData() const { return aMarkData; } - Window* GetDialogParent(); // von tabvwsh weitergeleitet - Window* GetActiveWin(); // von View - ScDrawView* GetScDrawView(); // von View - BOOL IsMinimized(); // von View + Window* GetDialogParent(); // von tabvwsh weitergeleitet + Window* GetActiveWin(); // von View + ScDrawView* GetScDrawView(); // von View + BOOL IsMinimized(); // von View - void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE ); + void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE ); - void WriteUserData(String& rData); - void ReadUserData(const String& rData); + void WriteUserData(String& rData); + void ReadUserData(const String& rData); void WriteExtOptions( ScExtDocOptions& rOpt ) const; void ReadExtOptions( const ScExtDocOptions& rOpt ); - void WriteUserDataSequence(com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); - void ReadUserDataSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); - - ScDocument* GetDocument() const; - - void SetViewShell( ScTabViewShell* pViewSh ); - - BOOL IsActive() const { return bActive; } - void Activate(BOOL bActivate) { bActive = bActivate; } - - void UpdateThis(); - - void InsertTab( SCTAB nTab ); - void DeleteTab( SCTAB nTab ); - void CopyTab( SCTAB nSrcTab, SCTAB nDestTab ); - void MoveTab( SCTAB nSrcTab, SCTAB nDestTab ); - - SCTAB GetRefTabNo() const { return nRefTabNo; } - void SetRefTabNo( SCTAB nNewTab ) { nRefTabNo = nNewTab; } - - SCTAB GetTabNo() const { return nTabNo; } - ScSplitPos GetActivePart() const { return pThisTab->eWhichActive; } - SCCOL GetPosX( ScHSplitPos eWhich ) const { return pThisTab->nPosX[eWhich]; } - SCROW GetPosY( ScVSplitPos eWhich ) const { return pThisTab->nPosY[eWhich]; } - SCCOL GetCurX() const { return pThisTab->nCurX; } - SCROW GetCurY() const { return pThisTab->nCurY; } - BOOL HasOldCursor() const { return pThisTab->bOldCurValid; } - SCCOL GetOldCurX() const; - SCROW GetOldCurY() const; - ScSplitMode GetHSplitMode() const { return pThisTab->eHSplitMode; } - ScSplitMode GetVSplitMode() const { return pThisTab->eVSplitMode; } - long GetHSplitPos() const { return pThisTab->nHSplitPos; } - long GetVSplitPos() const { return pThisTab->nVSplitPos; } - SCCOL GetFixPosX() const { return pThisTab->nFixPosX; } - SCROW GetFixPosY() const { return pThisTab->nFixPosY; } - BOOL IsPagebreakMode() const { return bPagebreak; } + void WriteUserDataSequence(com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); + void ReadUserDataSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); + + ScDocument* GetDocument() const; + + void SetViewShell( ScTabViewShell* pViewSh ); + + BOOL IsActive() const { return bActive; } + void Activate(BOOL bActivate) { bActive = bActivate; } + + void UpdateThis(); + + void InsertTab( SCTAB nTab ); + void DeleteTab( SCTAB nTab ); + void CopyTab( SCTAB nSrcTab, SCTAB nDestTab ); + void MoveTab( SCTAB nSrcTab, SCTAB nDestTab ); + + SCTAB GetRefTabNo() const { return nRefTabNo; } + void SetRefTabNo( SCTAB nNewTab ) { nRefTabNo = nNewTab; } + + SCTAB GetTabNo() const { return nTabNo; } + ScSplitPos GetActivePart() const { return pThisTab->eWhichActive; } + SCCOL GetPosX( ScHSplitPos eWhich ) const { return pThisTab->nPosX[eWhich]; } + SCROW GetPosY( ScVSplitPos eWhich ) const { return pThisTab->nPosY[eWhich]; } + SCCOL GetCurX() const { return pThisTab->nCurX; } + SCROW GetCurY() const { return pThisTab->nCurY; } + BOOL HasOldCursor() const { return pThisTab->bOldCurValid; } + SCCOL GetOldCurX() const; + SCROW GetOldCurY() const; + ScSplitMode GetHSplitMode() const { return pThisTab->eHSplitMode; } + ScSplitMode GetVSplitMode() const { return pThisTab->eVSplitMode; } + long GetHSplitPos() const { return pThisTab->nHSplitPos; } + long GetVSplitPos() const { return pThisTab->nVSplitPos; } + SCCOL GetFixPosX() const { return pThisTab->nFixPosX; } + SCROW GetFixPosY() const { return pThisTab->nFixPosY; } + BOOL IsPagebreakMode() const { return bPagebreak; } bool IsPasteMode() const { return nPasteFlags & SC_PASTE_MODE; } bool ShowPasteSource() const { return nPasteFlags & SC_PASTE_BORDER; } - void SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX ); - void SetPosY( ScVSplitPos eWhich, SCROW nNewPosY ); - void SetCurX( SCCOL nNewCurX ) { pThisTab->nCurX = nNewCurX; } - void SetCurY( SCROW nNewCurY ) { pThisTab->nCurY = nNewCurY; } - void SetOldCursor( SCCOL nNewX, SCROW nNewY ); - void ResetOldCursor(); - void SetHSplitMode( ScSplitMode eMode ) { pThisTab->eHSplitMode = eMode; } - void SetVSplitMode( ScSplitMode eMode ) { pThisTab->eVSplitMode = eMode; } - void SetHSplitPos( long nPos ) { pThisTab->nHSplitPos = nPos; } - void SetVSplitPos( long nPos ) { pThisTab->nVSplitPos = nPos; } - void SetFixPosX( SCCOL nPos ) { pThisTab->nFixPosX = nPos; } - void SetFixPosY( SCROW nPos ) { pThisTab->nFixPosY = nPos; } - void SetPagebreakMode( BOOL bSet ); + void SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX ); + void SetPosY( ScVSplitPos eWhich, SCROW nNewPosY ); + void SetCurX( SCCOL nNewCurX ) { pThisTab->nCurX = nNewCurX; } + void SetCurY( SCROW nNewCurY ) { pThisTab->nCurY = nNewCurY; } + void SetOldCursor( SCCOL nNewX, SCROW nNewY ); + void ResetOldCursor(); + void SetHSplitMode( ScSplitMode eMode ) { pThisTab->eHSplitMode = eMode; } + void SetVSplitMode( ScSplitMode eMode ) { pThisTab->eVSplitMode = eMode; } + void SetHSplitPos( long nPos ) { pThisTab->nHSplitPos = nPos; } + void SetVSplitPos( long nPos ) { pThisTab->nVSplitPos = nPos; } + void SetFixPosX( SCCOL nPos ) { pThisTab->nFixPosX = nPos; } + void SetFixPosY( SCROW nPos ) { pThisTab->nFixPosY = nPos; } + void SetPagebreakMode( BOOL bSet ); void SetPasteMode ( ScPasteFlags nFlags ) { nPasteFlags = nFlags; } void SetZoomType( SvxZoomType eNew, BOOL bAll ); @@ -326,188 +326,188 @@ public: void SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll ); void RefreshZoom(); - void SetSelCtrlMouseClick( BOOL bTmp ) { bSelCtrlMouseClick = bTmp; } + void SetSelCtrlMouseClick( BOOL bTmp ) { bSelCtrlMouseClick = bTmp; } SvxZoomType GetZoomType() const { return pThisTab->eZoomType; } - const Fraction& GetZoomX() const { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; } - const Fraction& GetZoomY() const { return bPagebreak ? pThisTab->aPageZoomY : pThisTab->aZoomY; } + const Fraction& GetZoomX() const { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; } + const Fraction& GetZoomY() const { return bPagebreak ? pThisTab->aPageZoomY : pThisTab->aZoomY; } void SetShowGrid( bool bShow ); bool GetShowGrid() const { return pThisTab->bShowGrid; } - const MapMode& GetLogicMode( ScSplitPos eWhich ); - const MapMode& GetLogicMode(); // Offset 0 + const MapMode& GetLogicMode( ScSplitPos eWhich ); + const MapMode& GetLogicMode(); // Offset 0 - long GetTPosX( ScHSplitPos eWhich ) const { return pThisTab->nTPosX[eWhich]; } - long GetTPosY( ScVSplitPos eWhich ) const { return pThisTab->nTPosY[eWhich]; } + long GetTPosX( ScHSplitPos eWhich ) const { return pThisTab->nTPosX[eWhich]; } + long GetTPosY( ScVSplitPos eWhich ) const { return pThisTab->nTPosY[eWhich]; } - double GetPPTX() const { return nPPTX; } - double GetPPTY() const { return nPPTY; } + double GetPPTX() const { return nPPTX; } + double GetPPTY() const { return nPPTY; } ScMarkType GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab, SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const; ScMarkType GetSimpleArea( ScRange& rRange ) const; /// May modify rNewMark using MarkToSimple(). ScMarkType GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const; - void GetMultiArea( ScRangeListRef& rRange ) const; + void GetMultiArea( ScRangeListRef& rRange ) const; - BOOL SimpleColMarked(); - BOOL SimpleRowMarked(); + BOOL SimpleColMarked(); + BOOL SimpleRowMarked(); - BOOL IsMultiMarked(); + BOOL IsMultiMarked(); - void SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + void SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BYTE nMode ); - void GetFillData( SCCOL& rStartCol, SCROW& rStartRow, + void GetFillData( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); - void ResetFillMode(); - BOOL IsAnyFillMode() { return nFillMode != SC_FILL_NONE; } - BOOL IsFillMode() { return nFillMode == SC_FILL_FILL; } - BYTE GetFillMode() { return nFillMode; } + void ResetFillMode(); + BOOL IsAnyFillMode() { return nFillMode != SC_FILL_NONE; } + BOOL IsFillMode() { return nFillMode == SC_FILL_FILL; } + BYTE GetFillMode() { return nFillMode; } // TRUE: Zelle ist zusammengefasst - BOOL GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ); - BOOL GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, + BOOL GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ); + BOOL GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, SCsCOL& rPosX, SCsROW& rPosY, BOOL bTestMerge = TRUE, BOOL bRepair = FALSE, BOOL bNextIfLarge = TRUE ); - void GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich, + void GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich, SCsCOL nPosX, SCsROW nPosY, BOOL& rLeft, BOOL& rTop ); - BOOL IsRefMode() const { return bIsRefMode; } - ScRefType GetRefType() const { return eRefType; } - SCCOL GetRefStartX() const { return nRefStartX; } - SCROW GetRefStartY() const { return nRefStartY; } - SCTAB GetRefStartZ() const { return nRefStartZ; } - SCCOL GetRefEndX() const { return nRefEndX; } - SCROW GetRefEndY() const { return nRefEndY; } - SCTAB GetRefEndZ() const { return nRefEndZ; } + BOOL IsRefMode() const { return bIsRefMode; } + ScRefType GetRefType() const { return eRefType; } + SCCOL GetRefStartX() const { return nRefStartX; } + SCROW GetRefStartY() const { return nRefStartY; } + SCTAB GetRefStartZ() const { return nRefStartZ; } + SCCOL GetRefEndX() const { return nRefEndX; } + SCROW GetRefEndY() const { return nRefEndY; } + SCTAB GetRefEndZ() const { return nRefEndZ; } - void SetRefMode( BOOL bNewMode, ScRefType eNewType ) + void SetRefMode( BOOL bNewMode, ScRefType eNewType ) { bIsRefMode = bNewMode; eRefType = eNewType; } - void SetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ ) + void SetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ ) { nRefStartX = nNewX; nRefStartY = nNewY; nRefStartZ = nNewZ; } - void SetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ ) + void SetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ ) { nRefEndX = nNewX; nRefEndY = nNewY; nRefEndZ = nNewZ; } - void ResetDelMark() { bDelMarkValid = FALSE; } - void SetDelMark( const ScRange& rRange ) + void ResetDelMark() { bDelMarkValid = FALSE; } + void SetDelMark( const ScRange& rRange ) { aDelRange = rRange; bDelMarkValid = TRUE; } - BOOL GetDelMark( ScRange& rRange ) const + BOOL GetDelMark( ScRange& rRange ) const { rRange = aDelRange; return bDelMarkValid; } - inline void GetMoveCursor( SCCOL& rCurX, SCROW& rCurY ); - - const ScViewOptions& GetOptions() const { return *pOptions; } - void SetOptions( const ScViewOptions& rOpt ); - - BOOL IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); } - void SetGridMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); } - BOOL IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); } - void SetSyntaxMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); } - BOOL IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); } - void SetHeaderMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); } - BOOL IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); } - void SetTabMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); } - BOOL IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); } - void SetVScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); } - BOOL IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); } - void SetHScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); } - BOOL IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); } - void SetOutlineMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); } - - void KillEditView(); - void ResetEditView(); - void SetEditEngine( ScSplitPos eWhich, + inline void GetMoveCursor( SCCOL& rCurX, SCROW& rCurY ); + + const ScViewOptions& GetOptions() const { return *pOptions; } + void SetOptions( const ScViewOptions& rOpt ); + + BOOL IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); } + void SetGridMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); } + BOOL IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); } + void SetSyntaxMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); } + BOOL IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); } + void SetHeaderMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); } + BOOL IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); } + void SetTabMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); } + BOOL IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); } + void SetVScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); } + BOOL IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); } + void SetHScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); } + BOOL IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); } + void SetOutlineMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); } + + void KillEditView(); + void ResetEditView(); + void SetEditEngine( ScSplitPos eWhich, ScEditEngineDefaulter* pNewEngine, Window* pWin, SCCOL nNewX, SCROW nNewY ); - void GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow ); - BOOL HasEditView( ScSplitPos eWhich ) const + void GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow ); + BOOL HasEditView( ScSplitPos eWhich ) const { return pEditView[eWhich] && bEditActive[eWhich]; } - EditView* GetEditView( ScSplitPos eWhich ) const + EditView* GetEditView( ScSplitPos eWhich ) const { return pEditView[eWhich]; } - void EditGrowX(); - void EditGrowY( BOOL bInitial = FALSE ); + void EditGrowX(); + void EditGrowY( BOOL bInitial = FALSE ); ScSplitPos GetEditActivePart() const { return eEditActivePart; } - SCCOL GetEditViewCol() const { return nEditCol; } - SCROW GetEditViewRow() const { return nEditRow; } - SCCOL GetEditStartCol() const { return nEditStartCol; } - SCROW GetEditStartRow() const { return nEditRow; } // never editing above the cell - SCCOL GetEditEndCol() const { return nEditEndCol; } - SCROW GetEditEndRow() const { return nEditEndRow; } - - Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin, + SCCOL GetEditViewCol() const { return nEditCol; } + SCROW GetEditViewRow() const { return nEditRow; } + SCCOL GetEditStartCol() const { return nEditStartCol; } + SCROW GetEditStartRow() const { return nEditRow; } // never editing above the cell + SCCOL GetEditEndCol() const { return nEditEndCol; } + SCROW GetEditEndRow() const { return nEditEndRow; } + + Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin, const ScPatternAttr* pPattern, BOOL bForceToTop ); - void SetTabNo( SCTAB nNewTab ); - void SetActivePart( ScSplitPos eNewActive ); + void SetTabNo( SCTAB nNewTab ); + void SetActivePart( ScSplitPos eNewActive ); - Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, + Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, BOOL bAllowNeg = FALSE ) const; - Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScHSplitPos eWhich ) const; - Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) const; + Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScHSplitPos eWhich ) const; + Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) const; - SCCOL CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeY = SC_SIZE_NONE ) const; - SCROW CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHORT nScrSizeX = SC_SIZE_NONE ) const; + SCCOL CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeY = SC_SIZE_NONE ) const; + SCROW CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHORT nScrSizeX = SC_SIZE_NONE ) const; - SCCOL VisibleCellsX( ScHSplitPos eWhichX ) const; // angezeigte komplette Zellen - SCROW VisibleCellsY( ScVSplitPos eWhichY ) const; - SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der vorgehenden Seite - SCROW PrevCellsY( ScVSplitPos eWhichY ) const; + SCCOL VisibleCellsX( ScHSplitPos eWhichX ) const; // angezeigte komplette Zellen + SCROW VisibleCellsY( ScVSplitPos eWhichY ) const; + SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der vorgehenden Seite + SCROW PrevCellsY( ScVSplitPos eWhichY ) const; - BOOL IsOle(); - void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void SetScreen( const Rectangle& rVisArea ); - void SetScreenPos( const Point& rVisAreaStart ); + BOOL IsOle(); + void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); + void SetScreen( const Rectangle& rVisArea ); + void SetScreenPos( const Point& rVisAreaStart ); - void UpdateScreenZoom( const Fraction& rNewX, const Fraction& rNewY ); + void UpdateScreenZoom( const Fraction& rNewX, const Fraction& rNewY ); - Size GetScrSize() const { return aScrSize; } + Size GetScrSize() const { return aScrSize; } - void RecalcPixPos(); - Point GetPixPos( ScSplitPos eWhich ) const + void RecalcPixPos(); + Point GetPixPos( ScSplitPos eWhich ) const { return Point( pThisTab->nPixPosX[WhichH(eWhich)], pThisTab->nPixPosY[WhichV(eWhich)] ); } - void SetSpellingView( EditView* pSpView) { pSpellingView = pSpView; } - EditView* GetSpellingView() const { return pSpellingView; } + void SetSpellingView( EditView* pSpView) { pSpellingView = pSpView; } + EditView* GetSpellingView() const { return pSpellingView; } - void UpdateOutlinerFlags( Outliner& rOutl ) const; + void UpdateOutlinerFlags( Outliner& rOutl ) const; - Point GetMousePosPixel(); + Point GetMousePosPixel(); - BOOL UpdateFixX(SCTAB nTab = MAXTAB+1); - BOOL UpdateFixY(SCTAB nTab = MAXTAB+1); + BOOL UpdateFixX(SCTAB nTab = MAXTAB+1); + BOOL UpdateFixY(SCTAB nTab = MAXTAB+1); - SCCOL GetTabStartCol() const { return nTabStartCol; } - void SetTabStartCol(SCCOL nNew) { nTabStartCol = nNew; } + SCCOL GetTabStartCol() const { return nTabStartCol; } + void SetTabStartCol(SCCOL nNew) { nTabStartCol = nNew; } - ScAddress GetCurPos() const; + ScAddress GetCurPos() const; - const Size& GetScenButSize() const { return aScenButSize; } - void SetScenButSize(const Size& rNew) { aScenButSize = rNew; } + const Size& GetScenButSize() const { return aScenButSize; } + void SetScenButSize(const Size& rNew) { aScenButSize = rNew; } - BOOL IsSelCtrlMouseClick() { return bSelCtrlMouseClick; } + BOOL IsSelCtrlMouseClick() { return bSelCtrlMouseClick; } static inline long ToPixel( USHORT nTwips, double nFactor ); - /** while (rScrY <= nEndPixels && rPosY <= nEndRow) add pixels of row - heights converted with nPPTY to rScrY, optimized for row height - segments. Upon return rPosY is the last row evaluated <= nEndRow, rScrY - may be > nEndPixels! + /** while (rScrY <= nEndPixels && rPosY <= nEndRow) add pixels of row + heights converted with nPPTY to rScrY, optimized for row height + segments. Upon return rPosY is the last row evaluated <= nEndRow, rScrY + may be > nEndPixels! */ static void AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY, SCROW nEndRow, double nPPTY, const ScDocument * pDoc, SCTAB nTabNo ); - /** while (rScrY <= nEndPixels && rPosY >= nStartRow) add pixels of row - heights converted with nPPTY to rScrY, optimized for row height - segments. Upon return rPosY is the last row evaluated >= nStartRow, - rScrY may be > nEndPixels! + /** while (rScrY <= nEndPixels && rPosY >= nStartRow) add pixels of row + heights converted with nPPTY to rScrY, optimized for row height + segments. Upon return rPosY is the last row evaluated >= nStartRow, + rScrY may be > nEndPixels! */ static void AddPixelsWhileBackward( long & rScrY, long nEndPixels, SCROW & rPosY, SCROW nStartRow, double nPPTY, diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index f231e91d3dd6..0cacc543308d 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -78,231 +78,231 @@ namespace com { namespace sun { namespace star { namespace datatransfer { class class ScViewFunc : public ScTabView { private: - ScAddress aFormatSource; // fuer automatisches Erweitern von Formatierung - ScRange aFormatArea; - BOOL bFormatValid; + ScAddress aFormatSource; // fuer automatisches Erweitern von Formatierung + ScRange aFormatArea; + BOOL bFormatValid; public: ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); ~ScViewFunc(); - const ScPatternAttr* GetSelectionPattern (); - void GetSelectionFrame ( SvxBoxItem& rLineOuter, - SvxBoxInfoItem& rLineInner ); + const ScPatternAttr* GetSelectionPattern (); + void GetSelectionFrame ( SvxBoxItem& rLineOuter, + SvxBoxInfoItem& rLineInner ); - BYTE GetSelectionScriptType(); + BYTE GetSelectionScriptType(); - BOOL GetAutoSumArea(ScRangeList& rRangeList); - void EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr); + BOOL GetAutoSumArea(ScRangeList& rRangeList); + void EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr); bool AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor, bool bContinue ); String GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr ); - void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, + void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, BOOL bRecord = TRUE, const EditTextObject* pData = NULL ); - void EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue ); - void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextObject* pData, + void EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue ); + void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextObject* pData, BOOL bRecord = TRUE, BOOL bTestSimple = FALSE ); - void EnterMatrix( const String& rString ); - void EnterBlock( const String& rString, const EditTextObject* pData ); + void EnterMatrix( const String& rString ); + void EnterBlock( const String& rString, const EditTextObject* pData ); - void EnterDataAtCursor( const String& rString ); //! nicht benutzt ? + void EnterDataAtCursor( const String& rString ); //! nicht benutzt ? - SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = NULL, BOOL bIncludeObjects = FALSE ); - SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc = NULL, BOOL bCut = FALSE, BOOL bApi = FALSE, + SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = NULL, BOOL bIncludeObjects = FALSE ); + SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc = NULL, BOOL bCut = FALSE, BOOL bApi = FALSE, BOOL bIncludeObjects = FALSE, BOOL bStopEdit = TRUE ); - SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc, const ScRange& rRange, BOOL bCut = FALSE, + SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc, const ScRange& rRange, BOOL bCut = FALSE, BOOL bApi = FALSE, BOOL bIncludeObjects = FALSE, BOOL bStopEdit = TRUE ); ScTransferObj* CopyToTransferable(); - SC_DLLPUBLIC BOOL PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, + SC_DLLPUBLIC BOOL PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, USHORT nFunction = PASTE_NOFUNC, BOOL bSkipEmpty = FALSE, BOOL bTranspose = FALSE, BOOL bAsLink = FALSE, InsCellCmd eMoveMode = INS_NONE, USHORT nUndoExtraFlags = IDF_NONE, BOOL bAllowDialogs = FALSE ); - void FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink ); + void FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink ); - SC_DLLPUBLIC void PasteFromSystem(); - SC_DLLPUBLIC BOOL PasteFromSystem( ULONG nFormatId, BOOL bApi = FALSE ); + SC_DLLPUBLIC void PasteFromSystem(); + SC_DLLPUBLIC BOOL PasteFromSystem( ULONG nFormatId, BOOL bApi = FALSE ); void PasteFromTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); - void PasteDraw(); - void PasteDraw( const Point& rLogicPos, SdrModel* pModel, + void PasteDraw(); + void PasteDraw( const Point& rLogicPos, SdrModel* pModel, BOOL bGroup = FALSE, BOOL bSameDocClipboard = FALSE ); - BOOL PasteOnDrawObject( const ::com::sun::star::uno::Reference< + BOOL PasteOnDrawObject( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, SdrObject* pHitObj, BOOL bLink ); - BOOL PasteDataFormat( ULONG nFormatId, + BOOL PasteDataFormat( ULONG nFormatId, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY, Point* pLogicPos = NULL, BOOL bLink = FALSE, BOOL bAllowDialogs = FALSE ); - BOOL PasteFile( const Point&, const String&, BOOL bLink=FALSE ); + BOOL PasteFile( const Point&, const String&, BOOL bLink=FALSE ); BOOL PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); - BOOL PasteBitmap( const Point&, const Bitmap& ); - BOOL PasteMetaFile( const Point&, const GDIMetaFile& ); - BOOL PasteGraphic( const Point& rPos, const Graphic& rGraphic, + BOOL PasteBitmap( const Point&, const Bitmap& ); + BOOL PasteMetaFile( const Point&, const GDIMetaFile& ); + BOOL PasteGraphic( const Point& rPos, const Graphic& rGraphic, const String& rFile, const String& rFilter ); - BOOL PasteBookmark( ULONG nFormatId, + BOOL PasteBookmark( ULONG nFormatId, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY ); - BOOL PasteDDE( const ::com::sun::star::uno::Reference< + BOOL PasteDDE( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); - BOOL ApplyGraphicToObject( SdrObject* pObject, const Graphic& rGraphic ); + BOOL ApplyGraphicToObject( SdrObject* pObject, const Graphic& rGraphic ); - void InsertBookmark( const String& rDescription, const String& rURL, + void InsertBookmark( const String& rDescription, const String& rURL, SCCOL nPosX, SCROW nPosY, const String* pTarget = NULL, BOOL bTryReplace = FALSE ); - BOOL HasBookmarkAtCursor( SvxHyperlinkItem* pContent ); + BOOL HasBookmarkAtCursor( SvxHyperlinkItem* pContent ); - long DropRequestHdl( Exchange* pExchange ); - BOOL MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, + long DropRequestHdl( Exchange* pExchange ); + BOOL MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi ); - BOOL LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi ); + BOOL LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi ); - void CreateNames( USHORT nFlags ); - USHORT GetCreateNameFlags(); - void InsertNameList(); - BOOL InsertName( const String& rName, const String& rSymbol, + void CreateNames( USHORT nFlags ); + USHORT GetCreateNameFlags(); + void InsertNameList(); + BOOL InsertName( const String& rName, const String& rSymbol, const String& rType ); - void ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, + void ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, BOOL bRecord = TRUE ); - void ApplyAttr( const SfxPoolItem& rAttrItem ); - void ApplySelectionPattern( const ScPatternAttr& rAttr, + void ApplyAttr( const SfxPoolItem& rAttrItem ); + void ApplySelectionPattern( const ScPatternAttr& rAttr, BOOL bRecord = TRUE, BOOL bCursorOnly = FALSE ); - void ApplyPatternLines( const ScPatternAttr& rAttr, + void ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner, BOOL bRecord = TRUE ); - void ApplyUserItemSet( const SfxItemSet& rItemSet ); + void ApplyUserItemSet( const SfxItemSet& rItemSet ); - const SfxStyleSheet* GetStyleSheetFromMarked(); - void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, + const SfxStyleSheet* GetStyleSheetFromMarked(); + void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, BOOL bRecord = TRUE ); - void RemoveStyleSheetInUse( SfxStyleSheet* pStyleSheet ); - void UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet ); + void RemoveStyleSheetInUse( SfxStyleSheet* pStyleSheet ); + void UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet ); - void SetNumberFormat( short nFormatType, ULONG nAdd = 0 ); - void SetNumFmtByStr( const String& rCode ); - void ChangeNumFmtDecimals( BOOL bIncrement ); + void SetNumberFormat( short nFormatType, ULONG nAdd = 0 ); + void SetNumFmtByStr( const String& rCode ); + void ChangeNumFmtDecimals( BOOL bIncrement ); - void SetConditionalFormat( const ScConditionalFormat& rNew ); - void SetValidation( const ScValidationData& rNew ); + void SetConditionalFormat( const ScConditionalFormat& rNew ); + void SetValidation( const ScValidationData& rNew ); - void ChangeIndent( BOOL bIncrement ); + void ChangeIndent( BOOL bIncrement ); - void ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ); + void ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ); - void Protect( SCTAB nTab, const String& rPassword ); - BOOL Unprotect( SCTAB nTab, const String& rPassword ); + void Protect( SCTAB nTab, const String& rPassword ); + BOOL Unprotect( SCTAB nTab, const String& rPassword ); - void DeleteCells( DelCellCmd eCmd, BOOL bRecord = TRUE ); - BOOL InsertCells( InsCellCmd eCmd, BOOL bRecord = TRUE, BOOL bPartOfPaste = FALSE ); - void DeleteMulti( BOOL bRows, BOOL bRecord = TRUE ); + void DeleteCells( DelCellCmd eCmd, BOOL bRecord = TRUE ); + BOOL InsertCells( InsCellCmd eCmd, BOOL bRecord = TRUE, BOOL bPartOfPaste = FALSE ); + void DeleteMulti( BOOL bRows, BOOL bRecord = TRUE ); - void DeleteContents( USHORT nFlags, BOOL bRecord = TRUE ); + void DeleteContents( USHORT nFlags, BOOL bRecord = TRUE ); - void SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, + void SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, ScSizeMode eMode, USHORT nSizeTwips, BOOL bRecord = TRUE, BOOL bPaint = TRUE, ScMarkData* pMarkData = NULL ); - void SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips, + void SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - void ShowMarkedColumns( BOOL bShow, BOOL bRecord = TRUE ); - void ShowMarkedRows( BOOL bShow, BOOL bRecord = TRUE ); + void ShowMarkedColumns( BOOL bShow, BOOL bRecord = TRUE ); + void ShowMarkedRows( BOOL bShow, BOOL bRecord = TRUE ); - BOOL AdjustBlockHeight( BOOL bPaint = TRUE, ScMarkData* pMarkData = NULL ); - BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint = TRUE ); + BOOL AdjustBlockHeight( BOOL bPaint = TRUE, ScMarkData* pMarkData = NULL ); + BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint = TRUE ); - void ModifyCellSize( ScDirection eDir, BOOL bOptimal ); + void ModifyCellSize( ScDirection eDir, BOOL bOptimal ); - SC_DLLPUBLIC void InsertPageBreak( BOOL bColumn, BOOL bRecord = TRUE, + SC_DLLPUBLIC void InsertPageBreak( BOOL bColumn, BOOL bRecord = TRUE, const ScAddress* pPos = NULL, BOOL bSetModified = TRUE ); - SC_DLLPUBLIC void DeletePageBreak( BOOL bColumn, BOOL bRecord = TRUE, + SC_DLLPUBLIC void DeletePageBreak( BOOL bColumn, BOOL bRecord = TRUE, const ScAddress* pPos = NULL, BOOL bSetModified = TRUE ); - void RemoveManualBreaks(); + void RemoveManualBreaks(); - void SetPrintZoom(USHORT nScale, USHORT nPages); - void AdjustPrintZoom(); + void SetPrintZoom(USHORT nScale, USHORT nPages); + void AdjustPrintZoom(); - BOOL TestMergeCells(); - BOOL TestRemoveMerge(); + BOOL TestMergeCells(); + BOOL TestRemoveMerge(); - BOOL MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE, BOOL bCenter = FALSE ); - BOOL RemoveMerge( BOOL bRecord = TRUE ); + BOOL MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE, BOOL bCenter = FALSE ); + BOOL RemoveMerge( BOOL bRecord = TRUE ); - void FillSimple( FillDir eDir, BOOL bRecord = TRUE ); - void FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, + void FillSimple( FillDir eDir, BOOL bRecord = TRUE ); + void FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, double fStart, double fStep, double fMax, BOOL bRecord = TRUE ); - void FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, + void FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ULONG nCount, BOOL bRecord = TRUE ); - void FillCrossDblClick(); + void FillCrossDblClick(); - void TransliterateText( sal_Int32 nType ); + void TransliterateText( sal_Int32 nType ); ScAutoFormatData* CreateAutoFormatData(); - void AutoFormat( USHORT nFormatNo, BOOL bRecord = TRUE ); + void AutoFormat( USHORT nFormatNo, BOOL bRecord = TRUE ); - void SearchAndReplace( const SvxSearchItem* pSearchItem, + void SearchAndReplace( const SvxSearchItem* pSearchItem, BOOL bAddUndo, BOOL bIsApi ); - void Solve( const ScSolveParam& rParam ); - void TabOp( const ScTabOpParam& rParam, BOOL bRecord = TRUE ); + void Solve( const ScSolveParam& rParam ); + void TabOp( const ScTabOpParam& rParam, BOOL bRecord = TRUE ); - BOOL InsertTable( const String& rName, SCTAB nTabNr, BOOL bRecord = TRUE ); - BOOL InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, BOOL bRecord = TRUE); + BOOL InsertTable( const String& rName, SCTAB nTabNr, BOOL bRecord = TRUE ); + BOOL InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, BOOL bRecord = TRUE); - BOOL AppendTable( const String& rName, BOOL bRecord = TRUE ); + BOOL AppendTable( const String& rName, BOOL bRecord = TRUE ); - BOOL DeleteTable( SCTAB nTabNr, BOOL bRecord = TRUE ); - BOOL DeleteTables(const SvShorts &TheTabs, BOOL bRecord = TRUE ); + BOOL DeleteTable( SCTAB nTabNr, BOOL bRecord = TRUE ); + BOOL DeleteTables(const SvShorts &TheTabs, BOOL bRecord = TRUE ); - BOOL RenameTable( const String& rName, SCTAB nTabNr ); - void MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ); - void ImportTables( ScDocShell* pSrcShell, + BOOL RenameTable( const String& rName, SCTAB nTabNr ); + void MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ); + void ImportTables( ScDocShell* pSrcShell, SCTAB nCount, const SCTAB* pSrcTabs, BOOL bLink,SCTAB nTab); bool SetTabBgColor( const Color& rColor, SCTAB nTabNr ); bool SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfoList ); - void InsertTableLink( const String& rFile, + void InsertTableLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rTabName ); - void InsertAreaLink( const String& rFile, + void InsertAreaLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, ULONG nRefresh ); - void ShowTable( const String& rName ); - void HideTable( SCTAB nTabNr ); + void ShowTable( const String& rName ); + void HideTable( SCTAB nTabNr ); - void MakeScenario( const String& rName, const String& rComment, + void MakeScenario( const String& rName, const String& rComment, const Color& rColor, USHORT nFlags ); - void ExtendScenario(); - void UseScenario( const String& rName ); + void ExtendScenario(); + void UseScenario( const String& rName ); - void InsertSpecialChar( const String& rStr, const Font& rFont ); + void InsertSpecialChar( const String& rStr, const Font& rFont ); - void InsertDummyObject(); - void InsertOleObject(); + void InsertDummyObject(); + void InsertOleObject(); - void InsertDraw(); + void InsertDraw(); - void SetSelectionFrameLines( const SvxBorderLine* pLine, + void SetSelectionFrameLines( const SvxBorderLine* pLine, BOOL bColorOnly ); void SetNoteText( const ScAddress& rPos, const String& rNoteText ); @@ -310,7 +310,7 @@ public: void DoRefConversion( BOOL bRecord = TRUE ); void DoHangulHanjaConversion( BOOL bRecord = TRUE ); - void DoThesaurus( BOOL bRecord = TRUE ); + void DoThesaurus( BOOL bRecord = TRUE ); /** Generic implementation of sheet conversion functions. */ void DoSheetConversion( const ScConversionParam& rParam, BOOL bRecord = TRUE ); @@ -320,25 +320,25 @@ public: const String* pRepCol, const String* pRepRow, BOOL bAddPrint ); - void DetectiveAddPred(); - void DetectiveDelPred(); - void DetectiveAddSucc(); - void DetectiveDelSucc(); - void DetectiveAddError(); - void DetectiveMarkInvalid(); - void DetectiveDelAll(); - void DetectiveRefresh(); + void DetectiveAddPred(); + void DetectiveDelPred(); + void DetectiveAddSucc(); + void DetectiveDelSucc(); + void DetectiveAddError(); + void DetectiveMarkInvalid(); + void DetectiveDelAll(); + void DetectiveRefresh(); void DetectiveMarkPred(); void DetectiveMarkSucc(); void InsertCurrentTime(short nCellFmt, const ::rtl::OUString& rUndoStr); - void ShowNote( bool bShow = true ); - inline void HideNote() { ShowNote( false ); } - void EditNote(); + void ShowNote( bool bShow = true ); + inline void HideNote() { ShowNote( false ); } + void EditNote(); - void ForgetFormatArea() { bFormatValid = FALSE; } - BOOL SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL ); + void ForgetFormatArea() { bFormatValid = FALSE; } + BOOL SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL ); // Amelia Wang SC_DLLPUBLIC void DataFormPutData( SCROW nCurrentRow , @@ -349,14 +349,14 @@ public: // interne Hilfsfunktionen protected: - void UpdateLineAttrs( SvxBorderLine& rLine, + void UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, const SvxBorderLine* pSrcLine, - BOOL bColor ); + BOOL bColor ); private: - void PasteRTF( SCCOL nCol, SCROW nStartRow, + void PasteRTF( SCCOL nCol, SCROW nStartRow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); bool PasteMultiRangesFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction, @@ -364,11 +364,11 @@ private: InsCellCmd eMoveMode, sal_uInt16 nCondFlags, sal_uInt16 nUndoFlags ); void PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData& rMark); - USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula ); + USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula ); - void StartFormatArea(); - BOOL TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged ); - void DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, + void StartFormatArea(); + BOOL TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged ); + void DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged, BOOL bAddUndo ); void MarkAndJumpToRanges(const ScRangeList& rRanges); diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx index 37290323b920..70603d016d0d 100644 --- a/sc/source/ui/inc/viewutil.hxx +++ b/sc/source/ui/inc/viewutil.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 @@ -50,13 +50,13 @@ enum ScUpdateMode { SC_UPDATE_ALL, SC_UPDATE_CHANGED, SC_UPDATE_MARKS }; // --------------------------------------------------------------------------- -class ScViewUtil // static Methoden +class ScViewUtil // static Methoden { public: - static BOOL ExecuteCharMap( const SvxFontItem& rOldFont, - SfxViewFrame& rFrame, - SvxFontItem& rNewFont, - String& rString ); + static BOOL ExecuteCharMap( const SvxFontItem& rOldFont, + SfxViewFrame& rFrame, + SvxFontItem& rNewFont, + String& rString ); static BOOL IsActionShown( const ScChangeAction& rAction, const ScChangeViewSettings& rSettings, @@ -88,26 +88,26 @@ public: class ScUpdateRect { private: - SCCOL nOldStartX; - SCROW nOldStartY; - SCCOL nOldEndX; - SCROW nOldEndY; - SCCOL nNewStartX; - SCROW nNewStartY; - SCCOL nNewEndX; - SCROW nNewEndY; - SCCOL nContX1; - SCROW nContY1; - SCCOL nContX2; - SCROW nContY2; + SCCOL nOldStartX; + SCROW nOldStartY; + SCCOL nOldEndX; + SCROW nOldEndY; + SCCOL nNewStartX; + SCROW nNewStartY; + SCCOL nNewEndX; + SCROW nNewEndY; + SCCOL nContX1; + SCROW nContY1; + SCCOL nContX2; + SCROW nContY2; public: ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); - void SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); - BOOL GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); -#ifdef OLD_SELECTION_PAINT - BOOL GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont ); + void SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); + BOOL GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); +#ifdef OLD_SELECTION_PAINT + BOOL GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont ); void GetContDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); -#endif +#endif }; diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index e8f548f606fe..525d883b69c4 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.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/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index ce6473c2b068..a5e94745f2e6 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.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,12 +58,12 @@ // defines ------------------------------------------------------------------- -#define ABS_SREF SCA_VALID \ +#define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ +#define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D +#define ABS_SREF3D ABS_SREF | SCA_TAB_3D +#define ABS_DREF3D ABS_DREF | SCA_TAB_3D @@ -77,12 +77,12 @@ inline void EnableDisable( Window& rWin, BOOL bEnable ) rWin.Disable(); } -#define RD_SPECIAL_NONE 0 -#define RD_SPECIAL_CONTENT 1 -#define RD_SPECIAL_VISCONTENT 2 +#define RD_SPECIAL_NONE 0 +#define RD_SPECIAL_CONTENT 1 +#define RD_SPECIAL_VISCONTENT 2 //============================================================================ -// class ScRedlinData +// class ScRedlinData //---------------------------------------------------------------------------- ScRedlinData::ScRedlinData() @@ -111,38 +111,38 @@ ScRedlinData::~ScRedlinData() //============================================================================ -// class ScAcceptChgDlg +// class ScAcceptChgDlg //---------------------------------------------------------------------------- ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData) + ScViewData* ptrViewData) - : SfxModelessDialog( pB, pCW, pParent, ScResId(RID_SCDLG_CHANGES) ), + : SfxModelessDialog( pB, pCW, pParent, ScResId(RID_SCDLG_CHANGES) ), // - aAcceptChgCtr ( this, ScResId( CTR_REDLINING ) ), + aAcceptChgCtr ( this, ScResId( CTR_REDLINING ) ), // - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), aLocalRangeName ( *(pDoc->GetRangeName()) ), // - aStrInsertCols ( ScResId( STR_INSERT_COLS)), - aStrInsertRows ( ScResId( STR_INSERT_ROWS)), - aStrInsertTabs ( ScResId( STR_INSERT_TABS)), - aStrDeleteCols ( ScResId( STR_DELETE_COLS)), - aStrDeleteRows ( ScResId( STR_DELETE_ROWS)), - aStrDeleteTabs ( ScResId( STR_DELETE_TABS)), - aStrMove ( ScResId( STR_MOVE )), - aStrContent ( ScResId( STR_CONTENT )), - aStrReject ( ScResId( STR_REJECT )), - aStrAllAccepted ( ScResId( STR_ACCEPTED )), - aStrAllRejected ( ScResId( STR_REJECTED )), - aStrNoEntry ( ScResId( STR_NO_ENTRY )), - aStrContentWithChild ( ScResId( STR_CONTENT_WITH_CHILD)), - aStrChildContent ( ScResId( STR_CHILD_CONTENT)), - aStrChildOrgContent ( ScResId( STR_CHILD_ORGCONTENT)), - aStrEmpty ( ScResId( STR_EMPTY )) + aStrInsertCols ( ScResId( STR_INSERT_COLS)), + aStrInsertRows ( ScResId( STR_INSERT_ROWS)), + aStrInsertTabs ( ScResId( STR_INSERT_TABS)), + aStrDeleteCols ( ScResId( STR_DELETE_COLS)), + aStrDeleteRows ( ScResId( STR_DELETE_ROWS)), + aStrDeleteTabs ( ScResId( STR_DELETE_TABS)), + aStrMove ( ScResId( STR_MOVE )), + aStrContent ( ScResId( STR_CONTENT )), + aStrReject ( ScResId( STR_REJECT )), + aStrAllAccepted ( ScResId( STR_ACCEPTED )), + aStrAllRejected ( ScResId( STR_REJECTED )), + aStrNoEntry ( ScResId( STR_NO_ENTRY )), + aStrContentWithChild ( ScResId( STR_CONTENT_WITH_CHILD)), + aStrChildContent ( ScResId( STR_CHILD_CONTENT)), + aStrChildOrgContent ( ScResId( STR_CHILD_ORGCONTENT)), + aStrEmpty ( ScResId( STR_EMPTY )) { FreeResource(); -// bScAcceptChgDlgIsDead=FALSE; +// bScAcceptChgDlgIsDead=FALSE; bNoSelection=FALSE; bNeedsUpdate=FALSE; bIgnoreMsg=FALSE; @@ -155,8 +155,8 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP aReOpenTimer.SetTimeout(50); aReOpenTimer.SetTimeoutHdl(LINK( this, ScAcceptChgDlg, ReOpenTimerHdl )); - // dialog is now only hidden, not deleted, on switching views, - // so there's no need to restore settings when reopening + // dialog is now only hidden, not deleted, on switching views, + // so there's no need to restore settings when reopening MinSize=aAcceptChgCtr.GetMinSizePixel(); MinSize.Height()+=2; @@ -202,7 +202,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP } ScAcceptChgDlg::~ScAcceptChgDlg() { -// bScAcceptChgDlgIsDead=TRUE; +// bScAcceptChgDlgIsDead=TRUE; ClearView(); ScChangeTrack* pChanges=pDoc->GetChangeTrack(); @@ -233,8 +233,8 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData) bAcceptEnableFlag=TRUE; bRejectEnableFlag=TRUE; - // #91781# don't call Init here (switching between views), just set link below - // (dialog is just hidden, not deleted anymore, when switching views) + // #91781# don't call Init here (switching between views), just set link below + // (dialog is just hidden, not deleted anymore, when switching views) ClearView(); UpdateView(); @@ -248,7 +248,7 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData) void __EXPORT ScAcceptChgDlg::Init() { - String aAreaStr; + String aAreaStr; ScRange aRange; DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" ); @@ -261,7 +261,7 @@ void __EXPORT ScAcceptChgDlg::Init() aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); pTPFilter->ClearAuthors(); ScStrCollection aUserColl=pChanges->GetUserCollection(); - for(USHORT i=0;i<aUserColl.GetCount();i++) + for(USHORT i=0;i<aUserColl.GetCount();i++) pTPFilter->InsertAuthor(aUserColl[i]->GetString()); } @@ -332,25 +332,25 @@ String* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) switch(eType) { - case SC_CAT_INSERT_COLS: pStr=&aStrInsertCols;break; + case SC_CAT_INSERT_COLS: pStr=&aStrInsertCols;break; - case SC_CAT_INSERT_ROWS: pStr=&aStrInsertRows;break; + case SC_CAT_INSERT_ROWS: pStr=&aStrInsertRows;break; - case SC_CAT_INSERT_TABS: pStr=&aStrInsertTabs;break; + case SC_CAT_INSERT_TABS: pStr=&aStrInsertTabs;break; - case SC_CAT_DELETE_COLS: pStr=&aStrDeleteCols;break; + case SC_CAT_DELETE_COLS: pStr=&aStrDeleteCols;break; - case SC_CAT_DELETE_ROWS: pStr=&aStrDeleteRows;break; + case SC_CAT_DELETE_ROWS: pStr=&aStrDeleteRows;break; - case SC_CAT_DELETE_TABS: pStr=&aStrDeleteTabs;break; + case SC_CAT_DELETE_TABS: pStr=&aStrDeleteTabs;break; - case SC_CAT_MOVE: pStr=&aStrMove;break; + case SC_CAT_MOVE: pStr=&aStrMove;break; - case SC_CAT_CONTENT: pStr=&aStrContent;break; + case SC_CAT_CONTENT: pStr=&aStrContent;break; - case SC_CAT_REJECT: pStr=&aStrReject;break; + case SC_CAT_REJECT: pStr=&aStrReject;break; - default: pStr=&aUnknown;break; + default: pStr=&aUnknown;break; } return pStr; } @@ -446,8 +446,8 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA pNewData->bIsRejectable=pScChangeAction->IsRejectable(); pNewData->bDisabled=!pNewData->bIsAcceptable | bDisabled; pNewData->aDateTime=aDateTime; - pNewData->nRow = aRef.aStart.Row(); - pNewData->nCol = aRef.aStart.Col(); + pNewData->nRow = aRef.aStart.Row(); + pNewData->nCol = aRef.aStart.Col(); pNewData->nTable= aRef.aStart.Tab(); if(eType==SC_CAT_CONTENT) @@ -628,8 +628,8 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang pNewData->bIsRejectable=pScChangeAction->IsRejectable(); pNewData->bDisabled=!pNewData->bIsAcceptable | bDisabled; pNewData->aDateTime=aDateTime; - pNewData->nRow = aRef.aStart.Row(); - pNewData->nCol = aRef.aStart.Col(); + pNewData->nRow = aRef.aStart.Row(); + pNewData->nCol = aRef.aStart.Col(); pNewData->nTable= aRef.aStart.Tab(); if(eType==SC_CAT_CONTENT) @@ -815,8 +815,8 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte pNewData->bIsRejectable=FALSE; pNewData->bDisabled=!pNewData->bIsAcceptable; pNewData->aDateTime=aDateTime; - pNewData->nRow = aRef.aStart.Row(); - pNewData->nCol = aRef.aStart.Col(); + pNewData->nRow = aRef.aStart.Row(); + pNewData->nCol = aRef.aStart.Col(); pNewData->nTable= aRef.aStart.Tab(); if(pTheView->IsValidComment(&aComment) && bFlag) @@ -985,7 +985,7 @@ IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG ) if(pWnd!=NULL) { -// bSimpleRefDlgStarted=TRUE; +// bSimpleRefDlgStarted=TRUE; USHORT nAcceptId=ScAcceptChgDlgWrapper::GetChildWindowId(); pViewFrm->ShowChildWindow(nAcceptId,FALSE); pWnd->SetCloseHdl(LINK( this, ScAcceptChgDlg,RefInfoHandle)); @@ -1004,7 +1004,7 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, String*, pResult) { USHORT nId; -// bSimpleRefDlgStarted=FALSE; +// bSimpleRefDlgStarted=FALSE; ScSimpleRefDlgWrapper::SetAutoReOpen(TRUE); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); @@ -1314,7 +1314,7 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo ScRedlinData *pParentData=(ScRedlinData *)(pOriginal->GetUserData()); pParentData->pData=(void *)pScChangeAction; pParentData->nActionNo=pScChangeAction->GetActionNumber(); - pParentData->bIsAcceptable=pScChangeAction->IsRejectable(); // select old value + pParentData->bIsAcceptable=pScChangeAction->IsRejectable(); // select old value pParentData->bIsRejectable=FALSE; pParentData->bDisabled=FALSE; } @@ -1763,13 +1763,13 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,U IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack) { -// if(bScAcceptChgDlgIsDead) return 0; +// if(bScAcceptChgDlgIsDead) return 0; ScChangeTrackMsgQueue& aMsgQueue= pChgTrack->GetMsgQueue(); ScChangeTrackMsgInfo* pTrackInfo=aMsgQueue.Get(); - ULONG nStartAction; - ULONG nEndAction; + ULONG nStartAction; + ULONG nEndAction; while(pTrackInfo!=NULL) { @@ -2001,7 +2001,7 @@ void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const SfxModelessDialog::FillInfo(rInfo); rInfo.aExtraString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "AcceptChgDat:(" )); - USHORT nCount=pTheView->TabCount(); + USHORT nCount=pTheView->TabCount(); rInfo.aExtraString += String::CreateFromInt32(nCount); rInfo.aExtraString += ';'; @@ -2043,8 +2043,8 @@ IMPL_LINK( ScAcceptChgDlg, FilterModified, SvxTPFilter*, EMPTYARG ) return 0; } -#define CALC_DATE 3 -#define CALC_POS 1 +#define CALC_DATE 3 +#define CALC_POS 1 IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData ) { diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src index 4baa9f3d388c..dab2c5d91d2f 100644 --- a/sc/source/ui/miscdlgs/acredlin.src +++ b/sc/source/ui/miscdlgs/acredlin.src @@ -1,7 +1,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/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 0c46284c77d7..09d4a4d50b52 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.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 @@ -61,9 +61,9 @@ #include "global.hxx" #include "inputopt.hxx" #include "rangeutl.hxx" + - -ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings) +ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings) : m_pDlg(_pDlg) , pRefEdit (NULL) , m_pWindow(NULL) @@ -102,7 +102,7 @@ void ScFormulaReferenceHelper::enableInput( BOOL bEnable ) SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); while( pFrame ) { - // #71577# enable everything except InPlace, including bean frames + // #71577# enable everything except InPlace, including bean frames if ( !pFrame->GetFrame().IsInPlace() ) { SfxViewShell* p = pFrame->GetViewShell(); @@ -138,7 +138,7 @@ void ScFormulaReferenceHelper::ShowSimpleReference( const XubString& rStr ) if ( pViewData ) { ScDocument* pDoc=pViewData->GetDocument(); - ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); + ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); ScRangeList aRangeList; @@ -187,7 +187,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const Strin else if ( aRangeUtil.MakeRangeFromName( aRangeStr, pDoc, nRefTab, aRange, RUTL_NAMES, aDetails ) ) rRanges.Append( aRange ); else - bError = true; + bError = true; } return !bError; @@ -201,7 +201,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr ) ScViewData* pViewData=ScDocShell::GetViewData(); if ( pViewData && pRefComp.get() ) { - ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); + ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); SCCOL nCol = pViewData->GetCurX(); SCROW nRow = pViewData->GetCurY(); SCTAB nTab = pViewData->GetTabNo(); @@ -260,12 +260,12 @@ void ScFormulaReferenceHelper::HideReference( BOOL bDoneRefMode ) if( pViewData && /*!pRefEdit &&*/ bHighLightRef && bEnableColorRef) { - ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); + ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); if(pTabViewShell!=NULL) { - // bDoneRefMode is FALSE when called from before SetReference. - // In that case, RefMode was just started and must not be ended now. + // bDoneRefMode is FALSE when called from before SetReference. + // In that case, RefMode was just started and must not be ended now. if ( bDoneRefMode ) pTabViewShell->DoneRefMode( FALSE ); @@ -279,7 +279,7 @@ void ScFormulaReferenceHelper::ShowReference( const XubString& rStr ) { if( /*!pRefEdit &&*/ bEnableColorRef ) { - if( rStr.Search('(')!=STRING_NOTFOUND || + if( rStr.Search('(')!=STRING_NOTFOUND || rStr.Search('+')!=STRING_NOTFOUND || rStr.Search('*')!=STRING_NOTFOUND || rStr.Search('-')!=STRING_NOTFOUND || @@ -379,7 +379,7 @@ void ScFormulaReferenceHelper::RefInputDone( BOOL bForced ) if ( CanInputDone( bForced ) )//if (pRefEdit && (bForced || !pRefBtn)) //-->Modified by PengYunQuan for Validity Cell Range Picker { - if (bAccInserted) // Accelerator wieder abschalten + if (bAccInserted) // Accelerator wieder abschalten { Application::RemoveAccel( pAccel.get() ); bAccInserted = FALSE; @@ -441,7 +441,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: sNewDialogText += m_pWindow->GetChild(i-1)->GetWindow( WINDOW_CLIENT )->GetText(); } else if (pWin == (Window*)pRefBtn) - ; // do nothing + ; // do nothing else if (pWin->IsVisible()) { pHiddenMarks[i] = TRUE; @@ -527,14 +527,14 @@ BOOL ScFormulaReferenceHelper::DoClose( USHORT nId ) { SfxApplication* pSfxApp = SFX_APP(); - SetDispatcherLock( FALSE ); //! here and in dtor ? + SetDispatcherLock( FALSE ); //! here and in dtor ? SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm && pViewFrm->HasChildWindow(FID_INPUTLINE_STATUS) ) { - // Die Eingabezeile wird per ToolBox::Disable disabled, muss darum auch - // per ToolBox::Enable wieder aktiviert werden (vor dem Enable des AppWindow), - // damit die Buttons auch wieder enabled gezeichnet werden. + // Die Eingabezeile wird per ToolBox::Disable disabled, muss darum auch + // per ToolBox::Enable wieder aktiviert werden (vor dem Enable des AppWindow), + // damit die Buttons auch wieder enabled gezeichnet werden. SfxChildWindow* pChild = pViewFrm->GetChildWindow(FID_INPUTLINE_STATUS); if (pChild) { @@ -563,7 +563,7 @@ BOOL ScFormulaReferenceHelper::DoClose( USHORT nId ) } void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock ) { - // lock / unlock only the dispatchers of Calc documents + // lock / unlock only the dispatchers of Calc documents TypeId aType(TYPE(ScDocShell)); ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType); @@ -581,9 +581,9 @@ void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock ) pDocShell = (ScDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType); } - // if a new view is created while the dialog is open, - // that view's dispatcher is locked when trying to create the dialog - // for that view (ScTabViewShell::CreateRefDialog) + // if a new view is created while the dialog is open, + // that view's dispatcher is locked when trying to create the dialog + // for that view (ScTabViewShell::CreateRefDialog) } // ----------------------------------------------------------------------------- void ScFormulaReferenceHelper::ViewShellChanged(ScTabViewShell* /* pScViewShell */) @@ -601,7 +601,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(BOOL bFlag, BOOL bChilds) SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); while( pFrame ) { - // #71577# enable everything except InPlace, including bean frames + // #71577# enable everything except InPlace, including bean frames if ( !pFrame->GetFrame().IsInPlace() ) { SfxViewShell* p = pFrame->GetViewShell(); @@ -641,7 +641,7 @@ void lcl_InvalidateWindows() SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); while( pFrame ) { - // #71577# enable everything except InPlace, including bean frames + // #71577# enable everything except InPlace, including bean frames if ( !pFrame->GetFrame().IsInPlace() ) { SfxViewShell* p = pFrame->GetViewShell(); @@ -678,12 +678,12 @@ void lcl_HideAllReferences() //============================================================================ //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker -// class ScRefHandler +// class ScRefHandler //---------------------------------------------------------------------------- ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pCW, Window* pParent, USHORT nResId*/, bool bBindRef ) - : //SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ), + : //SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ), m_rWindow( rWindow ), m_bInRefMode( false ), m_aHelper(this,pB), @@ -691,8 +691,8 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pActiveWin(NULL) { m_aHelper.SetWindow(/*this*/&m_rWindow); - if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId - m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und + if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId + m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. aTimer.SetTimeout(200); @@ -729,12 +729,12 @@ bool ScRefHandler::EnterRefMode() } } } - if ( !pParentDoc && pScViewShell ) // use current only if above fails + if ( !pParentDoc && pScViewShell ) // use current only if above fails pParentDoc = pScViewShell->GetObjectShell(); if ( pParentDoc ) aDocName = pParentDoc->GetTitle(); - ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell); + ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell); DBG_ASSERT( pInputHdl, "Missing input handler :-/" ); @@ -749,8 +749,8 @@ bool ScRefHandler::EnterRefMode() m_aHelper.SetDispatcherLock( TRUE ); //@Test - //SFX_APPWINDOW->Disable(TRUE); //@BugID 54702 - + //SFX_APPWINDOW->Disable(TRUE); //@BugID 54702 + return m_bInRefMode = true; } @@ -769,7 +769,7 @@ bool ScRefHandler::LeaveRefMode() if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<Window*>(*this) ) ) pDlg->SetModalInputMode(FALSE); - SetDispatcherLock( FALSE ); //! here and in DoClose ? + SetDispatcherLock( FALSE ); //! here and in DoClose ? ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell(); if( pScViewShell ) @@ -786,9 +786,9 @@ bool ScRefHandler::LeaveRefMode() //SfxBindings& ScRefHandler::GetBindings() //{ -// //! SfxModelessDialog should allow access to pBindings pointer +// //! SfxModelessDialog should allow access to pBindings pointer // -// return *pMyBindings; +// return *pMyBindings; //} //---------------------------------------------------------------------------- @@ -801,7 +801,7 @@ void ScRefHandler::SwitchToDocument() SfxObjectShell* pObjSh = pCurrent->GetObjectShell(); if ( pObjSh && pObjSh->GetTitle() == aDocName ) { - // right document already visible -> nothing to do + // right document already visible -> nothing to do return; } } @@ -813,7 +813,7 @@ void ScRefHandler::SwitchToDocument() SfxObjectShell* pObjSh = pSh->GetObjectShell(); if ( pObjSh && pObjSh->GetTitle() == aDocName ) { - // switch to first TabViewShell for document + // switch to first TabViewShell for document ((ScTabViewShell*)pSh)->SetActive(); return; } @@ -823,14 +823,14 @@ void ScRefHandler::SwitchToDocument() //---------------------------------------------------------------------------- -BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 +BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 { - // default: allow only same document (overridden in function dialog) + // default: allow only same document (overridden in function dialog) String aCmpName; if ( pDocSh ) aCmpName = pDocSh->GetTitle(); - // if aDocName isn't initialized, allow + // if aDocName isn't initialized, allow return ( aDocName.Len() == 0 || aDocName == aCmpName ); } @@ -865,7 +865,7 @@ void ScRefHandler::ViewShellChanged(ScTabViewShell* pScViewShell ) void ScRefHandler::AddRefEntry() { - // wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen + // wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen } //---------------------------------------------------------------------------- @@ -879,8 +879,8 @@ BOOL __EXPORT ScRefHandler::IsTableLocked() const //---------------------------------------------------------------------------- // -// RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld -// (per Button oder Bewegung) +// RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld +// (per Button oder Bewegung) // //---------------------------------------------------------------------------- @@ -898,42 +898,42 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* //The two following function is commentted out by PengYunQuan for Validity Cell Range Picker //long ScAnyRefDlg::PreNotify( NotifyEvent& rNEvt ) //{ -// USHORT nSwitch=rNEvt.GetType(); -// if(nSwitch==EVENT_GETFOCUS) -// { -// pActiveWin=rNEvt.GetWindow(); -// } -// return SfxModelessDialog::PreNotify(rNEvt); +// USHORT nSwitch=rNEvt.GetType(); +// if(nSwitch==EVENT_GETFOCUS) +// { +// pActiveWin=rNEvt.GetWindow(); +// } +// return SfxModelessDialog::PreNotify(rNEvt); //} // //void ScAnyRefDlg::StateChanged( StateChangedType nStateChange ) //{ -// SfxModelessDialog::StateChanged( nStateChange ); +// SfxModelessDialog::StateChanged( nStateChange ); // -// if(nStateChange == STATE_CHANGE_VISIBLE) -// { -// if(IsVisible()) -// { -// m_aHelper.enableInput( FALSE ); -// m_aHelper.EnableSpreadsheets(); -// m_aHelper.SetDispatcherLock( TRUE ); -// aTimer.Start(); -// } -// else -// { -// m_aHelper.enableInput( TRUE ); -// m_aHelper.SetDispatcherLock( FALSE ); //! here and in DoClose ? -// } -// } +// if(nStateChange == STATE_CHANGE_VISIBLE) +// { +// if(IsVisible()) +// { +// m_aHelper.enableInput( FALSE ); +// m_aHelper.EnableSpreadsheets(); +// m_aHelper.SetDispatcherLock( TRUE ); +// aTimer.Start(); +// } +// else +// { +// m_aHelper.enableInput( TRUE ); +// m_aHelper.SetDispatcherLock( FALSE ); //! here and in DoClose ? +// } +// } //} #if defined( _MSC_VER ) #define INTRODUCE_TEMPLATE #else -#define INTRODUCE_TEMPLATE template <> +#define INTRODUCE_TEMPLATE template <> #endif -#define IMPL_TWINDOW_PRENOTIFY( TWindow,bBindRef ) \ +#define IMPL_TWINDOW_PRENOTIFY( TWindow,bBindRef ) \ INTRODUCE_TEMPLATE long ScRefHdlrImplBase<TWindow,bBindRef>::PreNotify( NotifyEvent& rNEvt )\ {\ if( bBindRef || m_bInRefMode )\ @@ -947,7 +947,7 @@ INTRODUCE_TEMPLATE long ScRefHdlrImplBase<TWindow,bBindRef>::PreNotify( NotifyEv return TWindow::PreNotify(rNEvt);\ } -#define IMPL_TWINDOW_STATECHANGED( TWindow,bBindRef ) \ +#define IMPL_TWINDOW_STATECHANGED( TWindow,bBindRef ) \ INTRODUCE_TEMPLATE void ScRefHdlrImplBase<TWindow,bBindRef>::StateChanged( StateChangedType nStateChange )\ {\ TWindow::StateChanged( nStateChange );\ @@ -966,7 +966,7 @@ INTRODUCE_TEMPLATE void ScRefHdlrImplBase<TWindow,bBindRef>::StateChanged( State else\ {\ m_aHelper.enableInput( TRUE );\ - m_aHelper.SetDispatcherLock( FALSE ); /*//! here and in DoClose ?*/\ + m_aHelper.SetDispatcherLock( FALSE ); /*//! here and in DoClose ?*/\ }\ }\ } diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 18013a089306..12a332fd02f9 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.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,12 +73,12 @@ // ScAutoFmtPreview ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocument* pDoc ) : - Window ( pParent, rRes ), - pCurData ( NULL ), - aVD ( *this ), + Window ( pParent, rRes ), + pCurData ( NULL ), + aVD ( *this ), aScriptedText ( aVD ), xBreakIter ( pDoc->GetBreakIterator() ), - bFitWidth ( FALSE ), + bFitWidth ( FALSE ), mbRTL ( false ), aPrvSize ( GetSizePixel().Width() - 6, GetSizePixel().Height() - 30 ), mnLabelColWidth ( (aPrvSize.Width() - 4) / 4 - 12 ), @@ -92,7 +92,7 @@ ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocume aStrMid ( ScResId( STR_MID ) ), aStrSouth ( ScResId( STR_SOUTH ) ), aStrSum ( ScResId( STR_SUM ) ), - pNumFmt ( new SvNumberFormatter( ::comphelper::getProcessServiceFactory(), ScGlobal::eLnge ) ) + pNumFmt ( new SvNumberFormatter( ::comphelper::getProcessServiceFactory(), ScGlobal::eLnge ) ) { Init(); } @@ -205,8 +205,8 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) // Ausgabe des Zelltextes: //------------------------ - String cellString; - BOOL bNumFormat = pCurData->GetIncludeValueFormat(); + String cellString; + BOOL bNumFormat = pCurData->GetIncludeValueFormat(); ULONG nNum; double nVal; Color* pDummy = NULL; @@ -214,14 +214,14 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) switch( nIndex ) { - case 1: cellString = aStrJan; break; - case 2: cellString = aStrFeb; break; - case 3: cellString = aStrMar; break; - case 5: cellString = aStrNorth; break; - case 10: cellString = aStrMid; break; - case 15: cellString = aStrSouth; break; + case 1: cellString = aStrJan; break; + case 2: cellString = aStrFeb; break; + case 3: cellString = aStrMar; break; + case 5: cellString = aStrNorth; break; + case 10: cellString = aStrMid; break; + case 15: cellString = aStrSouth; break; case 4: - case 20: cellString = aStrSum; break; + case 20: cellString = aStrSum; break; case 6: case 8: @@ -260,14 +260,14 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) if ( cellString.Len() > 0 ) { - Size aStrSize; + Size aStrSize; USHORT nFmtIndex = GetFormatIndex( nCol, nRow ); Rectangle cellRect = maArray.GetCellRect( nCol, nRow ); Point aPos = cellRect.TopLeft(); - USHORT nRightX = 0; - BOOL bJustify = pCurData->GetIncludeJustify(); + USHORT nRightX = 0; + BOOL bJustify = pCurData->GetIncludeJustify(); SvxHorJustifyItem aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY ); - SvxCellHorJustify eJustification; + SvxCellHorJustify eJustification; //------------- // Ausrichtung: @@ -283,7 +283,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) MakeFonts( nFmtIndex, aFont, aCJKFont, aCTLFont ); - theMaxStrSize = cellRect.GetSize(); + theMaxStrSize = cellRect.GetSize(); theMaxStrSize.Width() -= FRAME_OFFSET; theMaxStrSize.Height() -= FRAME_OFFSET; @@ -440,7 +440,7 @@ void ScAutoFmtPreview::Init() maArray.SetUseDiagDoubleClipping( false ); CalcCellArray( FALSE ); CalcLineMap(); - + TypeId aType(TYPE(ScDocShell)); ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType); SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); @@ -529,7 +529,7 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData ) void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) { sal_uInt32 nOldDrawMode = aVD.GetDrawMode(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) if( GetSettings().GetStyleSettings().GetHighContrastMode() ) aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); @@ -552,8 +552,8 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) DrawRect( aRect ); Point aPos( (aWndSize.Width() - aPrvSize.Width()) / 2, (aWndSize.Height() - aPrvSize.Height()) / 2 ); - if (Application::GetSettings().GetLayoutRTL()) - aPos.X() = -aPos.X(); + if (Application::GetSettings().GetLayoutRTL()) + aPos.X() = -aPos.X(); DrawOutDev( aPos, aWndSize, Point(), aWndSize, aVD ); aVD.SetDrawMode( nOldDrawMode ); diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index de40dd9d1868..6e5880a5cf06 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.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 @@ -175,7 +175,7 @@ ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, ULONG nStartShared, ,mrConflictsList( rConflictsList ) { } - + ScConflictsFinder::~ScConflictsFinder() { } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src index 1facf85da95b..dad8abb48780 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.src +++ b/sc/source/ui/miscdlgs/conflictsdlg.src @@ -1,7 +1,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 @@ ModalDialog RID_SCDLG_CONFLICTS Pos = MAP_APPFONT ( 6 , 34 ) ; Size = MAP_APPFONT ( 326 , 104 ) ; Border = TRUE ; - }; + }; PushButton BTN_KEEPMINE { Pos = MAP_APPFONT ( 72 , 145 ) ; @@ -87,7 +87,7 @@ ModalDialog RID_SCDLG_CONFLICTS HelpButton BTN_HELP { Pos = MAP_APPFONT ( 282 , 172 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; }; String STR_TITLE_CONFLICT { diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index 5100474274df..f9413dda2068 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.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 @@ -42,12 +42,12 @@ //================================================================== -ScColOrRowDlg::ScColOrRowDlg( Window* pParent, - const String& rStrTitle, - const String& rStrLabel, - BOOL bColDefault ) +ScColOrRowDlg::ScColOrRowDlg( Window* pParent, + const String& rStrTitle, + const String& rStrLabel, + BOOL bColDefault ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_COLORROW ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_COLORROW ) ), // aFlFrame ( this, ScResId( FL_FRAME ) ), aBtnRows ( this, ScResId( BTN_GROUP_ROWS ) ), diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 7afec7c603b4..0ba1bf1cbe5c 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.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 @@ -59,57 +59,57 @@ const ULONG nEntryDataDelim = 2; //============================================================================ -// class ScColRowNameRangesDlg +// class ScColRowNameRangesDlg /************************************************************************* -#* Member: ScColRowNameRangesDlg Datum:04.09.97 +#* Member: ScColRowNameRangesDlg Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Konstruktor der Klasse ScColRowNameRangesDlg. -#* Initialisieren der Klassen- Mitglieder, -#* Uebernahme der Range- Angaben und Aufruf -#* der eigentlichen Initialisierungsroutine +#* Funktion: Konstruktor der Klasse ScColRowNameRangesDlg. +#* Initialisieren der Klassen- Mitglieder, +#* Uebernahme der Range- Angaben und Aufruf +#* der eigentlichen Initialisierungsroutine #* -#* Input: Sfx- Verknuepfungen -#* Parent- Window -#* SCViewData +#* Input: Sfx- Verknuepfungen +#* Parent- Window +#* SCViewData #* -#* Output: --- +#* Output: --- #* #************************************************************************/ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ) + ScViewData* ptrViewData ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_COLROWNAMERANGES ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_COLROWNAMERANGES ), // aFlAssign ( this, ScResId( FL_ASSIGN ) ), - aLbRange ( this, ScResId( LB_RANGE ) ), + aLbRange ( this, ScResId( LB_RANGE ) ), aEdAssign ( this, this, ScResId( ED_AREA ) ), - aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, this ), - aBtnColHead ( this, ScResId( BTN_COLHEAD ) ), - aBtnRowHead ( this, ScResId( BTN_ROWHEAD ) ), - aFtAssign2 ( this, ScResId( FT_DATA_LABEL ) ), + aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, this ), + aBtnColHead ( this, ScResId( BTN_COLHEAD ) ), + aBtnRowHead ( this, ScResId( BTN_ROWHEAD ) ), + aFtAssign2 ( this, ScResId( FT_DATA_LABEL ) ), aEdAssign2 ( this, this, ScResId( ED_DATA ) ), - aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, this ), + aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, this ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), - pEdActive ( NULL ), - bDlgLostFocus ( FALSE ) + pEdActive ( NULL ), + bDlgLostFocus ( FALSE ) { xColNameRanges = pDoc->GetColNameRanges()->Clone(); xRowNameRanges = pDoc->GetRowNameRanges()->Clone(); @@ -119,16 +119,16 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, /************************************************************************* -#* Member: ~ScColRowNameRangesDlg Datum:04.09.97 +#* Member: ~ScColRowNameRangesDlg Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Destruktor der Klasse +#* Funktion: Destruktor der Klasse #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -138,39 +138,39 @@ __EXPORT ScColRowNameRangesDlg::~ScColRowNameRangesDlg() /************************************************************************* -#* Member: Init Datum:04.09.97 +#* Member: Init Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Initialisierungs- Routine: -#* Umlenken der Event- Handler und einstellen der -#* Startparameter. +#* Funktion: Initialisierungs- Routine: +#* Umlenken der Event- Handler und einstellen der +#* Startparameter. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ScColRowNameRangesDlg::Init() { - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCTAB nStartTab = 0; - SCCOL nEndCol = 0; - SCROW nEndRow = 0; - SCTAB nEndTab = 0; - - aBtnOk.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, OkBtnHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, CancelBtnHdl ) ); - aBtnAdd.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, AddBtnHdl ) ); - aBtnRemove.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RemoveBtnHdl ) ); - aLbRange.SetSelectHdl ( LINK( this, ScColRowNameRangesDlg, Range1SelectHdl ) ); - aEdAssign.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range1DataModifyHdl ) ); - aBtnColHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, ColClickHdl ) ); - aBtnRowHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) ); - aEdAssign2.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) ); + SCCOL nStartCol = 0; + SCROW nStartRow = 0; + SCTAB nStartTab = 0; + SCCOL nEndCol = 0; + SCROW nEndRow = 0; + SCTAB nEndTab = 0; + + aBtnOk.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, OkBtnHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, CancelBtnHdl ) ); + aBtnAdd.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, AddBtnHdl ) ); + aBtnRemove.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RemoveBtnHdl ) ); + aLbRange.SetSelectHdl ( LINK( this, ScColRowNameRangesDlg, Range1SelectHdl ) ); + aEdAssign.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range1DataModifyHdl ) ); + aBtnColHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, ColClickHdl ) ); + aBtnRowHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) ); + aEdAssign2.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) ); Link aLink = LINK( this, ScColRowNameRangesDlg, GetFocusHdl ); aEdAssign.SetGetFocusHdl( aLink ); @@ -191,7 +191,7 @@ void ScColRowNameRangesDlg::Init() if ( pViewData && pDoc ) { pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); + nEndCol, nEndRow, nEndTab ); SetColRowData( ScRange( ScAddress( nStartCol, nStartRow, nStartTab ), ScAddress( nEndCol, nEndRow, nEndTab ) ) ); } @@ -210,25 +210,25 @@ void ScColRowNameRangesDlg::Init() aEdAssign.GrabFocus(); aRbAssign.Enable(); //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus + //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus Range1SelectHdl( 0 ); } /************************************************************************* -#* Member: SetColRowData Datum:04.09.97 +#* Member: SetColRowData Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches -#* auf default Werte setzen und beide Referenz-Edit-Felder -#* fuellen. +#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches +#* auf default Werte setzen und beide Referenz-Edit-Felder +#* fuellen. #* -#* Input: Einstellbereich fuer Labels +#* Input: Einstellbereich fuer Labels #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -241,36 +241,36 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef) SCROW nRow1 = theCurArea.aStart.Row(); SCROW nRow2 = theCurArea.aEnd.Row(); if ( (static_cast<SCCOLROW>(nCol2 - nCol1) >= nRow2 - nRow1) || (nCol1 == 0 && nCol2 == MAXCOL) ) - { // Spaltenkoepfe und Grenzfall gesamte Tabelle + { // Spaltenkoepfe und Grenzfall gesamte Tabelle aBtnColHead.Check( TRUE ); aBtnRowHead.Check( FALSE ); if ( nRow2 == MAXROW ) { if ( nRow1 == 0 ) - bValid = FALSE; // Grenzfall gesamte Tabelle + bValid = FALSE; // Grenzfall gesamte Tabelle else - { // Head unten, Data oben + { // Head unten, Data oben theCurData.aStart.SetRow( 0 ); theCurData.aEnd.SetRow( nRow1 - 1 ); } } else - { // Head oben, Data unten + { // Head oben, Data unten theCurData.aStart.SetRow( nRow2 + 1 ); theCurData.aEnd.SetRow( MAXROW ); } } else - { // Zeilenkoepfe + { // Zeilenkoepfe aBtnRowHead.Check( TRUE ); aBtnColHead.Check( FALSE ); if ( nCol2 == MAXCOL ) - { // Head rechts, Data links + { // Head rechts, Data links theCurData.aStart.SetCol( 0 ); theCurData.aEnd.SetCol( nCol2 - 1 ); } else - { // Head links, Data rechts + { // Head links, Data rechts theCurData.aStart.SetCol( nCol2 + 1 ); theCurData.aEnd.SetCol( MAXCOL ); } @@ -318,17 +318,17 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef) /************************************************************************* -#* Member: AdjustColRowData Datum:04.09.97 +#* Member: AdjustColRowData Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches -#* anpassen und Data-Referenz-Edit-Feld fuellen. +#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches +#* anpassen und Data-Referenz-Edit-Feld fuellen. #* -#* Input: Bereich fuer Labels +#* Input: Bereich fuer Labels #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -336,7 +336,7 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe { theCurData = rDataRange; if ( aBtnColHead.IsChecked() ) - { // Datenbereich gleiche Spalten wie Koepfe + { // Datenbereich gleiche Spalten wie Koepfe theCurData.aStart.SetCol( theCurArea.aStart.Col() ); theCurData.aEnd.SetCol( theCurArea.aEnd.Col() ); if ( theCurData.Intersects( theCurArea ) ) @@ -345,13 +345,13 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe SCROW nRow2 = theCurArea.aEnd.Row(); if ( nRow1 > 0 && (theCurData.aEnd.Row() < nRow2 || nRow2 == MAXROW) ) - { // Data oben + { // Data oben theCurData.aEnd.SetRow( nRow1 - 1 ); if ( theCurData.aStart.Row() > theCurData.aEnd.Row() ) theCurData.aStart.SetRow( theCurData.aEnd.Row() ); } else - { // Data unten + { // Data unten theCurData.aStart.SetRow( nRow2 + 1 ); if ( theCurData.aStart.Row() > theCurData.aEnd.Row() ) theCurData.aEnd.SetRow( theCurData.aStart.Row() ); @@ -359,7 +359,7 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe } } else - { // Datenbereich gleiche Zeilen wie Koepfe + { // Datenbereich gleiche Zeilen wie Koepfe theCurData.aStart.SetRow( theCurArea.aStart.Row() ); theCurData.aEnd.SetRow( theCurArea.aEnd.Row() ); if ( theCurData.Intersects( theCurArea ) ) @@ -368,13 +368,13 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe SCCOL nCol2 = theCurArea.aEnd.Col(); if ( nCol1 > 0 && (theCurData.aEnd.Col() < nCol2 || nCol2 == MAXCOL) ) - { // Data links + { // Data links theCurData.aEnd.SetCol( nCol1 - 1 ); if ( theCurData.aStart.Col() > theCurData.aEnd.Col() ) theCurData.aStart.SetCol( theCurData.aEnd.Col() ); } else - { // Data rechts + { // Data rechts theCurData.aStart.SetCol( nCol2 + 1 ); if ( theCurData.aStart.Col() > theCurData.aEnd.Col() ) theCurData.aEnd.SetCol( theCurData.aStart.Col() ); @@ -394,19 +394,19 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe /************************************************************************* -#* Member: SetReference Datum:04.09.97 +#* Member: SetReference Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Uebergabe eines mit der Maus selektierten Tabellen- -#* bereiches, der dann als neue Selektion im Referenz- -#* Fenster angezeigt wird. +#* Funktion: Uebergabe eines mit der Maus selektierten Tabellen- +#* bereiches, der dann als neue Selektion im Referenz- +#* Fenster angezeigt wird. #* -#* Input: Bereich fuer Labels -#* Dokumentklasse +#* Input: Bereich fuer Labels +#* Dokumentklasse #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -431,16 +431,16 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD /************************************************************************* -#* Member: Close Datum:04.09.97 +#* Member: Close Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Schliessen des Fensters +#* Funktion: Schliessen des Fensters #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -451,16 +451,16 @@ BOOL __EXPORT ScColRowNameRangesDlg::Close() /************************************************************************* -#* Member: SetActive Datum:04.09.97 +#* Member: SetActive Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Aktivieren des Fensters +#* Funktion: Aktivieren des Fensters #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -485,16 +485,16 @@ void ScColRowNameRangesDlg::SetActive() /************************************************************************* -#* Member: UpdateNames Datum:04.09.97 +#* Member: UpdateNames Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Aktualisieren der Namen +#* Funktion: Aktualisieren der Namen #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -509,8 +509,8 @@ void ScColRowNameRangesDlg::UpdateNames() ULONG nCount, j; USHORT nPos; //@008 Hilfsvariable q eingefuegt - SCCOL nCol1; //@008 04.09.97 - SCROW nRow1; //Erweiterung fuer Bereichsnamen + SCCOL nCol1; //@008 04.09.97 + SCROW nRow1; //Erweiterung fuer Bereichsnamen SCTAB nTab1; SCCOL nCol2; SCROW nRow2; @@ -545,12 +545,12 @@ void ScColRowNameRangesDlg::UpdateNames() if(pDoc!=NULL) { pDoc->GetString(nCol1, nRow1, nTab1,rString); - strShow +=rString; + strShow +=rString; for(SCCOL i=nCol1+1;i<=q;i++) { strShow.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); pDoc->GetString(i, nRow1, nTab1,rString); - strShow += rString; + strShow += rString; } } if(q<nCol2) // Zu lang? Ergaenzen um ",..." @@ -591,12 +591,12 @@ void ScColRowNameRangesDlg::UpdateNames() if(pDoc!=NULL) { pDoc->GetString(nCol1, nRow1, nTab1,rString); - strShow += rString; + strShow += rString; for(SCROW i=nRow1+1;i<=q;i++) { strShow.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); pDoc->GetString(nCol1, i, nTab1,rString); - strShow += rString; + strShow += rString; } } if(q<nRow2) @@ -620,17 +620,17 @@ void ScColRowNameRangesDlg::UpdateNames() /************************************************************************* -#* Member: UpdateRangeData Datum:04.09.97 +#* Member: UpdateRangeData Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Aktualisieren der Bereichsdaten +#* Funktion: Aktualisieren der Bereichsdaten #* -#* Input: Bereichs-String -#* Flag fuer Spalten +#* Input: Bereichs-String +#* Flag fuer Spalten #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -671,17 +671,17 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, BOOL bColNam /************************************************************************* -#* Member: IsRefInputMode Datum:04.09.97 +#* Member: IsRefInputMode Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Abfragefunktion fuer Referenz- Input- Mode. +#* Funktion: Abfragefunktion fuer Referenz- Input- Mode. #* -#* Input: Bereichs-String -#* Flag fuer Spalten +#* Input: Bereichs-String +#* Flag fuer Spalten #* -#* Output: true, wenn Referenz- Input- Mode +#* Output: true, wenn Referenz- Input- Mode #* #************************************************************************/ @@ -695,18 +695,18 @@ BOOL ScColRowNameRangesDlg::IsRefInputMode() const // ======== /************************************************************************* -#* Handler: OkBtnHdl Datum:04.09.97 +#* Handler: OkBtnHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* #* Funktion: Wird ausgeloest, wenn der OK- Button gedrueckt wurde. -#* Hinzufuegen- Button ausloesen, und die neu einge- -#* stellten Bereiche ans Dokument uebergeben. -#* Fensterschliessen- Anweisung ausloesen. -#* Input: --- +#* Hinzufuegen- Button ausloesen, und die neu einge- +#* stellten Bereiche ans Dokument uebergeben. +#* Fensterschliessen- Anweisung ausloesen. +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -729,16 +729,16 @@ IMPL_LINK( ScColRowNameRangesDlg, OkBtnHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: CancelBtnHdl Datum:04.09.97 +#* Handler: CancelBtnHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Fensterschliessen- Anweisung ausloesen. +#* Funktion: Fensterschliessen- Anweisung ausloesen. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -751,18 +751,18 @@ IMPL_LINK_INLINE_END( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: AddBtnHdl Datum:04.09.97 +#* Handler: AddBtnHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Nach betaetigen des Hinzufuegen- Buttons, werden -#* die Bereichsangaben eingestellt und in der -#* Listbox dargestellt. +#* Funktion: Nach betaetigen des Hinzufuegen- Buttons, werden +#* die Bereichsangaben eingestellt und in der +#* Listbox dargestellt. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -824,17 +824,17 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: RemoveBtnHdl Datum:04.09.97 +#* Handler: RemoveBtnHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Nach betaetigen des Loeschen- Buttons, wird -#* die markierte Bereichsangabe geloescht. +#* Funktion: Nach betaetigen des Loeschen- Buttons, wird +#* die markierte Bereichsangabe geloescht. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -858,7 +858,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) if ( bFound ) { String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY ); - String aMsg = aStrDelMsg.GetToken( 0, '#' ); + String aMsg = aStrDelMsg.GetToken( 0, '#' ); aMsg += aRangeStr; aMsg += aStrDelMsg.GetToken( 1, '#' ); @@ -883,7 +883,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) aLbRange.SelectEntryPos( nSelectPos ); if ( nSelectPos && (ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim ) - aLbRange.SelectEntryPos( --nSelectPos ); // ---Zeile--- + aLbRange.SelectEntryPos( --nSelectPos ); // ---Zeile--- aLbRange.GrabFocus(); aBtnAdd.Disable(); @@ -901,18 +901,18 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: Range1SelectHdl Datum:04.09.97 +#* Handler: Range1SelectHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Wenn Zeile in Listbox ausgewaehlt wird, -#* werden die Eingabefelder entsprechend -#* eingestellt. +#* Funktion: Wenn Zeile in Listbox ausgewaehlt wird, +#* werden die Eingabefelder entsprechend +#* eingestellt. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -923,7 +923,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) USHORT nMoves = 0; while ( nSelectPos < nCnt && (ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim ) - { // skip Delimiter + { // skip Delimiter ++nMoves; aLbRange.SelectEntryPos( ++nSelectPos ); } @@ -931,7 +931,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) if ( nMoves ) { if ( nSelectPos > 1 && nSelectPos >= nCnt ) - { // am Ende nicht auf dem " --- Zeile --- " Delimiter stehenbleiben + { // am Ende nicht auf dem " --- Zeile --- " Delimiter stehenbleiben // wenn davor Eintraege existieren nSelectPos = nCnt - 2; aLbRange.SelectEntryPos( nSelectPos ); @@ -939,7 +939,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) } else if ( nSelectPos > 2 && nSelectPos < nCnt && aRangeStr.Len() && aRangeStr == aEdAssign.GetText() ) - { // nach oben wandern statt nach unten auf die vorherige Position + { // nach oben wandern statt nach unten auf die vorherige Position nSelectPos -= 2; aLbRange.SelectEntryPos( nSelectPos ); aRangeStr = aLbRange.GetSelectEntry(); @@ -989,17 +989,17 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: Range1DataModifyHdl Datum:04.09.97 +#* Handler: Range1DataModifyHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Label- -#* Bereich geaendert wurde. +#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Label- +#* Bereich geaendert wurde. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1038,17 +1038,17 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: Range2DataModifyHdl Datum:04.09.97 +#* Handler: Range2DataModifyHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Daten- -#* Bereich geaendert wurde +#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Daten- +#* Bereich geaendert wurde #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1075,18 +1075,18 @@ IMPL_LINK( ScColRowNameRangesDlg, Range2DataModifyHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: ColClickHdl Datum:04.09.97 +#* Handler: ColClickHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Radiobutton fuer Spalten wurde betaetigt, -#* die entsprechenden Einstellungen werden -#* vorgenommen +#* Funktion: Radiobutton fuer Spalten wurde betaetigt, +#* die entsprechenden Einstellungen werden +#* vorgenommen #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1113,18 +1113,18 @@ IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: RowClickHdl Datum:04.09.97 +#* Handler: RowClickHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Radiobutton fuer Zeilen wurde betaetigt, -#* die entsprechenden Einstellungen werden -#* vorgenommen +#* Funktion: Radiobutton fuer Zeilen wurde betaetigt, +#* die entsprechenden Einstellungen werden +#* vorgenommen #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index 8d20d2ee50e6..6ece4b648d64 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.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/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index e8c7dde31443..c98721eb4aff 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.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 @@ -61,7 +61,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, aBtnDelFormulas ( this, ScResId( BTN_DELFORMULAS ) ), aBtnDelNotes ( this, ScResId( BTN_DELNOTES ) ), aBtnDelAttrs ( this, ScResId( BTN_DELATTRS ) ), - aBtnDelObjects ( this, ScResId( BTN_DELOBJECTS ) ), + aBtnDelObjects ( this, ScResId( BTN_DELOBJECTS ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 46af2992e4a5..aa70e7cfb7ba 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.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 @@ -55,16 +55,16 @@ //---------------------------------------------------------------------------- ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, - ScDocument& rDocument, + ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, - String aStartStr, - double fStep, - double fMax, - USHORT nPossDir ) + String aStartStr, + double fStep, + double fMax, + USHORT nPossDir ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ), aFlDirection ( this, ScResId( FL_DIRECTION ) ), aBtnDown ( this, ScResId( BTN_BOTTOM ) ), @@ -86,7 +86,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, aFtStartVal ( this, ScResId( FT_START_VALUE ) ), aEdStartVal ( this, ScResId( ED_START_VALUES ) ), - aStartStrVal ( aStartStr), + aStartStrVal ( aStartStr), aFtEndVal ( this, ScResId( FT_END_VALUE ) ), aEdEndVal ( this, ScResId( ED_END_VALUES ) ), aFtIncrement ( this, ScResId( FT_INCREMENT ) ), @@ -96,7 +96,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), errMsgInvalidVal( ScResId( STR_VALERR ) ), - rDoc ( rDocument ), + rDoc ( rDocument ), theFillDir ( eFillDir ), theFillCmd ( eFillCmd ), theFillDateCmd ( eFillDateCmd ), @@ -264,9 +264,9 @@ BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal() BOOL __EXPORT ScFillSeriesDlg::CheckEndVal() { - BOOL bValOk = FALSE; + BOOL bValOk = FALSE; sal_uInt32 nKey = 0; - String aStr( aEdEndVal.GetText() ); + String aStr( aEdEndVal.GetText() ); if ( aStr.Len() == 0 ) { diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index d771e225ffdb..63bf0053b58c 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.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,7 +43,7 @@ //================================================================== ScGroupDlg::ScGroupDlg( Window* pParent, - USHORT nResId, + USHORT nResId, BOOL bUngroup, BOOL bRows ) : ModalDialog ( pParent, ScResId( nResId ) ), diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index d2c2f2c7cf84..aab3a2188c00 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.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,12 +49,12 @@ // defines ------------------------------------------------------------------- -#define ABS_SREF SCA_VALID \ +#define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ +#define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D +#define ABS_SREF3D ABS_SREF | SCA_TAB_3D +#define ABS_DREF3D ABS_DREF | SCA_TAB_3D @@ -69,27 +69,27 @@ inline void EnableDisable( Window& rWin, BOOL bEnable ) } //============================================================================ -// class ScHighlightChgDlg +// class ScHighlightChgDlg //---------------------------------------------------------------------------- ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData) + ScViewData* ptrViewData) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_HIGHLIGHT_CHANGES ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_HIGHLIGHT_CHANGES ), // - aHighlightBox ( this, ScResId( CB_HIGHLIGHT)), + aHighlightBox ( this, ScResId( CB_HIGHLIGHT)), aFlFilter ( this, ScResId( FL_FILTER)), - aFilterCtr ( this), - aCbAccept ( this, ScResId( CB_HIGHLIGHT_ACCEPT)), - aCbReject ( this, ScResId( CB_HIGHLIGHT_REJECT)), - aOkButton ( this, ScResId( BTN_OK ) ), - aCancelButton ( this, ScResId( BTN_CANCEL ) ), - aHelpButton ( this, ScResId( BTN_HELP ) ), + aFilterCtr ( this), + aCbAccept ( this, ScResId( CB_HIGHLIGHT_ACCEPT)), + aCbReject ( this, ScResId( CB_HIGHLIGHT_REJECT)), + aOkButton ( this, ScResId( BTN_OK ) ), + aCancelButton ( this, ScResId( BTN_CANCEL ) ), + aHelpButton ( this, ScResId( BTN_HELP ) ), aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), - aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), + aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), // - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), aLocalRangeName ( *(pDoc->GetRangeName()) ) { FreeResource(); @@ -119,7 +119,7 @@ ScHighlightChgDlg::~ScHighlightChgDlg() void __EXPORT ScHighlightChgDlg::Init() { - String aAreaStr; + String aAreaStr; ScRange aRange; DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" ); @@ -130,7 +130,7 @@ void __EXPORT ScHighlightChgDlg::Init() aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); aFilterCtr.ClearAuthors(); ScStrCollection aUserColl=pChanges->GetUserCollection(); - for(USHORT i=0;i<aUserColl.GetCount();i++) + for(USHORT i=0;i<aUserColl.GetCount();i++) aFilterCtr.InsertAuthor(aUserColl[i]->GetString()); } diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src index a244a3e2a44e..ce6409347168 100644 --- a/sc/source/ui/miscdlgs/highred.src +++ b/sc/source/ui/miscdlgs/highred.src @@ -1,7 +1,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/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index f09513960ae4..99d92f08a106 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.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/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 63d55ac6f41e..b96ccb1346a6 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.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 @@ -48,12 +48,12 @@ USHORT ScInsertContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | IDF_ATTRIB | IDF_OBJECTS); USHORT ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; USHORT ScInsertContentsDlg::nPreviousChecks2 = 0; -USHORT ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd +USHORT ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd //----------------------------------------------------------------------- -ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, - USHORT nCheckDefaults, +ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, + USHORT nCheckDefaults, const String* pStrTitle ) : ModalDialog ( pParent, ScResId( RID_SCDLG_INSCONT ) ), @@ -70,11 +70,11 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, aFlSep1 ( this, ScResId( FL_SEP1 ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), aBtnSkipEmptyCells( this, ScResId(BTN_SKIP_EMPTY ) ), - aBtnTranspose ( this, ScResId( BTN_TRANSPOSE ) ), + aBtnTranspose ( this, ScResId( BTN_TRANSPOSE ) ), aBtnLink ( this, ScResId( BTN_LINK ) ), aFlOperation ( this, ScResId( FL_OPERATION ) ), aRbNoOp ( this, ScResId( BTN_OP_NOOP ) ), - aRbAdd ( this, ScResId( BTN_OP_ADD ) ), + aRbAdd ( this, ScResId( BTN_OP_ADD ) ), aRbSub ( this, ScResId( BTN_OP_SUB ) ), aRbMul ( this, ScResId( BTN_OP_MUL ) ), aRbDiv ( this, ScResId( BTN_OP_DIV ) ), @@ -86,9 +86,9 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), - bOtherDoc ( FALSE ), - bFillMode ( FALSE ), - bChangeTrack ( FALSE ), + bOtherDoc ( FALSE ), + bFillMode ( FALSE ), + bChangeTrack ( FALSE ), bMoveDownDisabled( FALSE ), bMoveRightDisabled( FALSE ) { @@ -129,14 +129,14 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, switch( ScInsertContentsDlg::nPreviousMoveMode ) { - case INS_NONE: aRbMoveNone.Check(TRUE); break; - case INS_CELLSDOWN: aRbMoveDown.Check(TRUE); break; + case INS_NONE: aRbMoveNone.Check(TRUE); break; + case INS_CELLSDOWN: aRbMoveDown.Check(TRUE); break; case INS_CELLSRIGHT: aRbMoveRight.Check(TRUE); break; } aBtnSkipEmptyCells.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_NOEMPTY ) != 0); - aBtnTranspose.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_TRANS ) != 0); - aBtnLink.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_LINK ) != 0); + aBtnTranspose.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_TRANS ) != 0); + aBtnLink.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_LINK ) != 0); DisableChecks( aBtnInsAll.IsChecked() ); @@ -213,7 +213,7 @@ void ScInsertContentsDlg::DisableChecks( BOOL bInsAllChecked ) aBtnInsNotes.Enable(); aBtnInsAttrs.Enable(); - // "Objects" is disabled for "Fill Tables" + // "Objects" is disabled for "Fill Tables" if ( bFillMode ) aBtnInsObjects.Disable(); else @@ -338,12 +338,12 @@ __EXPORT ScInsertContentsDlg::~ScInsertContentsDlg() ScInsertContentsDlg::nPreviousChecks2 = 0; if(aBtnSkipEmptyCells.IsChecked()) ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_NOEMPTY; - if( aBtnTranspose.IsChecked()) + if( aBtnTranspose.IsChecked()) ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_TRANS; if( aBtnLink.IsChecked() ) ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_LINK; - if (!bFillMode) // im FillMode ist None gecheckt und alle 3 disabled + if (!bFillMode) // im FillMode ist None gecheckt und alle 3 disabled { if ( aRbMoveNone.IsChecked() ) ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; @@ -354,7 +354,7 @@ __EXPORT ScInsertContentsDlg::~ScInsertContentsDlg() } } -USHORT ScInsertContentsDlg::GetFormulaCmdBits() const +USHORT ScInsertContentsDlg::GetFormulaCmdBits() const { ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; if(aRbAdd.IsChecked()) diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index d3a5cbe4f0dd..5ee5e824e072 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.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 @@ -68,32 +68,32 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_INSERT_TABLE ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_INSERT_TABLE ) ), // - aBtnBefore ( this, ScResId( RB_BEFORE ) ), - aBtnBehind ( this, ScResId( RB_BEHIND ) ), - aFlPos ( this, ScResId( FL_POSITION ) ), - aBtnNew ( this, ScResId( RB_NEW ) ), + aBtnBefore ( this, ScResId( RB_BEFORE ) ), + aBtnBehind ( this, ScResId( RB_BEHIND ) ), + aFlPos ( this, ScResId( FL_POSITION ) ), + aBtnNew ( this, ScResId( RB_NEW ) ), aBtnFromFile ( this, ScResId( RB_FROMFILE ) ), - aFtCount ( this, ScResId( FT_COUNT ) ), - aNfCount ( this, ScResId( NF_COUNT ) ), - aFtName ( this, ScResId( FT_NAME ) ), - aEdName ( this, ScResId( ED_TABNAME ) ), - aLbTables ( this, ScResId( LB_TABLES ) ), - aFtPath ( this, ScResId( FT_PATH ) ), - aBtnBrowse ( this, ScResId( BTN_BROWSE ) ), - aBtnLink ( this, ScResId( CB_LINK ) ), - aFlTable ( this, ScResId( FL_TABLE ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - rViewData ( rData ), - rDoc ( *rData.GetDocument() ), - pDocShTables ( NULL ), + aFtCount ( this, ScResId( FT_COUNT ) ), + aNfCount ( this, ScResId( NF_COUNT ) ), + aFtName ( this, ScResId( FT_NAME ) ), + aEdName ( this, ScResId( ED_TABNAME ) ), + aLbTables ( this, ScResId( LB_TABLES ) ), + aFtPath ( this, ScResId( FT_PATH ) ), + aBtnBrowse ( this, ScResId( BTN_BROWSE ) ), + aBtnLink ( this, ScResId( CB_LINK ) ), + aFlTable ( this, ScResId( FL_TABLE ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + rViewData ( rData ), + rDoc ( *rData.GetDocument() ), + pDocShTables ( NULL ), pDocInserter ( NULL ), bMustClose ( false ), - nSelTabIndex ( 0 ), - nTableCount (nTabCount) + nSelTabIndex ( 0 ), + nTableCount (nTabCount) { #if ENABLE_LAYOUT SetHelpId (SID_INSERT_TABLE); @@ -116,12 +116,12 @@ __EXPORT ScInsertTableDlg::~ScInsertTableDlg() void ScInsertTableDlg::Init_Impl( bool bFromFile ) { - aBtnBrowse .SetClickHdl( LINK( this, ScInsertTableDlg, BrowseHdl_Impl ) ); - aBtnNew .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); - aBtnFromFile .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); - aLbTables .SetSelectHdl( LINK( this, ScInsertTableDlg, SelectHdl_Impl ) ); - aNfCount .SetModifyHdl( LINK( this, ScInsertTableDlg, CountHdl_Impl)); - aBtnOk .SetClickHdl( LINK( this, ScInsertTableDlg, DoEnterHdl )); + aBtnBrowse .SetClickHdl( LINK( this, ScInsertTableDlg, BrowseHdl_Impl ) ); + aBtnNew .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); + aBtnFromFile .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); + aLbTables .SetSelectHdl( LINK( this, ScInsertTableDlg, SelectHdl_Impl ) ); + aNfCount .SetModifyHdl( LINK( this, ScInsertTableDlg, CountHdl_Impl)); + aBtnOk .SetClickHdl( LINK( this, ScInsertTableDlg, DoEnterHdl )); aBtnBefore.Check(); aNfCount.SetText( String::CreateFromInt32(nTableCount) ); @@ -173,7 +173,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) short __EXPORT ScInsertTableDlg::Execute() { // set Parent of DocumentInserter and Doc-Manager - Window* pOldDefParent = Application::GetDefDialogParent(); + Window* pOldDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( LAYOUT_THIS_WINDOW (this) ); if ( aBtnFromFile.IsChecked() ) @@ -190,12 +190,12 @@ void ScInsertTableDlg::SetNewTable_Impl() { if (aBtnNew.IsChecked() ) { - aNfCount .Enable(); - aFtCount .Enable(); - aLbTables .Disable(); - aFtPath .Disable(); - aBtnBrowse .Disable(); - aBtnLink .Disable(); + aNfCount .Enable(); + aFtCount .Enable(); + aLbTables .Disable(); + aFtPath .Disable(); + aBtnBrowse .Disable(); + aBtnLink .Disable(); if(nTableCount==1) { @@ -211,14 +211,14 @@ void ScInsertTableDlg::SetFromTo_Impl() { if (aBtnFromFile.IsChecked() ) { - aEdName .Disable(); - aFtName .Disable(); - aFtCount .Disable(); - aNfCount .Disable(); - aLbTables .Enable(); - aFtPath .Enable(); - aBtnBrowse .Enable(); - aBtnLink .Enable(); + aEdName .Disable(); + aFtName .Disable(); + aFtCount .Disable(); + aNfCount .Disable(); + aLbTables .Enable(); + aFtPath .Enable(); + aBtnBrowse .Enable(); + aBtnLink .Enable(); } } diff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.src index 6f64c0de1d62..375dfc24fa4a 100644 --- a/sc/source/ui/miscdlgs/instbdlg.src +++ b/sc/source/ui/miscdlgs/instbdlg.src @@ -1,7 +1,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/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index f340cab4127c..f2a9a73c7538 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.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 @@ //================================================================== ScSelEntryDlg::ScSelEntryDlg( Window* pParent, - USHORT nResId, + USHORT nResId, const String& aTitle, const String& aLbTitle, List& aEntryList ) : diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 26bc8cc56dad..f6aea5799417 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.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,18 +58,18 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) : ModalDialog ( pParent, ScResId( RID_SCDLG_LINKAREA ) ), // - aFlLocation ( this, ScResId( FL_LOCATION ) ), - aCbUrl ( this, ScResId( CB_URL ) ), - aBtnBrowse ( this, ScResId( BTN_BROWSE ) ), - aTxtHint ( this, ScResId( FT_HINT ) ), - aFtRanges ( this, ScResId( FT_RANGES ) ), - aLbRanges ( this, ScResId( LB_RANGES ) ), - aBtnReload ( this, ScResId( BTN_RELOAD ) ), - aNfDelay ( this, ScResId( NF_DELAY ) ), - aFtSeconds ( this, ScResId( FT_SECONDS ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aFlLocation ( this, ScResId( FL_LOCATION ) ), + aCbUrl ( this, ScResId( CB_URL ) ), + aBtnBrowse ( this, ScResId( BTN_BROWSE ) ), + aTxtHint ( this, ScResId( FT_HINT ) ), + aFtRanges ( this, ScResId( FT_RANGES ) ), + aLbRanges ( this, ScResId( LB_RANGES ) ), + aBtnReload ( this, ScResId( BTN_RELOAD ) ), + aNfDelay ( this, ScResId( NF_DELAY ) ), + aFtSeconds ( this, ScResId( FT_SECONDS ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), // pSourceShell( NULL ), pDocInserter( NULL ) @@ -77,7 +77,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) : { FreeResource(); - aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL + aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL aCbUrl.SetSelectHdl( LINK( this, ScLinkedAreaDlg, FileHdl ) ); aBtnBrowse.SetClickHdl( LINK( this, ScLinkedAreaDlg, BrowseHdl ) ); aLbRanges.SetSelectHdl( LINK( this, ScLinkedAreaDlg, RangeHdl ) ); @@ -94,7 +94,7 @@ short ScLinkedAreaDlg::Execute() { // set parent for file dialog or filter options - Window* pOldDefParent = Application::GetDefDialogParent(); + Window* pOldDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); @@ -124,14 +124,14 @@ IMPL_LINK( ScLinkedAreaDlg, FileHdl, ComboBox*, EMPTYARG ) SfxMedium* pMed = pSourceShell->GetMedium(); if ( pMed->GetName() == aEntered ) { - // already loaded - nothing to do + // already loaded - nothing to do return 0; } } String aFilter; String aOptions; - // get filter name by looking at the file content (bWithContent = TRUE) + // get filter name by looking at the file content (bWithContent = TRUE) // Break operation if any error occured inside. if (!ScDocumentLoader::GetFilterName( aEntered, aFilter, aOptions, TRUE, TRUE )) return 0; @@ -151,7 +151,7 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter, { if ( pSourceShell ) { - // unload old document + // unload old document pSourceShell->DoClose(); pSourceShell = NULL; aSourceRef.Clear(); @@ -166,16 +166,16 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter, SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, rFile ); - ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, TRUE ); // with interaction + ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, TRUE ); // with interaction pSourceShell = aLoader.GetDocShell(); if ( pSourceShell ) { ULONG nErr = pSourceShell->GetErrorCode(); if (nErr) - ErrorHandler::HandleError( nErr ); // including warnings + ErrorHandler::HandleError( nErr ); // including warnings aSourceRef = pSourceShell; - aLoader.ReleaseDocRef(); // don't call DoClose in DocLoader dtor + aLoader.ReleaseDocRef(); // don't call DoClose in DocLoader dtor } } } @@ -362,7 +362,7 @@ ULONG ScLinkedAreaDlg::GetRefresh() if ( aBtnReload.IsChecked() ) return sal::static_int_cast<ULONG>( aNfDelay.GetValue() ); else - return 0; // disabled + return 0; // disabled } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/linkarea.src b/sc/source/ui/miscdlgs/linkarea.src index 715d3fd20766..ec5e3d4b868d 100644 --- a/sc/source/ui/miscdlgs/linkarea.src +++ b/sc/source/ui/miscdlgs/linkarea.src @@ -1,7 +1,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/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 7bc19c14fa27..510f5785fe83 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.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,9 +43,9 @@ //================================================================== ScMetricInputDlg::ScMetricInputDlg( Window* pParent, - USHORT nResId, - long nCurrent, - long nDefault, + USHORT nResId, + long nCurrent, + long nDefault, FieldUnit eFUnit, USHORT nDecimals, long nMaximum, @@ -53,11 +53,11 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent, long nFirst, long nLast ) - : ModalDialog ( pParent, ScResId( nResId ) ), + : ModalDialog ( pParent, ScResId( nResId ) ), // aFtEditTitle ( this, ScResId( FT_LABEL ) ), aEdValue ( this, ScResId( ED_VALUE ) ), - aBtnDefVal ( this, ScResId( BTN_DEFVAL ) ), + aBtnDefVal ( this, ScResId( BTN_DEFVAL ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ) @@ -77,9 +77,9 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent, aEdValue.SetFirst ( aEdValue.Normalize( nFirst ), FUNIT_TWIP ); aEdValue.SetSpinSize ( aEdValue.Normalize( 1 ) / 10 ); aEdValue.SetValue ( aEdValue.Normalize( nDefault ), FUNIT_TWIP ); - nDefaultValue = sal::static_int_cast<long>( aEdValue.GetValue() ); + nDefaultValue = sal::static_int_cast<long>( aEdValue.GetValue() ); aEdValue.SetValue ( aEdValue.Normalize( nCurrent ), FUNIT_TWIP ); - nCurrentValue = sal::static_int_cast<long>( aEdValue.GetValue() ); + nCurrentValue = sal::static_int_cast<long>( aEdValue.GetValue() ); aBtnDefVal.Check( nCurrentValue == nDefaultValue ); FreeResource(); @@ -98,9 +98,9 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const /* mit Nachkommastellen: - double nVal = aEdValue.GetValue( eUnit ); - USHORT nDecs = aEdValue.GetDecimalDigits(); - double nFactor = 0.0; + double nVal = aEdValue.GetValue( eUnit ); + USHORT nDecs = aEdValue.GetDecimalDigits(); + double nFactor = 0.0; // static long ImpPower10( USHORT nDecs ) { diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index b3505aa005ff..a000b1dfd10c 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.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,7 +58,7 @@ ScMoveTableDlg::ScMoveTableDlg( Window* pParent ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_MOVETAB ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_MOVETAB ) ), // aFtDoc ( this, ScResId( FT_DEST ) ), aLbDoc ( this, ScResId( LB_DEST ) ), @@ -123,10 +123,10 @@ void __EXPORT ScMoveTableDlg::Init() void ScMoveTableDlg::InitDocListBox() { - SfxObjectShell* pSh = SfxObjectShell::GetFirst(); - ScDocShell* pScSh = NULL; - USHORT nSelPos = 0; - USHORT i = 0; + SfxObjectShell* pSh = SfxObjectShell::GetFirst(); + ScDocShell* pScSh = NULL; + USHORT nSelPos = 0; + USHORT i = 0; aLbDoc.Clear(); aLbDoc.SetUpdateMode( FALSE ); diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx index 269ae78ad21f..67e22dae7b1a 100644 --- a/sc/source/ui/miscdlgs/namecrea.cxx +++ b/sc/source/ui/miscdlgs/namecrea.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,18 +45,18 @@ ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags ) : ModalDialog( pParent, ScResId(RID_SCDLG_NAMES_CREATE) ), aFixedLine ( this, ScResId( FL_FRAME ) ), - aTopBox ( this, ScResId( BTN_TOP ) ), - aLeftBox ( this, ScResId( BTN_LEFT ) ), - aBottomBox ( this, ScResId( BTN_BOTTOM ) ), - aRightBox ( this, ScResId( BTN_RIGHT ) ), - aOKButton ( this, ScResId( BTN_OK ) ), - aCancelButton ( this, ScResId( BTN_CANCEL ) ), - aHelpButton ( this, ScResId( BTN_HELP ) ) + aTopBox ( this, ScResId( BTN_TOP ) ), + aLeftBox ( this, ScResId( BTN_LEFT ) ), + aBottomBox ( this, ScResId( BTN_BOTTOM ) ), + aRightBox ( this, ScResId( BTN_RIGHT ) ), + aOKButton ( this, ScResId( BTN_OK ) ), + aCancelButton ( this, ScResId( BTN_CANCEL ) ), + aHelpButton ( this, ScResId( BTN_HELP ) ) { - aTopBox.Check ( (nFlags & NAME_TOP) ? TRUE : FALSE ); - aLeftBox.Check ( (nFlags & NAME_LEFT) ? TRUE : FALSE ); + aTopBox.Check ( (nFlags & NAME_TOP) ? TRUE : FALSE ); + aLeftBox.Check ( (nFlags & NAME_LEFT) ? TRUE : FALSE ); aBottomBox.Check( (nFlags & NAME_BOTTOM)? TRUE : FALSE ); - aRightBox.Check ( (nFlags & NAME_RIGHT) ? TRUE : FALSE ); + aRightBox.Check ( (nFlags & NAME_RIGHT) ? TRUE : FALSE ); FreeResource(); } @@ -65,12 +65,12 @@ ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags ) USHORT ScNameCreateDlg::GetFlags() const { - USHORT nResult = 0; + USHORT nResult = 0; - nResult |= aTopBox.IsChecked() ? NAME_TOP: 0 ; - nResult |= aLeftBox.IsChecked() ? NAME_LEFT: 0 ; - nResult |= aBottomBox.IsChecked() ? NAME_BOTTOM: 0 ; - nResult |= aRightBox.IsChecked() ? NAME_RIGHT: 0 ; + nResult |= aTopBox.IsChecked() ? NAME_TOP: 0 ; + nResult |= aLeftBox.IsChecked() ? NAME_LEFT: 0 ; + nResult |= aBottomBox.IsChecked() ? NAME_BOTTOM: 0 ; + nResult |= aRightBox.IsChecked() ? NAME_RIGHT: 0 ; return nResult; } diff --git a/sc/source/ui/miscdlgs/namepast.cxx b/sc/source/ui/miscdlgs/namepast.cxx index 6e5baea3ed42..543f3bd27005 100644 --- a/sc/source/ui/miscdlgs/namepast.cxx +++ b/sc/source/ui/miscdlgs/namepast.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,12 +45,12 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL bInsList ) : ModalDialog( pParent, ScResId( RID_SCDLG_NAMES_PASTE ) ), - aLabelText ( this, ScResId( FT_LABEL ) ), - aNameList ( this, ScResId( LB_ENTRYLIST ) ), - aOKButton ( this, ScResId( BTN_OK ) ), - aCancelButton ( this, ScResId( BTN_CANCEL ) ), - aHelpButton ( this, ScResId( BTN_HELP ) ), - aInsListButton ( this, ScResId( BTN_ADD ) ) + aLabelText ( this, ScResId( FT_LABEL ) ), + aNameList ( this, ScResId( LB_ENTRYLIST ) ), + aOKButton ( this, ScResId( BTN_OK ) ), + aCancelButton ( this, ScResId( BTN_CANCEL ) ), + aHelpButton ( this, ScResId( BTN_HELP ) ), + aInsListButton ( this, ScResId( BTN_ADD ) ) { if( ! bInsList ) aInsListButton.Disable(); @@ -60,8 +60,8 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL aNameList.SetSelectHdl( LINK( this,ScNamePasteDlg,ListSelHdl) ); aNameList.SetDoubleClickHdl( LINK( this,ScNamePasteDlg,ListDblClickHdl) ); - USHORT nCnt = pList->GetCount(); - String aText; + USHORT nCnt = pList->GetCount(); + String aText; for( USHORT i=0 ; i<nCnt ; i++ ) { diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 4f70376455b5..9dd2e84550ce 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.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 @@ -499,7 +499,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { USHORT nFmt = ( aAdr.Tab() == mnCurTab ) ? SCA_ABS : SCA_ABS_3D; if ( bSingle ) - aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() ); + aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() ); else rRef.Format( aStr, nFmt | SCR_ABS, pDocP, pDocP->GetAddressConvention() ); } diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index d66bd541a174..87185fdc75e2 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.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/miscdlgs/protectiondlg.src b/sc/source/ui/miscdlgs/protectiondlg.src index 6b62efb4c784..34ad4063de57 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.src +++ b/sc/source/ui/miscdlgs/protectiondlg.src @@ -1,7 +1,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/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index cae6a64ce233..82e2578a5c65 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.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 @@ -75,7 +75,7 @@ ScChangeAction *ScRedComDialog::FindPrev(ScChangeAction *pAction) while(pAction!=NULL) { - if( pAction->GetState()==SC_CAS_VIRGIN && + if( pAction->GetState()==SC_CAS_VIRGIN && pAction->IsDialogRoot() && ScViewUtil::IsActionShown(*pAction,*pSettings,*pDoc)) break; @@ -96,7 +96,7 @@ ScChangeAction *ScRedComDialog::FindNext(ScChangeAction *pAction) while(pAction!=NULL) { - if( pAction->GetState()==SC_CAS_VIRGIN && + if( pAction->GetState()==SC_CAS_VIRGIN && pAction->IsDialogRoot() && ScViewUtil::IsActionShown(*pAction,*pSettings,*pDoc)) break; diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 2a844c784888..36aaa92ef0f2 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.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/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src index 794af9d43ebd..20cb3976a328 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.src +++ b/sc/source/ui/miscdlgs/retypepassdlg.src @@ -1,7 +1,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/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index a7637afc5381..25e97a456af2 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -68,30 +68,30 @@ //======================================================================== // AutoFormat-Dialog: -ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, - ScAutoFormat* pAutoFormat, +ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, + ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc ) : - ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ), + ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ), // aFlFormat ( this, ScResId( FL_FORMAT ) ), - aLbFormat ( this, ScResId( LB_FORMAT ) ), + aLbFormat ( this, ScResId( LB_FORMAT ) ), pWndPreview ( new ScAutoFmtPreview( this, ScResId( WND_PREVIEW ), pDoc ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), aFlFormatting ( this, ScResId( FL_FORMATTING ) ), - aBtnNumFormat ( this, ScResId( BTN_NUMFORMAT ) ), - aBtnBorder ( this, ScResId( BTN_BORDER ) ), - aBtnFont ( this, ScResId( BTN_FONT ) ), - aBtnPattern ( this, ScResId( BTN_PATTERN ) ), - aBtnAlignment ( this, ScResId( BTN_ALIGNMENT ) ), - aBtnAdjust ( this, ScResId( BTN_ADJUST ) ), - aBtnRename ( this, ScResId( BTN_RENAME ) ), + aBtnNumFormat ( this, ScResId( BTN_NUMFORMAT ) ), + aBtnBorder ( this, ScResId( BTN_BORDER ) ), + aBtnFont ( this, ScResId( BTN_FONT ) ), + aBtnPattern ( this, ScResId( BTN_PATTERN ) ), + aBtnAlignment ( this, ScResId( BTN_ALIGNMENT ) ), + aBtnAdjust ( this, ScResId( BTN_ADJUST ) ), + aBtnRename ( this, ScResId( BTN_RENAME ) ), aStrTitle ( ScResId( STR_ADD_TITLE ) ), aStrLabel ( ScResId( STR_ADD_LABEL ) ), aStrClose ( ScResId( STR_BTN_CLOSE ) ), @@ -99,11 +99,11 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, aStrDelMsg ( ScResId( STR_DEL_MSG ) ) , aStrRename ( ScResId( STR_RENAME_TITLE ) ), // - pFormat ( pAutoFormat ), - pSelFmtData ( pSelFormatData ), - nIndex ( 0 ), + pFormat ( pAutoFormat ), + pSelFmtData ( pSelFormatData ), + nIndex ( 0 ), bCoreDataChanged( FALSE ), - bFmtInserted ( FALSE ) + bFmtInserted ( FALSE ) { Init(); pWndPreview->NotifyChange( (*pFormat)[0] ); @@ -124,19 +124,19 @@ void ScAutoFormatDlg::Init() USHORT nCount; String aEntry; - aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) ); + aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) ); aBtnNumFormat.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnBorder .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnFont .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + aBtnBorder .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + aBtnFont .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); aBtnPattern .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); aBtnAlignment.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnAdjust .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnAdd .SetClickHdl ( LINK( this, ScAutoFormatDlg, AddHdl ) ); - aBtnRemove .SetClickHdl ( LINK( this, ScAutoFormatDlg, RemoveHdl ) ); - aBtnOk .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); - aBtnCancel .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); - aBtnRename .SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) ); - aLbFormat .SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) ); + aBtnAdjust .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + aBtnAdd .SetClickHdl ( LINK( this, ScAutoFormatDlg, AddHdl ) ); + aBtnRemove .SetClickHdl ( LINK( this, ScAutoFormatDlg, RemoveHdl ) ); + aBtnOk .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); + aBtnCancel .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); + aBtnRename .SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) ); + aLbFormat .SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) ); aBtnMore.AddWindow( &aBtnRename ); aBtnMore.AddWindow( &aBtnNumFormat ); @@ -180,11 +180,11 @@ void ScAutoFormatDlg::UpdateChecks() ScAutoFormatData* pData = (*pFormat)[nIndex]; aBtnNumFormat.Check( pData->GetIncludeValueFormat() ); - aBtnBorder .Check( pData->GetIncludeFrame() ); - aBtnFont .Check( pData->GetIncludeFont() ); + aBtnBorder .Check( pData->GetIncludeFrame() ); + aBtnFont .Check( pData->GetIncludeFont() ); aBtnPattern .Check( pData->GetIncludeBackground() ); aBtnAlignment.Check( pData->GetIncludeJustify() ); - aBtnAdjust .Check( pData->GetIncludeWidthHeight() ); + aBtnAdjust .Check( pData->GetIncludeWidthHeight() ); } //------------------------------------------------------------------------ @@ -220,7 +220,7 @@ IMPL_LINK_INLINE_END( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG ) IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) { ScAutoFormatData* pData = (*pFormat)[nIndex]; - BOOL bCheck = ((CheckBox*)pBtn)->IsChecked(); + BOOL bCheck = ((CheckBox*)pBtn)->IsChecked(); if ( pBtn == &aBtnNumFormat ) pData->SetIncludeValueFormat( bCheck ); @@ -252,10 +252,10 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) { if ( !bFmtInserted && pSelFmtData ) { - String aStrStandard( ScResId(STR_STANDARD) ); - String aFormatName; - ScStringInputDlg* pDlg; - BOOL bOk = FALSE; + String aStrStandard( ScResId(STR_STANDARD) ); + String aFormatName; + ScStringInputDlg* pDlg; + BOOL bOk = FALSE; while ( !bOk ) { @@ -469,7 +469,7 @@ IMPL_LINK( ScAutoFormatDlg, SelFmtHdl, void *, EMPTYARG ) String __EXPORT ScAutoFormatDlg::GetCurrFormatName() { - String aResult; + String aResult; ((*pFormat)[nIndex])->GetName( aResult ); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 797f29612fe6..7cf5ee1b840f 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.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/miscdlgs/sharedocdlg.src b/sc/source/ui/miscdlgs/sharedocdlg.src index fe55ee58c8e4..13361b216ea5 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.src +++ b/sc/source/ui/miscdlgs/sharedocdlg.src @@ -1,7 +1,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,7 +65,7 @@ ModalDialog RID_SCDLG_SHAREDOCUMENT Pos = MAP_APPFONT ( 6 , 82 ) ; Size = MAP_APPFONT ( 192 , 72 ) ; Border = TRUE ; - }; + }; FixedLine FL_END { Pos = MAP_APPFONT ( 1 , 156 ) ; diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 66cf2c8034e7..230920bf71a9 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.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/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 732543394634..2a8186f05866 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.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,18 +43,18 @@ #include "scresid.hxx" #include "globstr.hrc" #include "simpref.hrc" -#include "rangenam.hxx" // IsNameValid +#include "rangenam.hxx" // IsNameValid #include "simpref.hxx" #include "scmod.hxx" //============================================================================ -#define ABS_SREF SCA_VALID \ +#define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ +#define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D +#define ABS_SREF3D ABS_SREF | SCA_TAB_3D +#define ABS_DREF3D ABS_DREF | SCA_TAB_3D //---------------------------------------------------------------------------- @@ -62,32 +62,32 @@ #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() //============================================================================ -// class ScSimpleRefDlg +// class ScSimpleRefDlg //---------------------------------------------------------------------------- ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ) + ScViewData* ptrViewData ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SIMPLEREF ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SIMPLEREF ), // - aFtAssign ( this, ScResId( FT_ASSIGN ) ), + aFtAssign ( this, ScResId( FT_ASSIGN ) ), aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), - aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), + aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), // - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), - bRefInputMode ( FALSE ), - bAutoReOpen ( TRUE ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), + bRefInputMode ( FALSE ), + bAutoReOpen ( TRUE ), bCloseOnButtonUp( FALSE ), bSingleCell ( FALSE ), bMultiSelection ( FALSE ) { - // damit die Strings in der Resource bei den FixedTexten bleiben koennen: + // damit die Strings in der Resource bei den FixedTexten bleiben koennen: Init(); FreeResource(); SetDispatcherLock( TRUE ); // Modal-Modus einschalten @@ -115,8 +115,8 @@ void ScSimpleRefDlg::SetRefString(const String &rStr) //---------------------------------------------------------------------------- void ScSimpleRefDlg::Init() { - aBtnOk.SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScSimpleRefDlg, CancelBtnHdl ) ); + aBtnOk.SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScSimpleRefDlg, CancelBtnHdl ) ); bCloseFlag=FALSE; } @@ -171,9 +171,9 @@ void ScSimpleRefDlg::SetActive() { aEdAssign.GrabFocus(); - // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen - // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt) - // (der ausgewaehlte DB-Name hat sich auch nicht veraendert) + // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen + // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt) + // (der ausgewaehlte DB-Name hat sich auch nicht veraendert) RefInputDone(); } @@ -196,9 +196,9 @@ void ScSimpleRefDlg::SetCloseHdl( const Link& rLink ) void ScSimpleRefDlg::SetUnoLinks( const Link& rDone, const Link& rAbort, const Link& rChange ) { - aDoneHdl = rDone; - aAbortedHdl = rAbort; - aChangeHdl = rChange; + aDoneHdl = rDone; + aAbortedHdl = rAbort; + aChangeHdl = rChange; } void ScSimpleRefDlg::SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection ) @@ -234,7 +234,7 @@ IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG ) bAutoReOpen=FALSE; String aResult=aEdAssign.GetText(); aCloseHdl.Call(&aResult); - Link aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose + Link aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() ); aUnoLink.Call( &aResult ); return 0; @@ -246,7 +246,7 @@ IMPL_LINK( ScSimpleRefDlg, CancelBtnHdl, void *, EMPTYARG ) bAutoReOpen=FALSE; String aResult=aEdAssign.GetText(); aCloseHdl.Call(NULL); - Link aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose + Link aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() ); aUnoLink.Call( &aResult ); return 0; diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 4ed6eebb07cb..05ccd3553ef5 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.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 @@ -211,7 +211,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties( USHORT nItemCount = pEntry->ItemCount(); for (USHORT nItemPos=0; nItemPos<nItemCount && !bHasData; ++nItemPos) { - SvLBoxItem* pItem = pEntry->GetItem( nItemPos ); + SvLBoxItem* pItem = pEntry->GetItem( nItemPos ); ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem); if ( pStringItem ) { @@ -231,7 +231,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties( { DBG_ERRORFILE( "wrong count" ); } - + return maProperties; } @@ -278,7 +278,7 @@ void ScSolverOptionsDialog::FillListBox() for (sal_Int32 nPos=0; nPos<nCount; nPos++) { rtl::OUString aVisName = aDescriptions[nPos].aDescription; - + uno::Any aValue = maProperties[nPos].Value; uno::TypeClass eClass = aValue.getValueTypeClass(); if ( eClass == uno::TypeClass_BOOLEAN ) @@ -334,7 +334,7 @@ void ScSolverOptionsDialog::EditOption() USHORT nItemCount = pEntry->ItemCount(); for (USHORT nPos=0; nPos<nItemCount; ++nPos) { - SvLBoxItem* pItem = pEntry->GetItem( nPos ); + SvLBoxItem* pItem = pEntry->GetItem( nPos ); ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem); if ( pStringItem ) { diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index fbe2cccfc0ba..f216864932ab 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.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/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 524fcb8420ed..e718ba7be498 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.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,42 +50,42 @@ #undef _SOLVERDLG_CXX -#define ERRORBOX(s) ErrorBox( this, WinBits( WB_OK | WB_DEF_OK), s ).Execute() +#define ERRORBOX(s) ErrorBox( this, WinBits( WB_OK | WB_DEF_OK), s ).Execute() //============================================================================ -// class ScSolverDlg +// class ScSolverDlg //---------------------------------------------------------------------------- ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDocument, - ScAddress aCursorPos ) + ScAddress aCursorPos ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SOLVER ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SOLVER ), // aFlVariables ( this, ScResId( FL_VARIABLES ) ), - aFtFormulaCell ( this, ScResId( FT_FORMULACELL ) ), + aFtFormulaCell ( this, ScResId( FT_FORMULACELL ) ), aEdFormulaCell ( this, this, ScResId( ED_FORMULACELL ) ), - aRBFormulaCell ( this, ScResId( RB_FORMULACELL ), &aEdFormulaCell, this ), - aFtTargetVal ( this, ScResId( FT_TARGETVAL ) ), - aEdTargetVal ( this, ScResId( ED_TARGETVAL ) ), - aFtVariableCell ( this, ScResId( FT_VARCELL ) ), + aRBFormulaCell ( this, ScResId( RB_FORMULACELL ), &aEdFormulaCell, this ), + aFtTargetVal ( this, ScResId( FT_TARGETVAL ) ), + aEdTargetVal ( this, ScResId( ED_TARGETVAL ) ), + aFtVariableCell ( this, ScResId( FT_VARCELL ) ), aEdVariableCell ( this, this, ScResId( ED_VARCELL ) ), - aRBVariableCell ( this, ScResId( RB_VARCELL ), &aEdVariableCell, this ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aRBVariableCell ( this, ScResId( RB_VARCELL ), &aEdVariableCell, this ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), // - theFormulaCell ( aCursorPos ), - theVariableCell ( aCursorPos ), - pDoc ( pDocument ), - nCurTab ( aCursorPos.Tab() ), - pEdActive ( NULL ), - bDlgLostFocus ( FALSE ), - errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ), - errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ), - errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), - errMsgInvalidVal ( ScResId( STR_INVALIDVAL ) ) + theFormulaCell ( aCursorPos ), + theVariableCell ( aCursorPos ), + pDoc ( pDocument ), + nCurTab ( aCursorPos.Tab() ), + pEdActive ( NULL ), + bDlgLostFocus ( FALSE ), + errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ), + errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ), + errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), + errMsgInvalidVal ( ScResId( STR_INVALIDVAL ) ) { Init(); FreeResource(); @@ -101,10 +101,10 @@ __EXPORT ScSolverDlg::~ScSolverDlg() void __EXPORT ScSolverDlg::Init() { - String aStr; + String aStr; - aBtnOk. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); - aBtnCancel. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); + aBtnOk. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); + aBtnCancel. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); Link aLink = LINK( this, ScSolverDlg, GetFocusHdl ); aEdFormulaCell. SetGetFocusHdl ( aLink ); @@ -159,9 +159,9 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( rRef.aStart != rRef.aEnd ) RefInputStart(pEdActive); - String aStr; - ScAddress aAdr = rRef.aStart; - USHORT nFmt = ( aAdr.Tab() == nCurTab ) + String aStr; + ScAddress aAdr = rRef.aStart; + USHORT nFmt = ( aAdr.Tab() == nCurTab ) ? SCA_ABS : SCA_ABS_3D; @@ -235,8 +235,8 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) // 3. wurde ein korrekter Zielwert eingegeben const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); - USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); + USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); + USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); if ( SCA_VALID == ( nRes1 & SCA_VALID ) ) { @@ -255,7 +255,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) ScSolveParam aOutParam( theFormulaCell, theVariableCell, theTargetValStr ); - ScSolveItem aOutItem( SCITEM_SOLVEDATA, &aOutParam ); + ScSolveItem aOutItem( SCITEM_SOLVEDATA, &aOutParam ); SetDispatcherLock( FALSE ); diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index f2bcd660bae6..c35b4e9d6ce1 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -71,7 +71,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, aEdInput.SetText( rDefault ); aEdInput.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); - // HelpId for Edit different for different uses + // HelpId for Edit different for different uses if ( nHelpId == FID_TAB_APPEND ) aEdInput.SetHelpId( HID_SC_APPEND_NAME ); diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 6154749f16aa..e99c8d98ecfe 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 2dce5792232d..7fe01494a49f 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.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,25 +50,25 @@ //============================================================================ -// class ScTabOpDlg +// class ScTabOpDlg //---------------------------------------------------------------------------- ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDocument, - const ScRefAddress& rCursorPos ) + const ScRefAddress& rCursorPos ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_TABOP ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_TABOP ), // aFlVariables ( this, ScResId( FL_VARIABLES ) ), aFtFormulaRange ( this, ScResId( FT_FORMULARANGE ) ), aEdFormulaRange ( this, this, ScResId( ED_FORMULARANGE ) ), - aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ), - aFtRowCell ( this, ScResId( FT_ROWCELL ) ), + aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ), + aFtRowCell ( this, ScResId( FT_ROWCELL ) ), aEdRowCell ( this, this, ScResId( ED_ROWCELL ) ), - aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ), - aFtColCell ( this, ScResId( FT_COLCELL ) ), + aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ), + aFtColCell ( this, ScResId( FT_COLCELL ) ), aEdColCell ( this, this, ScResId( ED_COLCELL ) ), - aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ), + aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), @@ -78,12 +78,12 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, nCurTab ( theFormulaCell.Tab() ), pEdActive ( NULL ), bDlgLostFocus ( FALSE ), - errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), - errMsgNoColRow ( ScResId( STR_NOCOLROW ) ), - errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ), - errMsgWrongRowCol ( ScResId( STR_WRONGROWCOL ) ), - errMsgNoColFormula ( ScResId( STR_NOCOLFORMULA ) ), - errMsgNoRowFormula ( ScResId( STR_NOROWFORMULA ) ) + errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), + errMsgNoColRow ( ScResId( STR_NOCOLROW ) ), + errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ), + errMsgWrongRowCol ( ScResId( STR_WRONGROWCOL ) ), + errMsgNoColFormula ( ScResId( STR_NOCOLFORMULA ) ), + errMsgNoRowFormula ( ScResId( STR_NOROWFORMULA ) ) { Init(); FreeResource(); @@ -100,8 +100,8 @@ __EXPORT ScTabOpDlg::~ScTabOpDlg() void __EXPORT ScTabOpDlg::Init() { - aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); - aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); + aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); + aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); Link aLink = LINK( this, ScTabOpDlg, GetFocusHdl ); aEdFormulaRange.SetGetFocusHdl( aLink ); @@ -160,8 +160,8 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( rRef.aStart != rRef.aEnd ) RefInputStart(pEdActive); - String aStr; - USHORT nFmt = ( rRef.aStart.Tab() == nCurTab ) + String aStr; + USHORT nFmt = ( rRef.aStart.Tab() == nCurTab ) ? SCR_ABS : SCR_ABS_3D; @@ -191,7 +191,7 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) void ScTabOpDlg::RaiseError( ScTabOpErr eError ) { const String* pMsg = &errMsgNoFormula; - Edit* pEd = &aEdFormulaRange; + Edit* pEd = &aEdFormulaRange; switch ( eError ) { @@ -281,7 +281,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if (aEdRowCell.GetText().Len() > 0) { - if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab, + if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab, theRowCell, eConv )) nError = TABOPERR_WRONGROW; else @@ -300,7 +300,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) nError = TABOPERR_WRONGCOL; else { - if (nMode == 1) // beides + if (nMode == 1) // beides { nMode = 2; ConvertSingleRef( pDoc, aEdFormulaRange.GetText(), nCurTab, @@ -323,7 +323,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) theRowCell, theColCell, nMode ); - ScTabOpItem aOutItem( SID_TABOP, &aOutParam ); + ScTabOpItem aOutItem( SID_TABOP, &aOutParam ); SetDispatcherLock( FALSE ); SwitchToDocument(); diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 5af55079dda6..a6747798efdb 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.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 @@ -31,7 +31,7 @@ #undef SC_DLLIMPLEMENTATION -// ohne precompiled Headers uebersetzen !!! +// ohne precompiled Headers uebersetzen !!! @@ -53,9 +53,9 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : - SfxTabDialog ( pParent, ScResId( RID_SCDLG_CHAR ), pAttr ), - rOutAttrs ( *pAttr ), - rDocShell ( *pDocShell ) + SfxTabDialog ( pParent, ScResId( RID_SCDLG_CHAR ), pAttr ), + rOutAttrs ( *pAttr ), + rDocShell ( *pDocShell ) { FreeResource(); @@ -94,8 +94,8 @@ void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) // ----------------------------------------------------------------------- ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) : - SfxTabDialog ( pParent, ScResId( RID_SCDLG_PARAGRAPH ), pAttr ), - rOutAttrs ( *pAttr ) + SfxTabDialog ( pParent, ScResId( RID_SCDLG_PARAGRAPH ), pAttr ), + rOutAttrs ( *pAttr ) { FreeResource(); diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index acf12cf263b0..4aeef5746004 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.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/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index f0eea3a665ed..6130f1ccc09a 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.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,12 +52,12 @@ // defines ------------------------------------------------------------------- -#define ABS_SREF SCA_VALID \ +#define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ +#define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D +#define ABS_SREF3D ABS_SREF | SCA_TAB_3D +#define ABS_DREF3D ABS_DREF | SCA_TAB_3D //============================================================================ @@ -79,78 +79,78 @@ struct SaveData bDirty = TRUE; } - String aStrSymbol; - BOOL bCriteria:1; - BOOL bPrintArea:1; - BOOL bColHeader:1; - BOOL bRowHeader:1; - BOOL bDirty:1; + String aStrSymbol; + BOOL bCriteria:1; + BOOL bPrintArea:1; + BOOL bColHeader:1; + BOOL bRowHeader:1; + BOOL bDirty:1; }; static SaveData* pSaveObj = NULL; #define SAVE_DATA() \ - pSaveObj->aStrSymbol = aEdAssign.GetText(); \ - pSaveObj->bCriteria = aBtnCriteria.IsChecked(); \ - pSaveObj->bPrintArea = aBtnPrintArea.IsChecked(); \ - pSaveObj->bColHeader = aBtnColHeader.IsChecked(); \ - pSaveObj->bRowHeader = aBtnRowHeader.IsChecked(); \ - pSaveObj->bDirty = TRUE; + pSaveObj->aStrSymbol = aEdAssign.GetText(); \ + pSaveObj->bCriteria = aBtnCriteria.IsChecked(); \ + pSaveObj->bPrintArea = aBtnPrintArea.IsChecked(); \ + pSaveObj->bColHeader = aBtnColHeader.IsChecked(); \ + pSaveObj->bRowHeader = aBtnRowHeader.IsChecked(); \ + pSaveObj->bDirty = TRUE; #define RESTORE_DATA() \ - if ( pSaveObj->bDirty ) \ - { \ - aEdAssign.SetText( pSaveObj->aStrSymbol ); \ - aBtnCriteria.Check( pSaveObj->bCriteria ); \ - aBtnPrintArea.Check( pSaveObj->bPrintArea ); \ - aBtnColHeader.Check( pSaveObj->bColHeader ); \ - aBtnRowHeader.Check( pSaveObj->bRowHeader ); \ - pSaveObj->bDirty = FALSE; \ + if ( pSaveObj->bDirty ) \ + { \ + aEdAssign.SetText( pSaveObj->aStrSymbol ); \ + aBtnCriteria.Check( pSaveObj->bCriteria ); \ + aBtnPrintArea.Check( pSaveObj->bPrintArea ); \ + aBtnColHeader.Check( pSaveObj->bColHeader ); \ + aBtnRowHeader.Check( pSaveObj->bRowHeader ); \ + pSaveObj->bDirty = FALSE; \ } #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute(); //============================================================================ -// class ScNameDlg +// class ScNameDlg //---------------------------------------------------------------------------- ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData, - const ScAddress& aCursorPos ) + ScViewData* ptrViewData, + const ScAddress& aCursorPos ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_NAMES ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_NAMES ), // aFlName ( this, ScResId( FL_NAME ) ), - aEdName ( this, ScResId( ED_NAME ) ), + aEdName ( this, ScResId( ED_NAME ) ), // aFlAssign ( this, ScResId( FL_ASSIGN ) ), aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), - aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), + aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), // - aFlType ( this, ScResId( FL_TYPE ) ), - aBtnPrintArea ( this, ScResId( BTN_PRINTAREA ) ), - aBtnColHeader ( this, ScResId( BTN_COLHEADER ) ), - aBtnCriteria ( this, ScResId( BTN_CRITERIA ) ), - aBtnRowHeader ( this, ScResId( BTN_ROWHEADER ) ), + aFlType ( this, ScResId( FL_TYPE ) ), + aBtnPrintArea ( this, ScResId( BTN_PRINTAREA ) ), + aBtnColHeader ( this, ScResId( BTN_COLHEADER ) ), + aBtnCriteria ( this, ScResId( BTN_CRITERIA ) ), + aBtnRowHeader ( this, ScResId( BTN_ROWHEADER ) ), // - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), // - bSaved (FALSE), - aStrAdd ( ScResId( STR_ADD ) ), - aStrModify ( ScResId( STR_MODIFY ) ), + bSaved (FALSE), + aStrAdd ( ScResId( STR_ADD ) ), + aStrModify ( ScResId( STR_MODIFY ) ), errMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ), // - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), aLocalRangeName ( *(pDoc->GetRangeName()) ), - theCursorPos ( aCursorPos ) // zum Berechnen der Referenzen + theCursorPos ( aCursorPos ) // zum Berechnen der Referenzen { pSaveObj = new SaveData; Init(); @@ -170,19 +170,19 @@ __EXPORT ScNameDlg::~ScNameDlg() void __EXPORT ScNameDlg::Init() { - String aAreaStr; + String aAreaStr; ScRange aRange; DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" ); - aBtnOk.SetClickHdl ( LINK( this, ScNameDlg, OkBtnHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScNameDlg, CancelBtnHdl ) ); - aBtnAdd.SetClickHdl ( LINK( this, ScNameDlg, AddBtnHdl ) ); - aBtnRemove.SetClickHdl ( LINK( this, ScNameDlg, RemoveBtnHdl ) ); + aBtnOk.SetClickHdl ( LINK( this, ScNameDlg, OkBtnHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScNameDlg, CancelBtnHdl ) ); + aBtnAdd.SetClickHdl ( LINK( this, ScNameDlg, AddBtnHdl ) ); + aBtnRemove.SetClickHdl ( LINK( this, ScNameDlg, RemoveBtnHdl ) ); aEdAssign.SetGetFocusHdl( LINK( this, ScNameDlg, AssignGetFocusHdl ) ); - aEdAssign.SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) ); - aEdName.SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) ); - aEdName.SetSelectHdl ( LINK( this, ScNameDlg, NameSelectHdl ) ); + aEdAssign.SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) ); + aEdName.SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) ); + aEdName.SetSelectHdl ( LINK( this, ScNameDlg, NameSelectHdl ) ); aBtnCriteria .Hide(); aBtnPrintArea.Hide(); @@ -218,7 +218,7 @@ void __EXPORT ScNameDlg::Init() SAVE_DATA() //@BugID 54702 - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } //---------------------------------------------------------------------------- @@ -244,7 +244,7 @@ void ScNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( rRef.aStart != rRef.aEnd ) RefInputStart(&aEdAssign); String aRefStr; - rRef.Format( aRefStr, ABS_DREF3D, pDocP, + rRef.Format( aRefStr, ABS_DREF3D, pDocP, ScAddress::Details(pDocP->GetAddressConvention(), 0, 0) ); aEdAssign.SetRefString( aRefStr ); } @@ -271,7 +271,7 @@ void ScNameDlg::SetActive() void __EXPORT ScNameDlg::UpdateChecks() { - USHORT nCurPos=0; + USHORT nCurPos=0; if(aLocalRangeName.SearchName( aEdName.GetText(), nCurPos)) { @@ -288,7 +288,7 @@ void __EXPORT ScNameDlg::UpdateChecks() { if ( !aFlType.IsEnabled() ) { - aFlType .Enable(); + aFlType .Enable(); aBtnCriteria .Enable(); aBtnPrintArea.Enable(); aBtnColHeader.Enable(); @@ -300,7 +300,7 @@ void __EXPORT ScNameDlg::UpdateChecks() } else if ( aFlType.IsEnabled() ) { - aFlType .Disable(); + aFlType .Disable(); aBtnCriteria .Disable(); aBtnPrintArea.Disable(); aBtnColHeader.Disable(); @@ -316,7 +316,7 @@ void __EXPORT ScNameDlg::UpdateChecks() void __EXPORT ScNameDlg::UpdateNames() { - USHORT nRangeCount = aLocalRangeName.GetCount(); + USHORT nRangeCount = aLocalRangeName.GetCount(); aEdName.SetUpdateMode( FALSE ); //----------------------------------------------------------- @@ -327,8 +327,8 @@ void __EXPORT ScNameDlg::UpdateNames() if ( nRangeCount > 0 ) { - ScRangeData* pRangeData = NULL; - String aString; + ScRangeData* pRangeData = NULL; + String aString; for ( USHORT i=0; i<nRangeCount; i++ ) { @@ -410,8 +410,8 @@ IMPL_LINK_INLINE_END( ScNameDlg, CancelBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG ) { - BOOL bAdded = FALSE; - String aNewEntry = aEdName.GetText(); + BOOL bAdded = FALSE; + String aNewEntry = aEdName.GetText(); USHORT nNamePos = aEdName.GetTopEntry(); aNewEntry.EraseLeadingChars( ' ' ); aNewEntry.EraseTrailingChars( ' ' ); @@ -422,12 +422,12 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG ) { if ( pDoc ) { - ScRangeData* pNewEntry = NULL; - RangeType nType = RT_NAME; - USHORT nFoundAt = 0; - String theSymbol = aEdAssign.GetText(); - String aStrPos; - String aStrArea; + ScRangeData* pNewEntry = NULL; + RangeType nType = RT_NAME; + USHORT nFoundAt = 0; + String theSymbol = aEdAssign.GetText(); + String aStrPos; + String aStrArea; pNewEntry = new ScRangeData( pDoc, aNewEntry, @@ -446,12 +446,12 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG ) // theSymbol gueltig? // (= konnte theSymbol im ScRangeData-Ctor - // in ein Token-Array uebersetzt werden?) + // in ein Token-Array uebersetzt werden?) if ( 0 == pNewEntry->GetErrCode() ) { // Eintrag bereits vorhanden? Dann vorher entfernen (=Aendern) if ( aLocalRangeName.SearchName( aNewEntry, nFoundAt ) ) - { // alten Index uebernehmen + { // alten Index uebernehmen pNewEntry->SetIndex( ((ScRangeData*)(aLocalRangeName.At(nFoundAt)))->GetIndex() ); aLocalRangeName.AtFree( nFoundAt ); @@ -473,7 +473,7 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG ) aBtnRemove.Disable(); //@BugID 54702 raus mit dem Sch. - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg bAdded = TRUE; } @@ -503,13 +503,13 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG ) { - USHORT nRemoveAt = 0; + USHORT nRemoveAt = 0; const String aStrEntry = aEdName.GetText(); if ( aLocalRangeName.SearchName( aStrEntry, nRemoveAt ) ) { String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY ); - String aMsg = aStrDelMsg.GetToken( 0, '#' ); + String aMsg = aStrDelMsg.GetToken( 0, '#' ); aMsg += aStrEntry; aMsg += aStrDelMsg.GetToken( 1, '#' ); @@ -540,8 +540,8 @@ IMPL_LINK( ScNameDlg, NameSelectHdl, void *, EMPTYARG ) if ( aLocalRangeName.SearchName( aEdName.GetText(), nAtPos ) ) { - String aSymbol; - ScRangeData* pData = (ScRangeData*)(aLocalRangeName.At( nAtPos )); + String aSymbol; + ScRangeData* pData = (ScRangeData*)(aLocalRangeName.At( nAtPos )); if ( pData ) { @@ -561,9 +561,9 @@ IMPL_LINK( ScNameDlg, NameSelectHdl, void *, EMPTYARG ) IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd ) { - String theName = aEdName.GetText(); - String theSymbol = aEdAssign.GetText(); - BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND + String theName = aEdName.GetText(); + String theSymbol = aEdAssign.GetText(); + BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND != aEdName.GetEntryPos( theName )); if ( pEd == &aEdName ) @@ -578,7 +578,7 @@ IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd ) aEdAssign.Disable(); aRbAssign.Disable(); //@BugID 54702 raus mit dem Sch. - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } else { diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 5b55d47b70cd..bf78fc2428e0 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.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 @@ -54,7 +54,7 @@ #include "scmod.hxx" #include "rangenam.hxx" #include "dbcolect.hxx" -#include "tablink.hxx" // fuer Loader +#include "tablink.hxx" // fuer Loader #include "popmenu.hxx" #include "drwlayer.hxx" #include "transobj.hxx" @@ -73,11 +73,11 @@ using namespace com::sun::star; -// Reihenfolge der Kategorien im Navigator ------------------------------------- +// Reihenfolge der Kategorien im Navigator ------------------------------------- static USHORT pTypeList[SC_CONTENT_COUNT] = { - SC_CONTENT_ROOT, // ROOT (0) muss vorne stehen + SC_CONTENT_ROOT, // ROOT (0) muss vorne stehen SC_CONTENT_TABLE, SC_CONTENT_RANGENAME, SC_CONTENT_DBAREA, @@ -107,8 +107,8 @@ ScDocShell* ScContentTree::GetManualOrCurrent() } else { - // Current nur, wenn keine manuell eingestellt ist - // (damit erkannt wird, wenn das Dokument nicht mehr existiert) + // Current nur, wenn keine manuell eingestellt ist + // (damit erkannt wird, wenn das Dokument nicht mehr existiert) SfxViewShell* pViewSh = SfxViewShell::Current(); if ( pViewSh ) @@ -122,20 +122,20 @@ ScDocShell* ScContentTree::GetManualOrCurrent() } // -// ScContentTree +// ScContentTree // ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) : - SvTreeListBox ( pParent, rResId ), - aEntryImages ( ScResId( RID_IMAGELIST_NAVCONT ) ), - aHCEntryImages ( ScResId( RID_IMAGELIST_H_NAVCONT ) ), - nRootType ( SC_CONTENT_ROOT ), - bHiddenDoc ( FALSE ), - pHiddenDocument ( NULL ) + SvTreeListBox ( pParent, rResId ), + aEntryImages ( ScResId( RID_IMAGELIST_NAVCONT ) ), + aHCEntryImages ( ScResId( RID_IMAGELIST_H_NAVCONT ) ), + nRootType ( SC_CONTENT_ROOT ), + bHiddenDoc ( FALSE ), + pHiddenDocument ( NULL ) { USHORT i; for (i=0; i<SC_CONTENT_COUNT; i++) - pPosList[pTypeList[i]] = i; // invers zum suchen + pPosList[pTypeList[i]] = i; // invers zum suchen pParentWindow = (ScNavigatorDlg*)pParent; @@ -157,7 +157,7 @@ void ScContentTree::InitRoot( USHORT nType ) if ( !nType ) return; - if ( nRootType && nRootType != nType ) // ausgeblendet ? + if ( nRootType && nRootType != nType ) // ausgeblendet ? { pRootNodes[nType] = NULL; return; @@ -190,11 +190,11 @@ void ScContentTree::ClearType(USHORT nType) else { SvLBoxEntry* pParent = pRootNodes[nType]; - if ( !pParent || GetChildCount(pParent) ) // nicht, wenn ohne Children schon da + if ( !pParent || GetChildCount(pParent) ) // nicht, wenn ohne Children schon da { if (pParent) - GetModel()->Remove( pParent ); // mit allen Children - InitRoot( nType ); // ggf. neu eintragen + GetModel()->Remove( pParent ); // mit allen Children + InitRoot( nType ); // ggf. neu eintragen } } } @@ -270,7 +270,7 @@ String lcl_GetDBAreaRange( ScDocument* pDoc, const String& rDBName ) String aRet; if (pDoc) { - ScDBCollection* pDbNames = pDoc->GetDBCollection(); + ScDBCollection* pDbNames = pDoc->GetDBCollection(); USHORT nCount = pDbNames->GetCount(); for ( USHORT i=0; i<nCount; i++ ) { @@ -297,7 +297,7 @@ IMPL_LINK( ScContentTree, ContentDoubleClickHdl, ScContentTree *, EMPTYARG ) if( pEntry && (nType != SC_CONTENT_ROOT) && (nChild != SC_CONTENT_NOCHILD) ) { if ( bHiddenDoc ) - return 0; //! spaeter... + return 0; //! spaeter... String aText( GetEntryText( pEntry ) ); @@ -355,7 +355,7 @@ IMPL_LINK( ScContentTree, ContentDoubleClickHdl, ScContentTree *, EMPTYARG ) break; } - ScNavigatorDlg::ReleaseFocus(); // set focus into document + ScNavigatorDlg::ReleaseFocus(); // set focus into document } return 0; @@ -377,7 +377,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) switch (aCode.GetModifier()) { case KEY_MOD1: - ToggleRoot(); // toggle root mode (as in Writer) + ToggleRoot(); // toggle root mode (as in Writer) bUsed = TRUE; break; case 0: @@ -414,12 +414,12 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) //BOOL __EXPORT ScContentTree::Drop( const DropEvent& rEvt ) //{ -// return pParentWindow->Drop(rEvt); // Drop auf Navigator +// return pParentWindow->Drop(rEvt); // Drop auf Navigator //} //BOOL __EXPORT ScContentTree::QueryDrop( DropEvent& rEvt ) //{ -// return pParentWindow->QueryDrop(rEvt); // Drop auf Navigator +// return pParentWindow->QueryDrop(rEvt); // Drop auf Navigator //} sal_Int8 ScContentTree::AcceptDrop( const AcceptDropEvent& /* rEvt */ ) @@ -448,12 +448,12 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt ) switch ( rCEvt.GetCommand() ) { case COMMAND_STARTDRAG: - // Aus dem ExecuteDrag heraus kann der Navigator geloescht werden - // (beim Umschalten auf einen anderen Dokument-Typ), das wuerde aber - // den StarView MouseMove-Handler, der Command() aufruft, umbringen. - // Deshalb Drag&Drop asynchron: + // Aus dem ExecuteDrag heraus kann der Navigator geloescht werden + // (beim Umschalten auf einen anderen Dokument-Typ), das wuerde aber + // den StarView MouseMove-Handler, der Command() aufruft, umbringen. + // Deshalb Drag&Drop asynchron: -// DoDrag(); +// DoDrag(); Application::PostUserEvent( STATIC_LINK( this, ScContentTree, ExecDragHdl ) ); @@ -462,7 +462,7 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt ) case COMMAND_CONTEXTMENU: { - // Drag-Drop Modus + // Drag-Drop Modus PopupMenu aPop; ScPopupMenu aDropMenu( ScResId( RID_POPUP_DROPMODE ) ); @@ -470,13 +470,13 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt ) aPop.InsertItem( 1, pParentWindow->GetStrDragMode() ); aPop.SetPopupMenu( 1, &aDropMenu ); - // angezeigtes Dokument + // angezeigtes Dokument ScPopupMenu aDocMenu; aDocMenu.SetMenuFlags( aDocMenu.GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS ); USHORT i=0; USHORT nPos=0; - // geladene Dokumente + // geladene Dokumente ScDocShell* pCurrentSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); SfxObjectShell* pSh = SfxObjectShell::GetFirst(); while ( pSh ) @@ -495,11 +495,11 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt ) } pSh = SfxObjectShell::GetNext( *pSh ); } - // "aktives Fenster" + // "aktives Fenster" aDocMenu.InsertItem( ++i, pParentWindow->aStrActiveWin ); if (!bHiddenDoc && !aManualDoc.Len()) nPos = i; - // verstecktes Dokument + // verstecktes Dokument if ( aHiddenTitle.Len() ) { String aEntry = aHiddenTitle; @@ -512,17 +512,17 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt ) aPop.InsertItem( 2, pParentWindow->GetStrDisplay() ); aPop.SetPopupMenu( 2, &aDocMenu ); - // ausfuehren + // ausfuehren aPop.Execute( this, rCEvt.GetMousePosPixel() ); - if ( aDropMenu.WasHit() ) // Drag-Drop Modus + if ( aDropMenu.WasHit() ) // Drag-Drop Modus { USHORT nId = aDropMenu.GetSelected(); if ( nId >= RID_DROPMODE_URL && nId <= RID_DROPMODE_COPY ) pParentWindow->SetDropMode( nId - RID_DROPMODE_URL ); } - else if ( aDocMenu.WasHit() ) // angezeigtes Dokument + else if ( aDocMenu.WasHit() ) // angezeigtes Dokument { USHORT nId = aDocMenu.GetSelected(); String aName = aDocMenu.GetItemText(nId); @@ -548,7 +548,7 @@ void __EXPORT ScContentTree::RequestHelp( const HelpEvent& rHEvt ) BOOL bRet = FALSE; String aHelpText; SvLBoxEntry* pParent = GetParent(pEntry); - if ( !pParent ) // Top-Level ? + if ( !pParent ) // Top-Level ? { aHelpText = String::CreateFromInt32( GetChildCount(pEntry) ); aHelpText += ' '; @@ -557,7 +557,7 @@ void __EXPORT ScContentTree::RequestHelp( const HelpEvent& rHEvt ) } else if ( pParent == pRootNodes[SC_CONTENT_NOTE] ) { - aHelpText = GetEntryText(pEntry); // Notizen als Help-Text + aHelpText = GetEntryText(pEntry); // Notizen als Help-Text bRet = TRUE; } else if ( pParent == pRootNodes[SC_CONTENT_AREALINK] ) @@ -613,9 +613,9 @@ ScDocument* ScContentTree::GetSourceDocument() void ScContentTree::Refresh( USHORT nType ) { if ( bHiddenDoc && !pHiddenDocument ) - return; // anderes Dokument angezeigt + return; // anderes Dokument angezeigt - // wenn sich nichts geaendert hat, gleich abbrechen (gegen Geflacker) + // wenn sich nichts geaendert hat, gleich abbrechen (gegen Geflacker) if ( nType == SC_CONTENT_NOTE ) if (!NoteStringsChanged()) @@ -657,7 +657,7 @@ void ScContentTree::Refresh( USHORT nType ) void ScContentTree::GetTableNames() { - if ( nRootType && nRootType != SC_CONTENT_TABLE ) // ausgeblendet ? + if ( nRootType && nRootType != SC_CONTENT_TABLE ) // ausgeblendet ? return; ScDocument* pDoc = GetSourceDocument(); @@ -675,7 +675,7 @@ void ScContentTree::GetTableNames() void ScContentTree::GetAreaNames() { - if ( nRootType && nRootType != SC_CONTENT_RANGENAME ) // ausgeblendet ? + if ( nRootType && nRootType != SC_CONTENT_RANGENAME ) // ausgeblendet ? return; ScDocument* pDoc = GetSourceDocument(); @@ -721,14 +721,14 @@ void ScContentTree::GetAreaNames() void ScContentTree::GetDbNames() { - if ( nRootType && nRootType != SC_CONTENT_DBAREA ) // ausgeblendet ? + if ( nRootType && nRootType != SC_CONTENT_DBAREA ) // ausgeblendet ? return; ScDocument* pDoc = GetSourceDocument(); if (!pDoc) return; - ScDBCollection* pDbNames = pDoc->GetDBCollection(); + ScDBCollection* pDbNames = pDoc->GetDBCollection(); USHORT nCount = pDbNames->GetCount(); if ( nCount > 0 ) { @@ -765,7 +765,7 @@ bool ScContentTree::IsPartOfType( USHORT nContentType, USHORT nObjIdentifier ) void ScContentTree::GetDrawNames( USHORT nType ) { - if ( nRootType && nRootType != nType ) // ausgeblendet ? + if ( nRootType && nRootType != nType ) // ausgeblendet ? return; ScDocument* pDoc = GetSourceDocument(); @@ -821,7 +821,7 @@ void ScContentTree::GetDrawingNames() void ScContentTree::GetLinkNames() { - if ( nRootType && nRootType != SC_CONTENT_AREALINK ) // ausgeblendet ? + if ( nRootType && nRootType != SC_CONTENT_AREALINK ) // ausgeblendet ? return; ScDocument* pDoc = GetSourceDocument(); @@ -838,7 +838,7 @@ void ScContentTree::GetLinkNames() if (pBase->ISA(ScAreaLink)) InsertContent( SC_CONTENT_AREALINK, ((ScAreaLink*)pBase)->GetSource() ); - // in der Liste die Namen der Quellbereiche + // in der Liste die Namen der Quellbereiche } } @@ -879,7 +879,7 @@ String lcl_NoteString( const ScPostIt& rNote ) void ScContentTree::GetNoteStrings() { - if ( nRootType && nRootType != SC_CONTENT_NOTE ) // ausgeblendet ? + if ( nRootType && nRootType != SC_CONTENT_NOTE ) // ausgeblendet ? return; ScDocument* pDoc = GetSourceDocument(); @@ -913,7 +913,7 @@ ScAddress ScContentTree::GetNotePos( ULONG nIndex ) if( pCell->HasNote() ) { if (nFound == nIndex) - return ScAddress( aIter.GetCol(), aIter.GetRow(), nTab ); // gefunden + return ScAddress( aIter.GetCol(), aIter.GetRow(), nTab ); // gefunden ++nFound; } pCell = aIter.GetNext(); @@ -961,7 +961,7 @@ BOOL ScContentTree::NoteStringsChanged() } if ( pEntry ) - bEqual = FALSE; // kommt noch was + bEqual = FALSE; // kommt noch was return !bEqual; } @@ -1016,7 +1016,7 @@ BOOL ScContentTree::DrawNamesChanged( USHORT nType ) } if ( pEntry ) - bEqual = FALSE; // kommt noch was + bEqual = FALSE; // kommt noch was return !bEqual; } @@ -1036,7 +1036,7 @@ BOOL lcl_GetRange( ScDocument* pDoc, USHORT nType, const String& rName, ScRange& } else if ( nType == SC_CONTENT_DBAREA ) { - ScDBCollection* pList = pDoc->GetDBCollection(); + ScDBCollection* pList = pDoc->GetDBCollection(); if (pList) if (pList->SearchName( rName, nPos )) { @@ -1117,7 +1117,7 @@ void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, USHORT nFlag pTransferObj->SetDragSource( pSrcShell, aMark ); pTransferObj->SetDragSourceFlags( nFlags ); - SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D + SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D pWin->ReleaseMouse(); pTransferObj->StartDrag( pWin, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } @@ -1143,7 +1143,7 @@ void ScContentTree::DoDrag() { String aText( GetEntryText( pEntry ) ); - ScDocument* pLocalDoc = NULL; // fuer URL-Drop + ScDocument* pLocalDoc = NULL; // fuer URL-Drop String aDocName; if (bHiddenDoc) aDocName = aHiddenName; @@ -1155,12 +1155,12 @@ void ScContentTree::DoDrag() if (pDocSh->HasName()) aDocName = pDocSh->GetMedium()->GetName(); else - pLocalDoc = pDocSh->GetDocument(); // Drop nur in dieses Dokument + pLocalDoc = pDocSh->GetDocument(); // Drop nur in dieses Dokument } } - BOOL bDoLinkTrans = FALSE; // use ScLinkTransferObj - String aLinkURL; // for ScLinkTransferObj + BOOL bDoLinkTrans = FALSE; // use ScLinkTransferObj + String aLinkURL; // for ScLinkTransferObj String aLinkText; USHORT nDropMode = pParentWindow->GetDropMode(); @@ -1176,8 +1176,8 @@ void ScContentTree::DoDrag() if (aDocName.Len()) { - // provide URL to outside only if the document has a name - // (without name, only internal D&D via SetDragJump) + // provide URL to outside only if the document has a name + // (without name, only internal D&D via SetDragJump) aLinkURL = aUrl; aLinkText = aText; @@ -1187,7 +1187,7 @@ void ScContentTree::DoDrag() break; case SC_DROPMODE_LINK: { - if ( aDocName.Len() ) // link only to named documents + if ( aDocName.Len() ) // link only to named documents { // for internal D&D, set flag to insert a link @@ -1246,8 +1246,8 @@ void ScContentTree::DoDrag() { lcl_DoDragObject( pSrcShell, aText, nType, this ); - // in ExecuteDrag kann der Navigator geloescht worden sein - // -> nicht mehr auf Member zugreifen !!! + // in ExecuteDrag kann der Navigator geloescht worden sein + // -> nicht mehr auf Member zugreifen !!! } } } @@ -1262,22 +1262,22 @@ void ScContentTree::DoDrag() if ( aLinkURL.Len() ) pTransferObj->SetLinkURL( aLinkURL, aLinkText ); - // SetDragJump / SetDragLink has been done above + // SetDragJump / SetDragLink has been done above ReleaseMouse(); pTransferObj->StartDrag( this, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } } - bIsInDrag = FALSE; // static Member + bIsInDrag = FALSE; // static Member - delete pDocLoader; // falls Dokument zum Draggen geladen wurde + delete pDocLoader; // falls Dokument zum Draggen geladen wurde } IMPL_STATIC_LINK(ScContentTree, ExecDragHdl, void*, EMPTYARG) { - // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der - // Navigator geloescht werden darf + // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der + // Navigator geloescht werden darf pThis->DoDrag(); return 0; @@ -1288,7 +1288,7 @@ BOOL ScContentTree::LoadFile( const String& rUrl ) String aDocName = rUrl; xub_StrLen nPos = aDocName.Search('#'); if ( nPos != STRING_NOTFOUND ) - aDocName.Erase(nPos); // nur der Name, ohne #... + aDocName.Erase(nPos); // nur der Name, ohne #... BOOL bReturn = FALSE; String aFilter, aOptions; @@ -1300,17 +1300,17 @@ BOOL ScContentTree::LoadFile( const String& rUrl ) aHiddenTitle = aLoader.GetTitle(); pHiddenDocument = aLoader.GetDocument(); - Refresh(); // Inhalte aus geladenem Dokument holen + Refresh(); // Inhalte aus geladenem Dokument holen pHiddenDocument = NULL; -// AdjustTitle(); +// AdjustTitle(); - pParentWindow->GetDocNames( &aHiddenTitle ); // Liste fuellen + pParentWindow->GetDocNames( &aHiddenTitle ); // Liste fuellen } else - Sound::Beep(); // Fehler beim Laden + Sound::Beep(); // Fehler beim Laden - // Dokument wird im dtor von ScDocumentLoader wieder geschlossen + // Dokument wird im dtor von ScDocumentLoader wieder geschlossen return bReturn; } @@ -1337,7 +1337,7 @@ void ScContentTree::SetRootType( USHORT nNew ) } } -void ScContentTree::ToggleRoot() // nach Selektion +void ScContentTree::ToggleRoot() // nach Selektion { USHORT nNew = SC_CONTENT_ROOT; if ( nRootType == SC_CONTENT_ROOT ) @@ -1366,9 +1366,9 @@ void ScContentTree::ResetManualDoc() void ScContentTree::ActiveDocChanged() { if ( !bHiddenDoc && !aManualDoc.Len() ) - Refresh(); // Inhalte nur wenn automatisch + Refresh(); // Inhalte nur wenn automatisch - // Listbox muss immer geupdated werden, wegen aktiv-Flag + // Listbox muss immer geupdated werden, wegen aktiv-Flag String aCurrent; if ( bHiddenDoc ) @@ -1380,16 +1380,16 @@ void ScContentTree::ActiveDocChanged() aCurrent = pSh->GetTitle(); else { - // eingestelltes Dokument existiert nicht mehr + // eingestelltes Dokument existiert nicht mehr - aManualDoc.Erase(); // wieder automatisch + aManualDoc.Erase(); // wieder automatisch Refresh(); - pSh = GetManualOrCurrent(); // sollte jetzt aktives sein + pSh = GetManualOrCurrent(); // sollte jetzt aktives sein if (pSh) aCurrent = pSh->GetTitle(); } } - pParentWindow->GetDocNames( &aCurrent ); // selektieren + pParentWindow->GetDocNames( &aCurrent ); // selektieren } void ScContentTree::SetManualDoc(const String& rName) @@ -1398,11 +1398,11 @@ void ScContentTree::SetManualDoc(const String& rName) if (!bHiddenDoc) { Refresh(); - pParentWindow->GetDocNames( &aManualDoc ); // selektieren + pParentWindow->GetDocNames( &aManualDoc ); // selektieren } } -void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Listbox angezeigt +void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Listbox angezeigt { if ( rName == pParentWindow->aStrActiveWin ) { @@ -1410,7 +1410,7 @@ void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Li return; } - // "aktiv" oder "inaktiv" weglassen + // "aktiv" oder "inaktiv" weglassen String aRealName = rName; xub_StrLen nLen = rName.Len(); @@ -1441,7 +1441,7 @@ void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Li bHiddenDoc = FALSE; SetManualDoc(aRealName); } - else if (aHiddenTitle.Len()) // verstecktes ausgewaehlt + else if (aHiddenTitle.Len()) // verstecktes ausgewaehlt { if (!bHiddenDoc) LoadFile(aHiddenName); diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index c6346ccc32c7..d531e6baf44d 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.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 @@ -39,7 +39,7 @@ #include "navcitem.hxx" #include "global.hxx" #include "navipi.hxx" -#include "sc.hrc" // -> Item-IDs +#include "sc.hrc" // -> Item-IDs // STATIC DATA ----------------------------------------------------------- @@ -48,9 +48,9 @@ ScNavigatorControllerItem::ScNavigatorControllerItem( USHORT nIdP, ScNavigatorDlg& rDlg, - SfxBindings& rBindings ) + SfxBindings& rBindings ) : SfxControllerItem ( nIdP, rBindings ), - rNavigatorDlg ( rDlg ) + rNavigatorDlg ( rDlg ) { } @@ -64,22 +64,22 @@ void __EXPORT ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxIte case SID_CURRENTCELL: if ( pItem ) { -// const SfxPointItem* pCellPosItem = PTR_CAST(SfxPointItem, pItem); +// const SfxPointItem* pCellPosItem = PTR_CAST(SfxPointItem, pItem); const SfxStringItem* pCellPosItem = PTR_CAST(SfxStringItem, pItem); DBG_ASSERT( pCellPosItem, "SfxStringItem expected!" ); if ( pCellPosItem ) { - String aAddress( pCellPosItem->GetValue() ); + String aAddress( pCellPosItem->GetValue() ); ScAddress aScAddress; aScAddress.Parse( aAddress ); SCCOL nCol = aScAddress.Col()+1; SCROW nRow = aScAddress.Row()+1; -// SCCOL nCol = (USHORT)pCellPosItem->GetValue().X()+1; -// SCROW nRow = (USHORT)pCellPosItem->GetValue().Y()+1; +// SCCOL nCol = (USHORT)pCellPosItem->GetValue().X()+1; +// SCROW nRow = (USHORT)pCellPosItem->GetValue().Y()+1; rNavigatorDlg.UpdateColumn( &nCol ); rNavigatorDlg.UpdateRow ( &nRow ); @@ -95,7 +95,7 @@ void __EXPORT ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxIte DBG_ASSERT( pTabItem, "SfxUInt16Item expected!" ); - // Tabelle fuer Basic ist 1-basiert + // Tabelle fuer Basic ist 1-basiert if ( pTabItem && pTabItem->GetValue() ) { SCTAB nTab = pTabItem->GetValue() - 1; @@ -110,7 +110,7 @@ void __EXPORT ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxIte case SID_CURRENTDOC: // - // gar nix mehr, wird ueber SFX_HINT_DOCCHANGED erledigt + // gar nix mehr, wird ueber SFX_HINT_DOCCHANGED erledigt // break; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index f3b53f5818a6..06b0ece7d5c6 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.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 @@ -60,11 +60,11 @@ #include "navipi.hxx" #include "navsett.hxx" -// Timeout, um Notizen zu suchen -#define SC_CONTENT_TIMEOUT 1000 +// Timeout, um Notizen zu suchen +#define SC_CONTENT_TIMEOUT 1000 -// Toleranz, wieviel ueber der eingeklappten Groesse noch klein ist -#define SCNAV_MINTOL 5 +// Toleranz, wieviel ueber der eingeklappten Groesse noch klein ist +#define SCNAV_MINTOL 5 // maximum values for UI #define SCNAV_MAXCOL (MAXCOLCOUNT) @@ -77,7 +77,7 @@ static const xub_StrLen SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).Len(); //------------------------------------------------------------------------ -// static +// static void ScNavigatorDlg::ReleaseFocus() { SfxViewShell* pCurSh = SfxViewShell::Current(); @@ -91,14 +91,14 @@ void ScNavigatorDlg::ReleaseFocus() } //================================================================== -// class ColumnEdit +// class ColumnEdit //================================================================== ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) - : SpinField ( pParent, rResId ), - rDlg ( *pParent ), - nCol ( 0 ), - nKeyGroup ( KEYGROUP_ALPHA ) + : SpinField ( pParent, rResId ), + rDlg ( *pParent ), + nCol ( 0 ), + nKeyGroup ( KEYGROUP_ALPHA ) { SetMaxTextLen( SCNAV_COLDIGITS ); // 1...256...18278 or A...IV...ZZZ } @@ -123,9 +123,9 @@ long __EXPORT ColumnEdit::Notify( NotifyEvent& rNEvt ) if ( !aCode.IsMod1() && !aCode.IsMod2() ) { - //! Eingabeueberpruefung (nur Zahlen oder nur Buchstaben, max 2 bzw 3 Stellen) - //! war vor VCL per nicht weitergeleitetem KeyInput - //! dafuer was neues ausdenken!!! + //! Eingabeueberpruefung (nur Zahlen oder nur Buchstaben, max 2 bzw 3 Stellen) + //! war vor VCL per nicht weitergeleitetem KeyInput + //! dafuer was neues ausdenken!!! if ( aCode.GetCode() == KEY_RETURN ) { @@ -135,8 +135,8 @@ long __EXPORT ColumnEdit::Notify( NotifyEvent& rNEvt ) } } } - else if ( nType == EVENT_LOSEFOCUS ) // LoseFocus wird bei VCL nicht gerufen - EvalText(); // nCol setzen + else if ( nType == EVENT_LOSEFOCUS ) // LoseFocus wird bei VCL nicht gerufen + EvalText(); // nCol setzen return nHandled; } @@ -204,7 +204,7 @@ void ColumnEdit::EvalText() if ( aStrCol.Len() > 0 ) { - // nKeyGroup wird bei VCL mangels KeyInput nicht mehr gesetzt + // nKeyGroup wird bei VCL mangels KeyInput nicht mehr gesetzt if ( CharClass::isAsciiNumeric(aStrCol) ) nCol = NumStrToAlpha( aStrCol ); @@ -303,12 +303,12 @@ SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, String& rStr ) } //================================================================== -// class RowEdit +// class RowEdit //================================================================== RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ) - : NumericField( pParent, rResId ), - rDlg ( *pParent ) + : NumericField( pParent, rResId ), + rDlg ( *pParent ) { SetMax( SCNAV_MAXROW); SetLast( SCNAV_MAXROW); @@ -359,12 +359,12 @@ void RowEdit::ExecuteRow() } //================================================================== -// class ScDocListBox +// class ScDocListBox //================================================================== ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId ) - : ListBox ( pParent, rResId ), - rDlg ( *pParent ) + : ListBox ( pParent, rResId ), + rDlg ( *pParent ) { } @@ -385,20 +385,20 @@ void __EXPORT ScDocListBox::Select() } //================================================================== -// class CommandToolBox +// class CommandToolBox //================================================================== CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) - : ToolBox ( pParent, rResId ), - rDlg ( *pParent ) + : ToolBox ( pParent, rResId ), + rDlg ( *pParent ) { - InitImageList(); // ImageList members of ScNavigatorDlg must be initialized before! + InitImageList(); // ImageList members of ScNavigatorDlg must be initialized before! SetSizePixel( CalcWindowSizePixel() ); SetDropdownClickHdl( LINK(this, CommandToolBox, ToolBoxDropdownClickHdl) ); SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY ); -// EnableItem( IID_UP, FALSE ); -// EnableItem( IID_DOWN, FALSE ); +// EnableItem( IID_UP, FALSE ); +// EnableItem( IID_DOWN, FALSE ); } //------------------------------------------------------------------------ @@ -411,21 +411,21 @@ __EXPORT CommandToolBox::~CommandToolBox() void CommandToolBox::Select( USHORT nSelId ) { - // Modus umschalten ? + // Modus umschalten ? if ( nSelId == IID_ZOOMOUT || nSelId == IID_SCENARIOS ) { NavListMode eOldMode = rDlg.eListMode; NavListMode eNewMode = eOldMode; - if ( nSelId == IID_SCENARIOS ) // auf Szenario + if ( nSelId == IID_SCENARIOS ) // auf Szenario { if ( eOldMode == NAV_LMODE_SCENARIOS ) eNewMode = NAV_LMODE_AREAS; else eNewMode = NAV_LMODE_SCENARIOS; } - else // ein/aus + else // ein/aus { if ( eOldMode == NAV_LMODE_NONE ) eNewMode = NAV_LMODE_AREAS; @@ -470,8 +470,8 @@ void __EXPORT CommandToolBox::Click() IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG ) { - // Das Popupmenue fuer den Dropmodus muss im Click (Button Down) - // statt im Select (Button Up) aufgerufen werden. + // Das Popupmenue fuer den Dropmodus muss im Click (Button Down) + // statt im Select (Button Up) aufgerufen werden. if ( GetCurItemId() == IID_DROPMODE ) { @@ -480,12 +480,12 @@ IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG ) aPop.Execute( this, GetItemRect(IID_DROPMODE), POPUPMENU_EXECUTE_DOWN ); USHORT nId = aPop.GetSelected(); - EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage) + EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage) if ( nId >= RID_DROPMODE_URL && nId <= RID_DROPMODE_COPY ) rDlg.SetDropMode( nId - RID_DROPMODE_URL ); - // #49956# den gehighlighteten Button aufheben + // #49956# den gehighlighteten Button aufheben Point aPoint; MouseEvent aLeave( aPoint, 0, MOUSE_LEAVEWINDOW | MOUSE_SYNTHETIC ); MouseMove( aLeave ); @@ -499,18 +499,18 @@ IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG ) void CommandToolBox::UpdateButtons() { NavListMode eMode = rDlg.eListMode; - CheckItem( IID_SCENARIOS, eMode == NAV_LMODE_SCENARIOS ); - CheckItem( IID_ZOOMOUT, eMode != NAV_LMODE_NONE ); + CheckItem( IID_SCENARIOS, eMode == NAV_LMODE_SCENARIOS ); + CheckItem( IID_ZOOMOUT, eMode != NAV_LMODE_NONE ); - // Umschalten-Button: + // Umschalten-Button: if ( eMode == NAV_LMODE_SCENARIOS || eMode == NAV_LMODE_NONE ) { - EnableItem( IID_CHANGEROOT, FALSE ); + EnableItem( IID_CHANGEROOT, FALSE ); CheckItem( IID_CHANGEROOT, FALSE ); } else { - EnableItem( IID_CHANGEROOT, TRUE ); + EnableItem( IID_CHANGEROOT, TRUE ); BOOL bRootSet = rDlg.aLbEntries.GetRootType() != SC_CONTENT_ROOT; CheckItem( IID_CHANGEROOT, bRootSet ); } @@ -520,9 +520,9 @@ void CommandToolBox::UpdateButtons() USHORT nImageId = 0; switch ( rDlg.nDropMode ) { - case SC_DROPMODE_URL: nImageId = bHC ? RID_IMG_H_DROP_URL : RID_IMG_DROP_URL; break; - case SC_DROPMODE_LINK: nImageId = bHC ? RID_IMG_H_DROP_LINK : RID_IMG_DROP_LINK; break; - case SC_DROPMODE_COPY: nImageId = bHC ? RID_IMG_H_DROP_COPY : RID_IMG_DROP_COPY; break; + case SC_DROPMODE_URL: nImageId = bHC ? RID_IMG_H_DROP_URL : RID_IMG_DROP_URL; break; + case SC_DROPMODE_LINK: nImageId = bHC ? RID_IMG_H_DROP_LINK : RID_IMG_DROP_LINK; break; + case SC_DROPMODE_COPY: nImageId = bHC ? RID_IMG_H_DROP_COPY : RID_IMG_DROP_COPY; break; } SetItemImage( IID_DROPMODE, Image(ScResId(nImageId)) ); } @@ -545,10 +545,10 @@ void CommandToolBox::DataChanged( const DataChangedEvent& rDCEvt ) { if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - // update item images + // update item images InitImageList(); - UpdateButtons(); // drop mode + UpdateButtons(); // drop mode } ToolBox::DataChanged( rDCEvt ); @@ -566,7 +566,7 @@ ScNavigatorSettings::ScNavigatorSettings() : } //================================================================== -// class ScNavigatorDlgWrapper +// class ScNavigatorDlgWrapper //================================================================== SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR ) @@ -574,34 +574,34 @@ SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR ) #define IS_MODE(bit)(((nFlags)&(bit))==(bit)) ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( - Window* pParent, - USHORT nId, - SfxBindings* pBind, + Window* pParent, + USHORT nId, + SfxBindings* pBind, SfxChildWinInfo* /* pInfo */ ) : SfxChildWindowContext( nId ) { pNavigator = new ScNavigatorDlg( pBind, this, pParent ); SetWindow( pNavigator ); - // Einstellungen muessen anderswo gemerkt werden, - // pInfo geht uns (ausser der Groesse) nichts mehr an + // Einstellungen muessen anderswo gemerkt werden, + // pInfo geht uns (ausser der Groesse) nichts mehr an - Size aInfoSize = pParent->GetOutputSizePixel(); // von aussen vorgegebene Groesse - Size aNavSize = pNavigator->GetOutputSizePixel(); // Default-Groesse + Size aInfoSize = pParent->GetOutputSizePixel(); // von aussen vorgegebene Groesse + Size aNavSize = pNavigator->GetOutputSizePixel(); // Default-Groesse aNavSize.Width() = Max( aInfoSize.Width(), aNavSize.Width() ); aNavSize.Height() = Max( aInfoSize.Height(), aNavSize.Height() ); pNavigator->nListModeHeight = Max( aNavSize.Height(), pNavigator->nListModeHeight ); - // Die Groesse kann in einem anderen Modul geaendert worden sein, - // deshalb muessen in Abhaengigkeit von der momentanen Groesse die - // Inhalte eingeblendet werden oder nicht + // Die Groesse kann in einem anderen Modul geaendert worden sein, + // deshalb muessen in Abhaengigkeit von der momentanen Groesse die + // Inhalte eingeblendet werden oder nicht BOOL bSmall = ( aInfoSize.Height() <= pNavigator->aInitSize.Height() + SCNAV_MINTOL ); NavListMode eNavMode = NAV_LMODE_NONE; if (!bSmall) { - // wenn Szenario aktiv war, wieder einschalten + // wenn Szenario aktiv war, wieder einschalten ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg(); NavListMode eLastMode = (NavListMode) rCfg.GetListMode(); @@ -611,18 +611,18 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( eNavMode = NAV_LMODE_AREAS; } - // Die Groesse des Floats nicht neu setzen (FALSE bei SetListMode), damit der - // Navigator nicht aufgeklappt wird, wenn er minimiert war (#38872#). + // Die Groesse des Floats nicht neu setzen (FALSE bei SetListMode), damit der + // Navigator nicht aufgeklappt wird, wenn er minimiert war (#38872#). - pNavigator->SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen + pNavigator->SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen USHORT nCmdId; switch (eNavMode) { - case NAV_LMODE_DOCS: nCmdId = IID_DOCS; break; - case NAV_LMODE_AREAS: nCmdId = IID_AREAS; break; - case NAV_LMODE_DBAREAS: nCmdId = IID_DBAREAS; break; - case NAV_LMODE_SCENARIOS: nCmdId = IID_SCENARIOS; break; + case NAV_LMODE_DOCS: nCmdId = IID_DOCS; break; + case NAV_LMODE_AREAS: nCmdId = IID_AREAS; break; + case NAV_LMODE_DBAREAS: nCmdId = IID_DBAREAS; break; + case NAV_LMODE_SCENARIOS: nCmdId = IID_SCENARIOS; break; default: nCmdId = 0; } if (nCmdId) @@ -631,7 +631,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( pNavigator->DoResize(); } - pNavigator->bFirstBig = ( nCmdId == 0 ); // dann spaeter + pNavigator->bFirstBig = ( nCmdId == 0 ); // dann spaeter /*??? FloatingWindow* pFloat = GetFloatingWindow(); @@ -639,7 +639,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( pFloat->SetMinOutputSizePixel( pNavigator->GetMinOutputSizePixel() ); */ -//!? pNavigator->Show(); +//!? pNavigator->Show(); } void __EXPORT ScNavigatorDialogWrapper::Resizing( Size& rSize ) @@ -658,47 +658,47 @@ void __EXPORT ScNavigatorDialogWrapper::Resizing( Size& rSize ) ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent ) : Window( pParent, ScResId(RID_SCDLG_NAVIGATOR) ), - rBindings ( *pB ), // is used in CommandToolBox ctor + rBindings ( *pB ), // is used in CommandToolBox ctor aCmdImageList( ScResId( IL_CMD ) ), aCmdImageListH( ScResId( ILH_CMD ) ), - aFtCol ( this, ScResId( FT_COL ) ), - aEdCol ( this, ScResId( ED_COL ) ), - aFtRow ( this, ScResId( FT_ROW ) ), - aEdRow ( this, ScResId( ED_ROW ) ), - aTbxCmd ( this, ScResId( TBX_CMD ) ), - aLbEntries ( this, ScResId( LB_ENTRIES ) ), + aFtCol ( this, ScResId( FT_COL ) ), + aEdCol ( this, ScResId( ED_COL ) ), + aFtRow ( this, ScResId( FT_ROW ) ), + aEdRow ( this, ScResId( ED_ROW ) ), + aTbxCmd ( this, ScResId( TBX_CMD ) ), + aLbEntries ( this, ScResId( LB_ENTRIES ) ), aWndScenarios( this,ScResId( STR_QHLP_SCEN_LISTBOX), ScResId(STR_QHLP_SCEN_COMMENT)), aLbDocuments( this, ScResId( LB_DOCUMENTS ) ), aStrDragMode ( ScResId( STR_DRAGMODE ) ), aStrDisplay ( ScResId( STR_DISPLAY ) ), aStrActiveWin( ScResId( STR_ACTIVEWIN ) ), - pContextWin ( pCW ), - pMarkArea ( NULL ), - pViewData ( NULL ), + pContextWin ( pCW ), + pMarkArea ( NULL ), + pViewData ( NULL ), nListModeHeight( 0 ), nInitListHeight( 0 ), - eListMode ( NAV_LMODE_NONE ), - nDropMode ( SC_DROPMODE_URL ), - nCurCol ( 0 ), - nCurRow ( 0 ), - nCurTab ( 0 ), - bFirstBig ( FALSE ) + eListMode ( NAV_LMODE_NONE ), + nDropMode ( SC_DROPMODE_URL ), + nCurCol ( 0 ), + nCurRow ( 0 ), + nCurTab ( 0 ), + bFirstBig ( FALSE ) { ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg(); nDropMode = rCfg.GetDragMode(); - // eListMode wird von aussen gesetzt, Root weiter unten + // eListMode wird von aussen gesetzt, Root weiter unten aLbDocuments.SetDropDownLineCount(9); String aOpen = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " (" )); aStrActive = aOpen; aStrActive += String( ScResId( STR_ACTIVE ) ); - aStrActive += ')'; // " (aktiv)" + aStrActive += ')'; // " (aktiv)" aStrNotActive = aOpen; aStrNotActive += String( ScResId( STR_NOTACTIVE ) ); - aStrNotActive += ')'; // " (inaktiv)" + aStrNotActive += ')'; // " (inaktiv)" aStrHidden = aOpen; aStrHidden += String( ScResId( STR_HIDDEN ) ); - aStrHidden += ')'; // " (versteckt)" + aStrHidden += ')'; // " (versteckt)" aTitleBase = GetText(); @@ -712,13 +712,13 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win + nBorderOffset; aInitSize.Height() = aLbEntries.GetPosPixel().Y(); - nInitListHeight = aLbEntries.GetSizePixel().Height(); - nListModeHeight = aInitSize.Height() + nInitListHeight = aLbEntries.GetSizePixel().Height(); + nListModeHeight = aInitSize.Height() + nInitListHeight; - // kein Resize, eh der ganze Kontext-Kram initialisiert ist! -// SetOutputSizePixel( aInitSize ); //??? -/*! FloatingWindow* pFloat = pContextWin->GetFloatingWindow(); + // kein Resize, eh der ganze Kontext-Kram initialisiert ist! +// SetOutputSizePixel( aInitSize ); //??? +/*! FloatingWindow* pFloat = pContextWin->GetFloatingWindow(); if ( pFloat) pFloat->SetMinOutputSizePixel( aInitSize ); */ @@ -726,27 +726,27 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win rBindings.ENTERREGISTRATIONS(); //----------------------------- - REGISTER_SLOT( 0, SID_CURRENTCELL ); - REGISTER_SLOT( 1, SID_CURRENTTAB ); - REGISTER_SLOT( 2, SID_CURRENTDOC ); - REGISTER_SLOT( 3, SID_SELECT_SCENARIO ); + REGISTER_SLOT( 0, SID_CURRENTCELL ); + REGISTER_SLOT( 1, SID_CURRENTTAB ); + REGISTER_SLOT( 2, SID_CURRENTDOC ); + REGISTER_SLOT( 3, SID_SELECT_SCENARIO ); //----------------------------- rBindings.LEAVEREGISTRATIONS(); StartListening( *(SFX_APP()) ); StartListening( rBindings ); - aLbDocuments.Hide(); // bei NAV_LMODE_NONE gibts die nicht + aLbDocuments.Hide(); // bei NAV_LMODE_NONE gibts die nicht aLbEntries.InitWindowBits(TRUE); aLbEntries.SetSpaceBetweenEntries(0); aLbEntries.SetSelectionMode( SINGLE_SELECTION ); - aLbEntries.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | + aLbEntries.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY | SV_DRAGDROP_ENABLE_TOP ); - // war eine Kategorie als Root ausgewaehlt? + // war eine Kategorie als Root ausgewaehlt? USHORT nLastRoot = rCfg.GetRootType(); if ( nLastRoot ) aLbEntries.SetRootType( nLastRoot ); @@ -806,8 +806,8 @@ void __EXPORT ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? rNewSize.Height() = aMinOut.Height(); } } -// else -// SfxDockingWindow::Resizing(rNewSize); +// else +// SfxDockingWindow::Resizing(rNewSize); } @@ -829,7 +829,7 @@ void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt ) { if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - // toolbox images are exchanged in CommandToolBox::DataChanged + // toolbox images are exchanged in CommandToolBox::DataChanged Invalidate(); } @@ -850,13 +850,13 @@ void ScNavigatorDlg::DoResize() Size aNewSize = GetOutputSizePixel(); long nTotalHeight = aNewSize.Height(); - // #41403# bei angedocktem Navigator wird das Fenster evtl. erst klein erzeugt, - // dann kommt ein Resize auf die wirkliche Groesse -> dann Inhalte einschalten + // #41403# bei angedocktem Navigator wird das Fenster evtl. erst klein erzeugt, + // dann kommt ein Resize auf die wirkliche Groesse -> dann Inhalte einschalten BOOL bSmall = ( nTotalHeight <= aInitSize.Height() + SCNAV_MINTOL ); if ( !bSmall && bFirstBig ) { - // Inhalte laut Config wieder einschalten + // Inhalte laut Config wieder einschalten bFirstBig = FALSE; NavListMode eNavMode = NAV_LMODE_AREAS; @@ -864,11 +864,11 @@ void ScNavigatorDlg::DoResize() NavListMode eLastMode = (NavListMode) rCfg.GetListMode(); if ( eLastMode == NAV_LMODE_SCENARIOS ) eNavMode = NAV_LMODE_SCENARIOS; - SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen + SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen } - // auch wenn die Inhalte nicht sichtbar sind, die Groessen anpassen, - // damit die Breite stimmt + // auch wenn die Inhalte nicht sichtbar sind, die Groessen anpassen, + // damit die Breite stimmt //@@ 03.11.97 changes begin Point aEntryPos = aLbEntries.GetPosPixel(); @@ -882,7 +882,7 @@ void ScNavigatorDlg::DoResize() long nListHeight = aLbDocuments.GetSizePixel().Height(); aNewSize.Height() -= ( aEntryPos.Y() + nListHeight + 2*nBorderOffset ); - if(aNewSize.Height()<0) aNewSize.Height()=0; + if(aNewSize.Height()<0) aNewSize.Height()=0; aListPos.Y() = aEntryPos.Y() + aNewSize.Height() + nBorderOffset; @@ -916,7 +916,7 @@ void __EXPORT ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) } else if ( NAV_LMODE_NONE == eListMode ) { - // Tabellen hier nicht mehr + // Tabellen hier nicht mehr } else { @@ -944,7 +944,7 @@ void __EXPORT ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) aLbEntries.Refresh( SC_CONTENT_AREALINK ); break; - // SFX_HINT_DOCCHANGED kommt nicht nur bei Dokument-Wechsel + // SFX_HINT_DOCCHANGED kommt nicht nur bei Dokument-Wechsel case SC_HINT_NAVIGATOR_UPDATEALL: UpdateAll(); @@ -952,7 +952,7 @@ void __EXPORT ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) case FID_DATACHANGED: case FID_ANYDATACHANGED: - aContentTimer.Start(); // Notizen nicht sofort suchen + aContentTimer.Start(); // Notizen nicht sofort suchen break; default: @@ -997,10 +997,10 @@ void ScNavigatorDlg::SetDropMode(USHORT nNew) void ScNavigatorDlg::CursorPosChanged() { - //! Eintraege selektieren ??? + //! Eintraege selektieren ??? -// if ( GetDBAtCursor( aStrDbName ) ) -// if ( GetAreaAtCursor( aStrAreaName ) ) +// if ( GetDBAtCursor( aStrDbName ) ) +// if ( GetAreaAtCursor( aStrAreaName ) ) } //------------------------------------------------------------------------ @@ -1014,15 +1014,15 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo ) ppBoundItems[0]->ClearCache(); ScAddress aScAddress( nColNo, nRowNo, 0 ); - String aAddr; + String aAddr; aScAddress.Format( aAddr, SCA_ABS ); BOOL bUnmark = FALSE; if ( GetViewData() ) bUnmark = !pViewData->GetMarkData().IsCellMarked( nColNo, nRowNo ); - SfxStringItem aPosItem( SID_CURRENTCELL, aAddr ); - SfxBoolItem aUnmarkItem( FN_PARAM_1, bUnmark ); // ggf. Selektion aufheben + SfxStringItem aPosItem( SID_CURRENTCELL, aAddr ); + SfxBoolItem aUnmarkItem( FN_PARAM_1, bUnmark ); // ggf. Selektion aufheben rBindings.GetDispatcher()->Execute( SID_CURRENTCELL, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, @@ -1033,7 +1033,7 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo ) void ScNavigatorDlg::SetCurrentCellStr( const String rName ) { ppBoundItems[0]->ClearCache(); - SfxStringItem aNameItem( SID_CURRENTCELL, rName ); + SfxStringItem aNameItem( SID_CURRENTCELL, rName ); rBindings.GetDispatcher()->Execute( SID_CURRENTCELL, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, @@ -1046,7 +1046,7 @@ void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo ) { if ( nTabNo != nCurTab ) { - // Tabelle fuer Basic ist 1-basiert + // Tabelle fuer Basic ist 1-basiert SfxUInt16Item aTabItem( SID_CURRENTTAB, static_cast<sal_uInt16>(nTabNo) + 1 ); rBindings.GetDispatcher()->Execute( SID_CURRENTTAB, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, @@ -1059,7 +1059,7 @@ void ScNavigatorDlg::SetCurrentTableStr( const String rName ) if (!GetViewData()) return; ScDocument* pDoc = pViewData->GetDocument(); - SCTAB nCount = pDoc->GetTableCount(); + SCTAB nCount = pDoc->GetTableCount(); String aTabName; for ( SCTAB i=0; i<nCount; i++ ) @@ -1072,7 +1072,7 @@ void ScNavigatorDlg::SetCurrentTableStr( const String rName ) } } - Sound::Beep(); // Tabelle nicht gefunden + Sound::Beep(); // Tabelle nicht gefunden } //------------------------------------------------------------------------ @@ -1087,7 +1087,7 @@ void ScNavigatorDlg::SetCurrentObject( const String rName ) //------------------------------------------------------------------------ -void ScNavigatorDlg::SetCurrentDoc( const String& rDocName ) // aktivieren +void ScNavigatorDlg::SetCurrentDoc( const String& rDocName ) // aktivieren { SfxStringItem aDocItem( SID_CURRENTDOC, rDocName ); rBindings.GetDispatcher()->Execute( SID_CURRENTDOC, @@ -1160,7 +1160,7 @@ void ScNavigatorDlg::UpdateTable( const SCTAB* pTab ) else if ( GetViewData() ) nCurTab = pViewData->GetTabNo(); -// aLbTables.SetTab( nCurTab ); +// aLbTables.SetTab( nCurTab ); CheckDataArea(); } @@ -1177,14 +1177,14 @@ void ScNavigatorDlg::UpdateAll() break; case NAV_LMODE_NONE: - //! ??? + //! ??? break; default: break; } - aContentTimer.Stop(); // dann nicht nochmal + aContentTimer.Stop(); // dann nicht nochmal } //------------------------------------------------------------------------ @@ -1194,7 +1194,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, BOOL bSetSize ) if ( eMode != eListMode ) { if ( eMode != NAV_LMODE_NONE ) - bFirstBig = FALSE; // nicht mehr automatisch umschalten + bFirstBig = FALSE; // nicht mehr automatisch umschalten eListMode = eMode; @@ -1325,7 +1325,7 @@ void ScNavigatorDlg::ShowScenarios( BOOL bShow, BOOL bSetSize ) //------------------------------------------------------------------------ // -// Dokumente fuer Dropdown-Listbox +// Dokumente fuer Dropdown-Listbox // //------------------------------------------------------------------------ @@ -1352,7 +1352,7 @@ void ScNavigatorDlg::GetDocNames( const String* pManualSel ) if ( pManualSel ? ( aName == *pManualSel ) : ( pSh == pCurrentSh ) ) - aSelEntry = aEntry; // kompletter Eintrag zum Selektieren + aSelEntry = aEntry; // kompletter Eintrag zum Selektieren } pSh = SfxObjectShell::GetNext( *pSh ); @@ -1385,7 +1385,7 @@ void ScNavigatorDlg::MarkDataArea() if ( pViewSh ) { if ( !pMarkArea ) - pMarkArea = new ScArea; + pMarkArea = new ScArea; pViewSh->MarkDataArea(); ScRange aMarkRange; @@ -1433,7 +1433,7 @@ void ScNavigatorDlg::CheckDataArea() void ScNavigatorDlg::StartOfDataArea() { - // pMarkArea auswerten ??? + // pMarkArea auswerten ??? if ( GetViewData() ) { @@ -1453,7 +1453,7 @@ void ScNavigatorDlg::StartOfDataArea() void ScNavigatorDlg::EndOfDataArea() { - // pMarkArea auswerten ??? + // pMarkArea auswerten ??? if ( GetViewData() ) { @@ -1476,7 +1476,7 @@ SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment( { SfxChildAlignment eRetAlign; - //! kein Andocken, wenn Listbox nicht da ??? + //! kein Andocken, wenn Listbox nicht da ??? switch (eAlign) { @@ -1486,7 +1486,7 @@ SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment( case SFX_ALIGN_BOTTOM: case SFX_ALIGN_LOWESTBOTTOM: case SFX_ALIGN_HIGHESTBOTTOM: - eRetAlign = eActAlign; // nicht erlaubt + eRetAlign = eActAlign; // nicht erlaubt break; case SFX_ALIGN_LEFT: @@ -1495,7 +1495,7 @@ SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment( case SFX_ALIGN_LASTLEFT: case SFX_ALIGN_FIRSTRIGHT: case SFX_ALIGN_LASTRIGHT: - eRetAlign = eAlign; // erlaubt + eRetAlign = eAlign; // erlaubt break; default: diff --git a/sc/source/ui/navipi/navipi.hrc b/sc/source/ui/navipi/navipi.hrc index 0adb65a5a042..2ae1121e448d 100644 --- a/sc/source/ui/navipi/navipi.hrc +++ b/sc/source/ui/navipi/navipi.hrc @@ -1,7 +1,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 @@ -26,38 +26,38 @@ ************************************************************************/ #include "sc.hrc" -//#define RID_SCDLG_NAVIGATOR 256 +//#define RID_SCDLG_NAVIGATOR 256 -#define FT_ROW 1 -#define ED_ROW 2 -#define FT_COL 3 -#define ED_COL 4 -#define LB_DOCUMENTS 5 -#define LB_ENTRIES 6 -#define TBX_CMD 7 -#define STR_DRAGMODE 8 -#define STR_DISPLAY 9 -#define STR_ACTIVE 10 -#define STR_NOTACTIVE 11 -#define STR_HIDDEN 12 -#define STR_ACTIVEWIN 13 -//#define IMG_ENTRIES 14 -#define STR_QHLP_SCEN_LISTBOX 15 -#define STR_QHLP_SCEN_COMMENT 16 +#define FT_ROW 1 +#define ED_ROW 2 +#define FT_COL 3 +#define ED_COL 4 +#define LB_DOCUMENTS 5 +#define LB_ENTRIES 6 +#define TBX_CMD 7 +#define STR_DRAGMODE 8 +#define STR_DISPLAY 9 +#define STR_ACTIVE 10 +#define STR_NOTACTIVE 11 +#define STR_HIDDEN 12 +#define STR_ACTIVEWIN 13 +//#define IMG_ENTRIES 14 +#define STR_QHLP_SCEN_LISTBOX 15 +#define STR_QHLP_SCEN_COMMENT 16 #define IL_CMD 17 #define ILH_CMD 18 -#define IID_AREAS 1 -#define IID_DBAREAS 2 -#define IID_DATA 3 -#define IID_DOCS 4 -#define IID_UP 5 -#define IID_DOWN 6 -#define IID_SCENARIOS 7 -#define IID_DROPMODE 9 -#define IID_CHANGEROOT 10 -#define IID_ZOOMOUT 11 +#define IID_AREAS 1 +#define IID_DBAREAS 2 +#define IID_DATA 3 +#define IID_DOCS 4 +#define IID_UP 5 +#define IID_DOWN 6 +#define IID_SCENARIOS 7 +#define IID_DROPMODE 9 +#define IID_CHANGEROOT 10 +#define IID_ZOOMOUT 11 diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index c2e9ecb6a4e6..a2ef5b4f6e69 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -1,7 +1,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 @@ -28,38 +28,38 @@ #include "navipi.hrc" #define SC_NAVI_CMD_IDLIST \ - IdList = \ - { \ - IID_DATA ; \ - IID_UP ; \ - IID_DOWN ; \ - IID_SCENARIOS ; \ - IID_DROPMODE ; \ + IdList = \ + { \ + IID_DATA ; \ + IID_UP ; \ + IID_DOWN ; \ + IID_SCENARIOS ; \ + IID_DROPMODE ; \ IID_CHANGEROOT ; \ - IID_ZOOMOUT ; \ - }; \ + IID_ZOOMOUT ; \ + }; \ IdCount = { 8 ; }; // SC_CONTENT_... #define SC_NAVI_CONT_IDLIST \ - IdList = \ - { \ - 1 ; \ - 2 ; \ - 3 ; \ - 4 ; \ - 5 ; \ - 6 ; \ - 7 ; \ - 8 ; \ - }; \ + IdList = \ + { \ + 1 ; \ + 2 ; \ + 3 ; \ + 4 ; \ + 5 ; \ + 6 ; \ + 7 ; \ + 8 ; \ + }; \ IdCount = { 8 ; }; Window RID_SCDLG_NAVIGATOR { SVLook = TRUE ; HelpId = HID_SC_NAVIGATOR ; - //? Pos = MAP_APPFONT( 0, 0 ); + //? Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT ( 115 , 116 ) ; OutputSize = TRUE ; DialogControl = TRUE ; @@ -75,7 +75,7 @@ Window RID_SCDLG_NAVIGATOR // Dockable = TRUE ; FixedText FT_ROW { - // Pos = MAP_APPFONT( 2, 20 ); + // Pos = MAP_APPFONT( 2, 20 ); Pos = MAP_APPFONT ( 2 , 19 ) ; // an kleinere Toolbox-Bitmaps angepasst Size = MAP_APPFONT ( 19 , 10 ) ; @@ -85,7 +85,7 @@ Window RID_SCDLG_NAVIGATOR { HelpId = HID_SC_NAVIPI_ROW ; Border = TRUE ; - // Pos = MAP_APPFONT( 31, 19 ); + // Pos = MAP_APPFONT( 31, 19 ); Pos = MAP_APPFONT ( 31 , 18 ) ; // an kleinere Toolbox-Bitmaps angepasst Size = MAP_APPFONT ( 30 , 12 ) ; @@ -119,7 +119,7 @@ Window RID_SCDLG_NAVIGATOR // "Control" braucht immer eigene HelpId HelpId = HID_SC_NAVIPI_ENTRIES ; Border = TRUE ; - // Pos = MAP_APPFONT( 2, 52 ); + // Pos = MAP_APPFONT( 2, 52 ); Pos = MAP_APPFONT ( 2 , 35 ) ; Size = MAP_APPFONT ( 110 , 100 ) ; TabStop = TRUE ; @@ -128,7 +128,7 @@ Window RID_SCDLG_NAVIGATOR { HelpId = HID_SC_NAVIPI_DOC ; Border = TRUE ; - // Pos = MAP_APPFONT( 2, 35 ); + // Pos = MAP_APPFONT( 2, 35 ); Pos = MAP_APPFONT ( 2 , 89 ) ; Size = MAP_APPFONT ( 82 , 50 ) ; TabStop = TRUE ; @@ -175,7 +175,7 @@ Window RID_SCDLG_NAVIGATOR Text [ en-US ] = "End" ; }; //-------------------------------------------- - // ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR; }; + // ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR; }; //-------------------------------------------- //---------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_BREAK ; }; @@ -289,7 +289,7 @@ Image RID_IMG_H_DROP_COPY MaskColor = SC_HC_MASKCOLOR ; }; -// content description strings are also used in ScLinkTargetsObj +// content description strings are also used in ScLinkTargetsObj String SCSTR_CONTENT_ROOT { diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index d8733a2cfef2..01ce358a2adf 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.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 @@ -302,7 +302,7 @@ void ScScenarioWindow::SetSizePixel( const Size& rNewSize ) aLbScenario.SetSizePixel( aSize ); aSize.Height() -= 4; - aEdComment.SetPosSizePixel( Point( 0, nHeight+4 ), aSize ); + aEdComment.SetPosSizePixel( Point( 0, nHeight+4 ), aSize ); } diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index f438b3cdfcbc..cbaf73110cc5 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.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 @@ -61,16 +61,16 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, ScResId(RID_SCPAGE_OPREDLINE), rSet), - aContentFT ( this, ScResId(FT_CONTENT )), - aContentColorLB ( this, ScResId(CLB_CONTENT )), - aRemoveFT ( this, ScResId(FT_REMOVE )), - aRemoveColorLB ( this, ScResId(CLB_REMOVE )), - aInsertFT ( this, ScResId(FT_INSERT )), - aInsertColorLB ( this, ScResId(CLB_INSERT )), - aMoveFT ( this, ScResId(FT_MOVE )), - aMoveColorLB ( this, ScResId(CLB_MOVE )), - aChangedGB ( this, ScResId(GB_COLORCHGS)), - aAuthorStr (ScResId(STR_AUTHOR)) + aContentFT ( this, ScResId(FT_CONTENT )), + aContentColorLB ( this, ScResId(CLB_CONTENT )), + aRemoveFT ( this, ScResId(FT_REMOVE )), + aRemoveColorLB ( this, ScResId(CLB_REMOVE )), + aInsertFT ( this, ScResId(FT_INSERT )), + aInsertColorLB ( this, ScResId(CLB_INSERT )), + aMoveFT ( this, ScResId(FT_MOVE )), + aMoveColorLB ( this, ScResId(CLB_MOVE )), + aChangedGB ( this, ScResId(GB_COLORCHGS)), + aAuthorStr (ScResId(STR_AUTHOR)) { FreeResource(); @@ -93,7 +93,7 @@ __EXPORT ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage() Beschreibung: -----------------------------------------------------------------------*/ -SfxTabPage* __EXPORT ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* __EXPORT ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new ScRedlineOptionsTabPage( pParent, rSet ); } @@ -160,8 +160,8 @@ BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) SC_MOD()->SetAppOptions(aAppOptions); - // Repaint (wenn alles ueber Items laufen wuerde, wie es sich gehoert, - // waere das nicht noetig...) + // Repaint (wenn alles ueber Items laufen wuerde, wie es sich gehoert, + // waere das nicht noetig...) ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); if (pDocSh) pDocSh->PostPaintGridAll(); diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 7d56184d014e..cf8f19720300 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.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,39 +65,39 @@ static USHORT pCalcOptRanges[] = //======================================================================== -ScTpCalcOptions::ScTpCalcOptions( Window* pParent, +ScTpCalcOptions::ScTpCalcOptions( Window* pParent, const SfxItemSet& rCoreAttrs ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_CALC ), rCoreAttrs ), - aGbZRefs ( this, ScResId( GB_ZREFS ) ), - aBtnIterate ( this, ScResId( BTN_ITERATE ) ), - aFtSteps ( this, ScResId( FT_STEPS ) ), - aEdSteps ( this, ScResId( ED_STEPS ) ), - aFtEps ( this, ScResId( FT_EPS ) ), - aEdEps ( this, ScResId( ED_EPS ) ), + aGbZRefs ( this, ScResId( GB_ZREFS ) ), + aBtnIterate ( this, ScResId( BTN_ITERATE ) ), + aFtSteps ( this, ScResId( FT_STEPS ) ), + aEdSteps ( this, ScResId( ED_STEPS ) ), + aFtEps ( this, ScResId( FT_EPS ) ), + aEdEps ( this, ScResId( ED_EPS ) ), aSeparatorFL ( this, ScResId( FL_SEPARATOR ) ), - aGbDate ( this, ScResId( GB_DATE ) ), - aBtnDateStd ( this, ScResId( BTN_DATESTD ) ), - aBtnDateSc10 ( this, ScResId( BTN_DATESC10 ) ), - aBtnDate1904 ( this, ScResId( BTN_DATE1904 ) ), + aGbDate ( this, ScResId( GB_DATE ) ), + aBtnDateStd ( this, ScResId( BTN_DATESTD ) ), + aBtnDateSc10 ( this, ScResId( BTN_DATESC10 ) ), + aBtnDate1904 ( this, ScResId( BTN_DATE1904 ) ), aHSeparatorFL ( this, ScResId( FL_H_SEPARATOR ) ), - aBtnCase ( this, ScResId( BTN_CASE ) ), - aBtnCalc ( this, ScResId( BTN_CALC ) ), - aBtnMatch ( this, ScResId( BTN_MATCH ) ), + aBtnCase ( this, ScResId( BTN_CASE ) ), + aBtnCalc ( this, ScResId( BTN_CALC ) ), + aBtnMatch ( this, ScResId( BTN_MATCH ) ), aBtnRegex ( this, ScResId( BTN_REGEX ) ), - aBtnLookUp ( this, ScResId( BTN_LOOKUP ) ), + aBtnLookUp ( this, ScResId( BTN_LOOKUP ) ), aBtnGeneralPrec ( this, ScResId( BTN_GENERAL_PREC ) ), - aFtPrec ( this, ScResId( FT_PREC ) ), - aEdPrec ( this, ScResId( ED_PREC ) ), - pOldOptions ( new ScDocOptions( + aFtPrec ( this, ScResId( FT_PREC ) ), + aEdPrec ( this, ScResId( ED_PREC ) ), + pOldOptions ( new ScDocOptions( ((const ScTpCalcItem&)rCoreAttrs.Get( GetWhich( SID_SCDOCOPTIONS ))). GetDocOptions() ) ), - pLocalOptions ( new ScDocOptions ), - nWhichCalc ( GetWhich( SID_SCDOCOPTIONS ) ) + pLocalOptions ( new ScDocOptions ), + nWhichCalc ( GetWhich( SID_SCDOCOPTIONS ) ) { aSeparatorFL.SetStyle( aSeparatorFL.GetStyle() | WB_VERT ); Init(); @@ -142,9 +142,9 @@ SfxTabPage* __EXPORT ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) { - USHORT d,m,y; + USHORT d,m,y; - *pLocalOptions = *pOldOptions; + *pLocalOptions = *pOldOptions; aBtnCase .Check( !pLocalOptions->IsIgnoreCase() ); aBtnCalc .Check( pLocalOptions->IsCalcAsShown() ); @@ -287,14 +287,14 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) if ( pBtn->IsChecked() ) { pLocalOptions->SetIter( TRUE ); - aFtSteps.Enable(); aEdSteps.Enable(); - aFtEps .Enable(); aEdEps .Enable(); + aFtSteps.Enable(); aEdSteps.Enable(); + aFtEps .Enable(); aEdEps .Enable(); } else { pLocalOptions->SetIter( FALSE ); aFtSteps.Disable(); aEdSteps.Disable(); - aFtEps .Disable(); aEdEps .Disable(); + aFtEps .Disable(); aEdEps .Disable(); } } diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 31f913e23061..41476b7f03cb 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.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,14 +51,14 @@ static USHORT pPrintOptRanges[] = // ----------------------------------------------------------------------- -ScTpPrintOptions::ScTpPrintOptions( Window* pParent, +ScTpPrintOptions::ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreAttrs ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_PRINT ), rCoreAttrs ), - aPagesFL ( this, ScResId( FL_PAGES ) ), + aPagesFL ( this, ScResId( FL_PAGES ) ), aSkipEmptyPagesCB( this, ScResId( BTN_SKIPEMPTYPAGES ) ), - aSheetsFL ( this, ScResId( FL_SHEETS ) ), + aSheetsFL ( this, ScResId( FL_SHEETS ) ), aSelectedSheetsCB( this, ScResId( BTN_SELECTEDSHEETS ) ) { FreeResource(); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index da188c65470b..2f3253bfa8ee 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.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 @@ -56,8 +56,8 @@ // STATIC DATA ----------------------------------------------------------- -#define CR (sal_Unicode)13 -#define LF (sal_Unicode)10 +#define CR (sal_Unicode)13 +#define LF (sal_Unicode)10 static USHORT pUserListsRanges[] = { @@ -73,40 +73,40 @@ static const sal_Unicode cDelimiter = ','; // Benutzerdefinierte Listen: -ScTpUserLists::ScTpUserLists( Window* pParent, - const SfxItemSet& rCoreAttrs ) +ScTpUserLists::ScTpUserLists( Window* pParent, + const SfxItemSet& rCoreAttrs ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_USERLISTS ), rCoreAttrs ), - aFtLists ( this, ScResId( FT_LISTS ) ), - aLbLists ( this, ScResId( LB_LISTS ) ), - aFtEntries ( this, ScResId( FT_ENTRIES ) ), - aEdEntries ( this, ScResId( ED_ENTRIES ) ), - aFtCopyFrom ( this, ScResId( FT_COPYFROM ) ), - aEdCopyFrom ( this, ScResId( ED_COPYFROM ) ), - aBtnNew ( this, ScResId( BTN_NEW ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - aBtnCopy ( this, ScResId( BTN_COPY ) ), + aFtLists ( this, ScResId( FT_LISTS ) ), + aLbLists ( this, ScResId( LB_LISTS ) ), + aFtEntries ( this, ScResId( FT_ENTRIES ) ), + aEdEntries ( this, ScResId( ED_ENTRIES ) ), + aFtCopyFrom ( this, ScResId( FT_COPYFROM ) ), + aEdCopyFrom ( this, ScResId( ED_COPYFROM ) ), + aBtnNew ( this, ScResId( BTN_NEW ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnCopy ( this, ScResId( BTN_COPY ) ), aStrQueryRemove ( ScResId( STR_QUERYREMOVE ) ), - aStrNew ( aBtnNew.GetText() ), - aStrCancel ( ScResId( STR_DISMISS ) ), - aStrAdd ( ScResId( SCSTR_ADD ) ), - aStrModify ( ScResId( SCSTR_MODIFY ) ), - aStrCopyList ( ScResId( STR_COPYLIST ) ), - aStrCopyFrom ( ScResId( STR_COPYFROM ) ), - aStrCopyErr ( ScResId( STR_COPYERR ) ), + aStrNew ( aBtnNew.GetText() ), + aStrCancel ( ScResId( STR_DISMISS ) ), + aStrAdd ( ScResId( SCSTR_ADD ) ), + aStrModify ( ScResId( SCSTR_MODIFY ) ), + aStrCopyList ( ScResId( STR_COPYLIST ) ), + aStrCopyFrom ( ScResId( STR_COPYFROM ) ), + aStrCopyErr ( ScResId( STR_COPYERR ) ), // nWhichUserLists ( GetWhich( SID_SCUSERLISTS ) ), - pUserLists ( NULL ), - pDoc ( NULL ), - pViewData ( NULL ), - pRangeUtil ( new ScRangeUtil ), - bModifyMode ( FALSE ), - bCancelMode ( FALSE ), - bCopyDone ( FALSE ), - nCancelPos ( 0 ) + pUserLists ( NULL ), + pDoc ( NULL ), + pViewData ( NULL ), + pRangeUtil ( new ScRangeUtil ), + bModifyMode ( FALSE ), + bCancelMode ( FALSE ), + bCopyDone ( FALSE ), + nCancelPos ( 0 ) { SetExchangeSupport(); Init(); @@ -125,31 +125,31 @@ __EXPORT ScTpUserLists::~ScTpUserLists() void ScTpUserLists::Init() { - SfxViewShell* pSh = SfxViewShell::Current(); + SfxViewShell* pSh = SfxViewShell::Current(); ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, pSh); - aLbLists.SetSelectHdl ( LINK( this, ScTpUserLists, LbSelectHdl ) ); - aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) ); - aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) ); - aBtnAdd.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) ); - aBtnRemove.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) ); - aEdEntries.SetModifyHdl ( LINK( this, ScTpUserLists, EdEntriesModHdl ) ); + aLbLists.SetSelectHdl ( LINK( this, ScTpUserLists, LbSelectHdl ) ); + aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) ); + aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) ); + aBtnAdd.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) ); + aBtnRemove.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) ); + aEdEntries.SetModifyHdl ( LINK( this, ScTpUserLists, EdEntriesModHdl ) ); if ( pViewSh ) { - SCTAB nStartTab = 0; - SCTAB nEndTab = 0; - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCCOL nEndCol = 0; - SCROW nEndRow = 0; + SCTAB nStartTab = 0; + SCTAB nEndTab = 0; + SCCOL nStartCol = 0; + SCROW nStartRow = 0; + SCCOL nEndCol = 0; + SCROW nEndRow = 0; pViewData = pViewSh->GetViewData(); pDoc = pViewData->GetDocument(); pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); + nEndCol, nEndRow, nEndTab ); PutInOrder( nStartCol, nEndCol ); PutInOrder( nStartRow, nEndRow ); @@ -168,7 +168,7 @@ void ScTpUserLists::Init() aEdCopyFrom.Disable(); } -// aLbLists.GrabFocus(); +// aLbLists.GrabFocus(); } // ----------------------------------------------------------------------- @@ -191,7 +191,7 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) { const ScUserListItem& rUserListItem = (const ScUserListItem&) rCoreAttrs.Get( nWhichUserLists ); - const ScUserList* pCoreList = rUserListItem.GetUserList(); + const ScUserList* pCoreList = rUserListItem.GetUserList(); DBG_ASSERT( pCoreList, "UserList not found :-/" ); @@ -215,11 +215,11 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) if ( aLbLists.GetEntryCount() == 0 ) { - aFtLists .Disable(); - aLbLists .Disable(); - aFtEntries .Disable(); - aEdEntries .Disable(); - aBtnRemove .Disable(); + aFtLists .Disable(); + aLbLists .Disable(); + aFtEntries .Disable(); + aEdEntries .Disable(); + aBtnRemove .Disable(); } aBtnNew.SetText( aStrNew ); @@ -230,10 +230,10 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) { aFtCopyFrom .Enable(); aEdCopyFrom .Enable(); - aBtnCopy .Enable(); + aBtnCopy .Enable(); } -// aLbLists.GrabFocus(); +// aLbLists.GrabFocus(); } // ----------------------------------------------------------------------- @@ -249,8 +249,8 @@ BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) const ScUserListItem& rUserListItem = (const ScUserListItem&) GetItemSet().Get( nWhichUserLists ); - ScUserList* pCoreList = rUserListItem.GetUserList(); - BOOL bDataModified = FALSE; + ScUserList* pCoreList = rUserListItem.GetUserList(); + BOOL bDataModified = FALSE; if ( (pUserLists == NULL) && (pCoreList == NULL) ) { @@ -297,8 +297,8 @@ USHORT ScTpUserLists::UpdateUserListBox() //---------------------------------------------------------- - USHORT nCount = pUserLists->GetCount(); - String aEntry; + USHORT nCount = pUserLists->GetCount(); + String aEntry; if ( nCount > 0 ) { @@ -323,9 +323,9 @@ void ScTpUserLists::UpdateEntries( USHORT nList ) if ( nList < pUserLists->GetCount() ) { - ScUserListData* pList = (*pUserLists)[nList]; - USHORT nSubCount = pList->GetSubCount(); - String aEntryListStr; + ScUserListData* pList = (*pUserLists)[nList]; + USHORT nSubCount = pList->GetSubCount(); + String aEntryListStr; for ( USHORT i=0; i<nSubCount; i++ ) { @@ -347,11 +347,11 @@ void ScTpUserLists::UpdateEntries( USHORT nList ) void ScTpUserLists::MakeListStr( String& rListStr ) { - String aInputStr(rListStr); - String aStr; + String aInputStr(rListStr); + String aStr; - xub_StrLen nLen = aStr.Len(); - xub_StrLen c = 0; + xub_StrLen nLen = aStr.Len(); + xub_StrLen c = 0; aInputStr.ConvertLineEnd( LINEEND_LF ); //aStr.EraseAllChars( ' ' ); @@ -429,16 +429,16 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, //---------------------------------------------------------- - SCTAB nTab = rStartPos.Tab(); - SCCOL nStartCol = rStartPos.Col(); - SCROW nStartRow = rStartPos.Row(); - SCCOL nEndCol = rEndPos.Col(); - SCROW nEndRow = rEndPos.Row(); - USHORT nCellDir = SCRET_COLS; - BOOL bValueIgnored = FALSE; + SCTAB nTab = rStartPos.Tab(); + SCCOL nStartCol = rStartPos.Col(); + SCROW nStartRow = rStartPos.Row(); + SCCOL nEndCol = rEndPos.Col(); + SCROW nEndRow = rEndPos.Row(); + USHORT nCellDir = SCRET_COLS; + BOOL bValueIgnored = FALSE; if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) ) - { + { nCellDir = ScColOrRowDlg( this, aStrCopyList, aStrCopyFrom ).Execute(); } else if ( nStartCol != nEndCol ) @@ -448,8 +448,8 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, if ( nCellDir != RET_CANCEL ) { - String aStrList; - String aStrField; + String aStrList; + String aStrField; if ( nCellDir == SCRET_COLS ) { @@ -509,13 +509,13 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, //---------------------------------------------------------- bCopyDone = TRUE; - + } // ----------------------------------------------------------------------- -void ScTpUserLists::ModifyList( USHORT nSelList, - const String& rEntriesStr ) +void ScTpUserLists::ModifyList( USHORT nSelList, + const String& rEntriesStr ) { if ( !pUserLists ) return; @@ -546,10 +546,10 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb ) USHORT nSelPos = aLbLists.GetSelectEntryPos(); if ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) { - if ( !aFtEntries.IsEnabled() ) aFtEntries.Enable(); - if ( !aEdEntries.IsEnabled() ) aEdEntries.Enable(); - if ( !aBtnRemove.IsEnabled() ) aBtnRemove.Enable(); - if ( aBtnAdd.IsEnabled() ) aBtnAdd.Disable(); + if ( !aFtEntries.IsEnabled() ) aFtEntries.Enable(); + if ( !aEdEntries.IsEnabled() ) aEdEntries.Enable(); + if ( !aBtnRemove.IsEnabled() ) aBtnRemove.Enable(); + if ( aBtnAdd.IsEnabled() ) aBtnAdd.Disable(); UpdateEntries( nSelPos ); } @@ -652,7 +652,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) { USHORT nSelList = aLbLists.GetSelectEntryPos(); - DBG_ASSERT( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" ); + DBG_ASSERT( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" ); if ( theEntriesStr.Len() > 0 ) { @@ -685,8 +685,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) { if ( aLbLists.GetEntryCount() > 0 ) { - USHORT nRemovePos = aLbLists.GetSelectEntryPos(); - String aMsg ( aStrQueryRemove.GetToken( 0, '#' ) ); + USHORT nRemovePos = aLbLists.GetSelectEntryPos(); + String aMsg ( aStrQueryRemove.GetToken( 0, '#' ) ); aMsg += aLbLists.GetEntry( nRemovePos ); aMsg += aStrQueryRemove.GetToken( 1, '#' ); @@ -736,8 +736,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) ScRefAddress theStartPos; ScRefAddress theEndPos; - String theAreaStr( aEdCopyFrom.GetText() ); - BOOL bAreaOk = FALSE; + String theAreaStr( aEdCopyFrom.GetText() ); + BOOL bAreaOk = FALSE; if ( theAreaStr.Len() > 0 ) { @@ -766,10 +766,10 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) UpdateUserListBox(); aLbLists.SelectEntryPos( aLbLists.GetEntryCount()-1 ); LbSelectHdl( &aLbLists ); - aEdCopyFrom .SetText( theAreaStr ); - aEdCopyFrom .Disable(); - aBtnCopy .Disable(); - aFtCopyFrom .Disable(); + aEdCopyFrom .SetText( theAreaStr ); + aEdCopyFrom .Disable(); + aBtnCopy .Disable(); + aFtCopyFrom .Disable(); } else { @@ -795,17 +795,17 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, MultiLineEdit*, pEd ) if ( aBtnCopy.IsEnabled() ) { - aBtnCopy .Disable(); - aFtCopyFrom .Disable(); - aEdCopyFrom .Disable(); + aBtnCopy .Disable(); + aFtCopyFrom .Disable(); + aEdCopyFrom .Disable(); } if ( aEdEntries.GetText().Len() > 0 ) { if ( !bCancelMode && !bModifyMode ) { - aBtnNew.SetText( aStrCancel ); bCancelMode = TRUE; - aBtnAdd.SetText( aStrModify ); bModifyMode = TRUE; + aBtnNew.SetText( aStrCancel ); bCancelMode = TRUE; + aBtnAdd.SetText( aStrModify ); bModifyMode = TRUE; aBtnAdd.Enable(); aBtnRemove.Disable(); aFtLists.Disable(); diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 7c49d6d2d54c..b46efdba1b69 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.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 @@ -61,47 +61,47 @@ Optionen Inhalte --------------------------------------------------*/ -ScTpContentOptions::ScTpContentOptions( Window* pParent, - const SfxItemSet& rArgSet ) : +ScTpContentOptions::ScTpContentOptions( Window* pParent, + const SfxItemSet& rArgSet ) : SfxTabPage(pParent, ScResId( RID_SCPAGE_CONTENT ), rArgSet), aLinesGB( this, ScResId(GB_LINES )), - aGridCB( this, ScResId(CB_GRID )), - aColorFT( this, ScResId(FT_COLOR )), - aColorLB( this, ScResId(LB_COLOR )), - aBreakCB( this, ScResId(CB_PAGEBREAKS )), - aGuideLineCB( this, ScResId(CB_GUIDELINE )), - aHandleCB( this, ScResId(CB_HANDLES )), - aBigHandleCB( this, ScResId(CB_BIGHANDLES )), + aGridCB( this, ScResId(CB_GRID )), + aColorFT( this, ScResId(FT_COLOR )), + aColorLB( this, ScResId(LB_COLOR )), + aBreakCB( this, ScResId(CB_PAGEBREAKS )), + aGuideLineCB( this, ScResId(CB_GUIDELINE )), + aHandleCB( this, ScResId(CB_HANDLES )), + aBigHandleCB( this, ScResId(CB_BIGHANDLES )), aSeparator1FL (this, ScResId(FL_SEPARATOR1 )), aDisplayGB( this, ScResId(GB_DISPLAY)), - aFormulaCB( this, ScResId(CB_FORMULA)), - aNilCB( this, ScResId(CB_NIL )), - aAnnotCB( this, ScResId(CB_ANNOT )), - aValueCB( this, ScResId(CB_VALUE )), - aAnchorCB( this, ScResId(CB_ANCHOR )), - aClipMarkCB( this, ScResId(CB_CLIP )), + aFormulaCB( this, ScResId(CB_FORMULA)), + aNilCB( this, ScResId(CB_NIL )), + aAnnotCB( this, ScResId(CB_ANNOT )), + aValueCB( this, ScResId(CB_VALUE )), + aAnchorCB( this, ScResId(CB_ANCHOR )), + aClipMarkCB( this, ScResId(CB_CLIP )), aRangeFindCB( this, ScResId( CB_RFIND )), aObjectGB( this, ScResId(GB_OBJECT )), - aObjGrfFT( this, ScResId(FT_OBJGRF )), - aObjGrfLB( this, ScResId(LB_OBJGRF )), + aObjGrfFT( this, ScResId(FT_OBJGRF )), + aObjGrfLB( this, ScResId(LB_OBJGRF )), aDiagramFT( this, ScResId(FT_DIAGRAM)), - aDiagramLB( this, ScResId(LB_DIAGRAM)), - aDrawFT( this, ScResId(FT_DRAW )), - aDrawLB( this, ScResId(LB_DRAW )), + aDiagramLB( this, ScResId(LB_DIAGRAM)), + aDrawFT( this, ScResId(FT_DRAW )), + aDrawLB( this, ScResId(LB_DRAW )), aZoomGB( this, ScResId(GB_ZOOM) ), aSyncZoomCB( this, ScResId(CB_SYNCZOOM) ), aSeparator2FL (this, ScResId(FL_SEPARATOR2)), aWindowGB( this, ScResId(GB_WINDOW )), - aRowColHeaderCB(this, ScResId(CB_ROWCOLHEADER )), - aHScrollCB( this, ScResId(CB_HSCROLL )), - aVScrollCB( this, ScResId(CB_VSCROLL )), - aTblRegCB( this, ScResId(CB_TBLREG )), - aOutlineCB( this, ScResId(CB_OUTLINE )), + aRowColHeaderCB(this, ScResId(CB_ROWCOLHEADER )), + aHScrollCB( this, ScResId(CB_HSCROLL )), + aVScrollCB( this, ScResId(CB_VSCROLL )), + aTblRegCB( this, ScResId(CB_TBLREG )), + aOutlineCB( this, ScResId(CB_OUTLINE )), pLocalOptions(0) { FreeResource(); @@ -145,36 +145,36 @@ ScTpContentOptions::~ScTpContentOptions() --------------------------------------------------*/ -SfxTabPage* ScTpContentOptions::Create( Window* pParent, - const SfxItemSet& rCoreSet ) +SfxTabPage* ScTpContentOptions::Create( Window* pParent, + const SfxItemSet& rCoreSet ) { return new ScTpContentOptions(pParent, rCoreSet); } /*-----------------11.01.97 10.52------------------- --------------------------------------------------*/ -BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) +BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) { BOOL bRet = FALSE; - if( aFormulaCB .GetSavedValue() != aFormulaCB .IsChecked() || - aNilCB .GetSavedValue() != aNilCB .IsChecked() || - aAnnotCB .GetSavedValue() != aAnnotCB .IsChecked() || - aValueCB .GetSavedValue() != aValueCB .IsChecked() || - aAnchorCB .GetSavedValue() != aAnchorCB .IsChecked() || - aClipMarkCB .GetSavedValue() != aClipMarkCB .IsChecked() || - aObjGrfLB .GetSavedValue() != aObjGrfLB .GetSelectEntryPos() || - aDiagramLB .GetSavedValue() != aDiagramLB .GetSelectEntryPos() || + if( aFormulaCB .GetSavedValue() != aFormulaCB .IsChecked() || + aNilCB .GetSavedValue() != aNilCB .IsChecked() || + aAnnotCB .GetSavedValue() != aAnnotCB .IsChecked() || + aValueCB .GetSavedValue() != aValueCB .IsChecked() || + aAnchorCB .GetSavedValue() != aAnchorCB .IsChecked() || + aClipMarkCB .GetSavedValue() != aClipMarkCB .IsChecked() || + aObjGrfLB .GetSavedValue() != aObjGrfLB .GetSelectEntryPos() || + aDiagramLB .GetSavedValue() != aDiagramLB .GetSelectEntryPos() || aDrawLB .GetSavedValue() != aDrawLB .GetSelectEntryPos() || aGridCB .GetSavedValue() != aGridCB.IsChecked() || - aRowColHeaderCB .GetSavedValue() != aRowColHeaderCB.IsChecked() || + aRowColHeaderCB .GetSavedValue() != aRowColHeaderCB.IsChecked() || aHScrollCB .GetSavedValue() != aHScrollCB .IsChecked() || aVScrollCB .GetSavedValue() != aVScrollCB .IsChecked() || aTblRegCB .GetSavedValue() != aTblRegCB .IsChecked() || aOutlineCB .GetSavedValue() != aOutlineCB .IsChecked() || aColorLB .GetSavedValue() != aColorLB .GetSelectEntryPos() || - aBreakCB .GetSavedValue() != aBreakCB .IsChecked() || + aBreakCB .GetSavedValue() != aBreakCB .IsChecked() || aGuideLineCB .GetSavedValue() != aGuideLineCB .IsChecked() || - aHandleCB .GetSavedValue() != aHandleCB .IsChecked() || + aHandleCB .GetSavedValue() != aHandleCB .IsChecked() || aBigHandleCB .GetSavedValue() != aBigHandleCB .IsChecked()) { pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(), @@ -200,7 +200,7 @@ BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) --------------------------------------------------*/ -void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) +void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) { const SfxPoolItem* pItem; if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem)) @@ -208,14 +208,14 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) ((const ScTpViewItem*)pItem)->GetViewOptions() ); else pLocalOptions = new ScViewOptions; - aFormulaCB .Check(pLocalOptions->GetOption(VOPT_FORMULAS)); - aNilCB .Check(pLocalOptions->GetOption(VOPT_NULLVALS)); - aAnnotCB .Check(pLocalOptions->GetOption(VOPT_NOTES)); - aValueCB .Check(pLocalOptions->GetOption(VOPT_SYNTAX)); - aAnchorCB .Check(pLocalOptions->GetOption(VOPT_ANCHOR)); - aClipMarkCB .Check(pLocalOptions->GetOption(VOPT_CLIPMARKS)); - - aObjGrfLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) ); + aFormulaCB .Check(pLocalOptions->GetOption(VOPT_FORMULAS)); + aNilCB .Check(pLocalOptions->GetOption(VOPT_NULLVALS)); + aAnnotCB .Check(pLocalOptions->GetOption(VOPT_NOTES)); + aValueCB .Check(pLocalOptions->GetOption(VOPT_SYNTAX)); + aAnchorCB .Check(pLocalOptions->GetOption(VOPT_ANCHOR)); + aClipMarkCB .Check(pLocalOptions->GetOption(VOPT_CLIPMARKS)); + + aObjGrfLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) ); aDiagramLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) ); aDrawLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) ); @@ -229,7 +229,7 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) aBreakCB.Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) ); aGuideLineCB.Check( pLocalOptions->GetOption(VOPT_HELPLINES) ); - aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) ); // inverted + aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) ); // inverted aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) ); if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, FALSE, &pItem)) @@ -241,11 +241,11 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) aSyncZoomCB.SaveValue(); aFormulaCB .SaveValue(); - aNilCB .SaveValue(); - aAnnotCB .SaveValue(); - aValueCB .SaveValue(); - aAnchorCB .SaveValue(); - aClipMarkCB .SaveValue(); + aNilCB .SaveValue(); + aAnnotCB .SaveValue(); + aValueCB .SaveValue(); + aAnchorCB .SaveValue(); + aClipMarkCB .SaveValue(); aObjGrfLB .SaveValue(); aDiagramLB .SaveValue(); aDrawLB .SaveValue(); @@ -256,10 +256,10 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) aOutlineCB .SaveValue(); aGridCB .SaveValue(); aColorLB .SaveValue(); - aBreakCB .SaveValue(); + aBreakCB .SaveValue(); aGuideLineCB .SaveValue(); - aHandleCB .SaveValue(); - aBigHandleCB .SaveValue(); + aHandleCB .SaveValue(); + aBigHandleCB .SaveValue(); } /*-----------------11.01.97 12.45------------------- @@ -275,7 +275,7 @@ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet) --------------------------------------------------*/ -int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) +int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) FillItemSet(*pSetP); @@ -287,9 +287,9 @@ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb ) { - USHORT nSelPos = pLb->GetSelectEntryPos(); - ScVObjMode eMode = ScVObjMode(nSelPos); - ScVObjType eType = VOBJ_TYPE_OLE; + USHORT nSelPos = pLb->GetSelectEntryPos(); + ScVObjMode eMode = ScVObjMode(nSelPos); + ScVObjType eType = VOBJ_TYPE_OLE; if ( pLb == &aDiagramLB ) eType = VOBJ_TYPE_CHART; @@ -308,25 +308,25 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb ) IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn ) { ScViewOption eOption = VOPT_FORMULAS; - BOOL bChecked = pBtn->IsChecked(); - - if ( &aFormulaCB == pBtn ) eOption = VOPT_FORMULAS; - else if ( &aNilCB == pBtn ) eOption = VOPT_NULLVALS; - else if ( &aAnnotCB == pBtn ) eOption = VOPT_NOTES; - else if ( &aValueCB == pBtn ) eOption = VOPT_SYNTAX; - else if ( &aAnchorCB == pBtn ) eOption = VOPT_ANCHOR; - else if ( &aClipMarkCB == pBtn ) eOption = VOPT_CLIPMARKS; + BOOL bChecked = pBtn->IsChecked(); + + if ( &aFormulaCB == pBtn ) eOption = VOPT_FORMULAS; + else if ( &aNilCB == pBtn ) eOption = VOPT_NULLVALS; + else if ( &aAnnotCB == pBtn ) eOption = VOPT_NOTES; + else if ( &aValueCB == pBtn ) eOption = VOPT_SYNTAX; + else if ( &aAnchorCB == pBtn ) eOption = VOPT_ANCHOR; + else if ( &aClipMarkCB == pBtn ) eOption = VOPT_CLIPMARKS; else if ( &aVScrollCB == pBtn ) eOption = VOPT_VSCROLL; - else if ( &aHScrollCB == pBtn ) eOption = VOPT_HSCROLL; - else if ( &aTblRegCB == pBtn ) eOption = VOPT_TABCONTROLS; - else if ( &aOutlineCB == pBtn ) eOption = VOPT_OUTLINER; - else if ( &aBreakCB == pBtn ) eOption = VOPT_PAGEBREAKS; - else if ( &aGuideLineCB == pBtn ) eOption = VOPT_HELPLINES; - else if ( &aHandleCB == pBtn ) eOption = VOPT_SOLIDHANDLES; - else if ( &aBigHandleCB == pBtn ) eOption = VOPT_BIGHANDLES; - else if ( &aRowColHeaderCB == pBtn ) eOption = VOPT_HEADER; - - // VOPT_SOLIDHANDLES is inverted (CheckBox is "simple handles") + else if ( &aHScrollCB == pBtn ) eOption = VOPT_HSCROLL; + else if ( &aTblRegCB == pBtn ) eOption = VOPT_TABCONTROLS; + else if ( &aOutlineCB == pBtn ) eOption = VOPT_OUTLINER; + else if ( &aBreakCB == pBtn ) eOption = VOPT_PAGEBREAKS; + else if ( &aGuideLineCB == pBtn ) eOption = VOPT_HELPLINES; + else if ( &aHandleCB == pBtn ) eOption = VOPT_SOLIDHANDLES; + else if ( &aBigHandleCB == pBtn ) eOption = VOPT_BIGHANDLES; + else if ( &aRowColHeaderCB == pBtn ) eOption = VOPT_HEADER; + + // VOPT_SOLIDHANDLES is inverted (CheckBox is "simple handles") if ( eOption == VOPT_SOLIDHANDLES ) pLocalOptions->SetOption( eOption, !bChecked ); else @@ -352,7 +352,7 @@ void ScTpContentOptions::InitGridOpt() if ( aColorLB.GetEntryCount() == 0 ) { - SfxObjectShell* pDocSh = SfxObjectShell::Current(); + SfxObjectShell* pDocSh = SfxObjectShell::Current(); // hier koennte auch eine andere DocShell kommen! pDocSh = PTR_CAST(ScDocShell, pDocSh); @@ -375,7 +375,7 @@ void ScTpContentOptions::InitGridOpt() aColorLB.SetUpdateMode( FALSE ); - // Eintraege aus der Colortable + // Eintraege aus der Colortable long nCount = pColorTable->Count(); for ( long n=0; n<nCount; n++ ) @@ -384,9 +384,9 @@ void ScTpContentOptions::InitGridOpt() aColorLB.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - // Standard-Gitterfarbe + // Standard-Gitterfarbe - Color aStdCol( SC_STD_GRIDCOLOR ); // wie Default in ScViewOptions + Color aStdCol( SC_STD_GRIDCOLOR ); // wie Default in ScViewOptions if ( LISTBOX_ENTRY_NOTFOUND == aColorLB.GetEntryPos( aStdCol ) ) aColorLB.InsertEntry( aStdCol, ScGlobal::GetRscString( STR_GRIDCOLOR ) ); @@ -396,11 +396,11 @@ void ScTpContentOptions::InitGridOpt() Invalidate(); } - // #79720# also select grid color entry on subsequent calls + // #79720# also select grid color entry on subsequent calls - String aName; - Color aCol = pLocalOptions->GetGridColor( &aName ); - USHORT nSelPos = aColorLB.GetEntryPos( aCol ); + String aName; + Color aCol = pLocalOptions->GetGridColor( &aName ); + USHORT nSelPos = aColorLB.GetEntryPos( aCol ); if ( LISTBOX_ENTRY_NOTFOUND != nSelPos ) aColorLB.SelectEntryPos( nSelPos ); @@ -423,8 +423,8 @@ IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox ) --------------------------------------------------*/ -ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, - const SfxItemSet& rArgSet ) : +ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, + const SfxItemSet& rArgSet ) : SfxTabPage(pParent, ScResId( RID_SCPAGE_LAYOUT ), rArgSet), aUnitGB( this, ScResId(GB_UNIT )), aUnitFT( this, ScResId(FT_UNIT )), @@ -432,17 +432,17 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, aTabFT( this, ScResId( FT_TAB )), aTabMF( this, ScResId( MF_TAB )), aSeparatorFL( this, ScResId( FL_SEPARATOR )), - aLinkGB (this, ScResId(GB_LINK )), + aLinkGB (this, ScResId(GB_LINK )), aLinkFT(this, ScResId(FT_UPDATE_LINKS )), - aAlwaysRB (this, ScResId(RB_ALWAYS )), - aRequestRB (this, ScResId(RB_REQUEST )), - aNeverRB (this, ScResId(RB_NEVER )), + aAlwaysRB (this, ScResId(RB_ALWAYS )), + aRequestRB (this, ScResId(RB_REQUEST )), + aNeverRB (this, ScResId(RB_NEVER )), aOptionsGB( this, ScResId( GB_OPTIONS )), - aAlignCB ( this, ScResId( CB_ALIGN )), - aAlignLB ( this, ScResId( LB_ALIGN )), - aEditModeCB( this, ScResId( CB_EDITMODE )), - aFormatCB( this, ScResId( CB_FORMAT )), + aAlignCB ( this, ScResId( CB_ALIGN )), + aAlignLB ( this, ScResId( LB_ALIGN )), + aEditModeCB( this, ScResId( CB_EDITMODE )), + aFormatCB( this, ScResId( CB_FORMAT )), aExpRefCB( this, ScResId( CB_EXPREF )), aMarkHdrCB( this, ScResId( CB_MARKHDR )), aTextFmtCB( this, ScResId( CB_TEXTFMT )), @@ -496,8 +496,8 @@ ScTpLayoutOptions::~ScTpLayoutOptions() --------------------------------------------------*/ -SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, - const SfxItemSet& rCoreSet ) +SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, + const SfxItemSet& rCoreSet ) { ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, rCoreSet); ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current()); @@ -510,7 +510,7 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, --------------------------------------------------*/ -BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) +BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) { BOOL bRet = TRUE; const USHORT nMPos = aUnitLB.GetSelectEntryPos(); @@ -605,7 +605,7 @@ BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) --------------------------------------------------*/ -void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) +void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) { aUnitLB.SetNoSelection(); if ( rCoreSet.GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE ) @@ -631,7 +631,7 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) aTabMF.SaveValue(); aUnitLB .SaveValue(); - aTabMF .SaveValue(); + aTabMF .SaveValue(); ScLkUpdMode nSet=LM_UNKNOWN; @@ -648,9 +648,9 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) switch(nSet) { - case LM_ALWAYS: aAlwaysRB. Check(); break; - case LM_NEVER: aNeverRB. Check(); break; - case LM_ON_DEMAND: aRequestRB. Check(); break; + case LM_ALWAYS: aAlwaysRB. Check(); break; + case LM_NEVER: aNeverRB. Check(); break; + case LM_ON_DEMAND: aRequestRB. Check(); break; default: { // added to avoid warnings @@ -682,13 +682,13 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) aReplWarnCB.Check( ( (const SfxBoolItem*)pItem)->GetValue() ); aAlignCB .SaveValue(); - aAlignLB .SaveValue(); - aEditModeCB .SaveValue(); - aFormatCB .SaveValue(); + aAlignLB .SaveValue(); + aEditModeCB .SaveValue(); + aFormatCB .SaveValue(); aExpRefCB .SaveValue(); - aMarkHdrCB .SaveValue(); - aTextFmtCB .SaveValue(); + aMarkHdrCB .SaveValue(); + aTextFmtCB .SaveValue(); aReplWarnCB .SaveValue(); AlignHdl(&aAlignCB); @@ -701,14 +701,14 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) --------------------------------------------------*/ -void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ ) +void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ ) { } /*-----------------11.01.97 12.46------------------- --------------------------------------------------*/ -int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) +int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) FillItemSet(*pSetP); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index d80e5062f2e9..5ff14b2779ae 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.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,15 +69,15 @@ const USHORT SC_AREASDLG_RR_OFFSET = 2; //============================================================================ -#define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) -#define ERRORBOX(nId) ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \ +#define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) +#define ERRORBOX(nId) ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString( nId ) ).Execute() -#define SWAP(x1,x2) { int n=x1; x1=x2; x2=n; } +#define SWAP(x1,x2) { int n=x1; x1=x2; x2=n; } // globale Funktionen (->am Ende der Datei): bool lcl_CheckRepeatString( const String& rStr, ScDocument* pDoc, bool bIsRow, ScRange* pRange ); -void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr ); +void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr ); #if 0 // this method is useful when debugging address flags. @@ -107,40 +107,40 @@ static void printAddressFlags(USHORT nFlag) #endif //============================================================================ -// class ScPrintAreasDlg +// class ScPrintAreasDlg //---------------------------------------------------------------------------- ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_AREAS), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_AREAS), // - aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ), + aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ), aFlPrintArea ( this, ScResId( FL_PRINTAREA ) ), aEdPrintArea ( this, this, ScResId( ED_PRINTAREA ) ), - aRbPrintArea ( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, this ), + aRbPrintArea ( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, this ), // - aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ), + aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ), aFlRepeatRow ( this, ScResId( FL_REPEATROW ) ), aEdRepeatRow ( this, this, ScResId( ED_REPEATROW ) ), - aRbRepeatRow ( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, this ), + aRbRepeatRow ( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, this ), // - aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ), + aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ), aFlRepeatCol ( this, ScResId( FL_REPEATCOL ) ), aEdRepeatCol ( this, this, ScResId( ED_REPEATCOL ) ), - aRbRepeatCol ( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, this ), + aRbRepeatCol ( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, this ), // - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), // - bDlgLostFocus ( FALSE ), - pRefInputEdit ( &aEdPrintArea ), - pDoc ( NULL ), - pViewData ( NULL ), - nCurTab ( 0 ) + bDlgLostFocus ( FALSE ), + pRefInputEdit ( &aEdPrintArea ), + pDoc ( NULL ), + pViewData ( NULL ), + nCurTab ( 0 ) { ScTabViewShell* pScViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); - ScDocShell* pScDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); + ScDocShell* pScDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); DBG_ASSERT( pScDocSh, "Current DocumentShell not found :-(" ); @@ -189,8 +189,8 @@ BOOL ScPrintAreasDlg::Close() BOOL ScPrintAreasDlg::IsTableLocked() const { - // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn, - // bei der Eingabe die Tabelle umzuschalten + // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn, + // bei der Eingabe die Tabelle umzuschalten return TRUE; } @@ -205,14 +205,14 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ if ( rRef.aStart != rRef.aEnd ) RefInputStart( pRefInputEdit ); - String aStr; + String aStr; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( &aEdPrintArea == pRefInputEdit ) { rRef.Format( aStr, SCR_ABS, pDoc, eConv ); -// aEdPrintArea.ReplaceSelected( aStr ); +// aEdPrintArea.ReplaceSelected( aStr ); String aVal = aEdPrintArea.GetText(); Selection aSel = aEdPrintArea.GetSelection(); @@ -287,24 +287,24 @@ void ScPrintAreasDlg::SetActive() void ScPrintAreasDlg::Impl_Reset() { - String aStrRange; - const ScRange* pRepeatColRange = pDoc->GetRepeatColRange( nCurTab ); - const ScRange* pRepeatRowRange = pDoc->GetRepeatRowRange( nCurTab ); + String aStrRange; + const ScRange* pRepeatColRange = pDoc->GetRepeatColRange( nCurTab ); + const ScRange* pRepeatRowRange = pDoc->GetRepeatRowRange( nCurTab ); - aEdPrintArea.SetModifyHdl ( HDL(Impl_ModifyHdl) ); - aEdRepeatRow.SetModifyHdl ( HDL(Impl_ModifyHdl) ); - aEdRepeatCol.SetModifyHdl ( HDL(Impl_ModifyHdl) ); + aEdPrintArea.SetModifyHdl ( HDL(Impl_ModifyHdl) ); + aEdRepeatRow.SetModifyHdl ( HDL(Impl_ModifyHdl) ); + aEdRepeatCol.SetModifyHdl ( HDL(Impl_ModifyHdl) ); aEdPrintArea.SetGetFocusHdl( HDL(Impl_GetFocusHdl) ); aEdRepeatRow.SetGetFocusHdl( HDL(Impl_GetFocusHdl) ); aEdRepeatCol.SetGetFocusHdl( HDL(Impl_GetFocusHdl) ); aLbPrintArea.SetGetFocusHdl( HDL(Impl_GetFocusHdl) ); aLbRepeatRow.SetGetFocusHdl( HDL(Impl_GetFocusHdl) ); aLbRepeatCol.SetGetFocusHdl( HDL(Impl_GetFocusHdl) ); - aLbPrintArea.SetSelectHdl ( HDL(Impl_SelectHdl) ); - aLbRepeatRow.SetSelectHdl ( HDL(Impl_SelectHdl) ); - aLbRepeatCol.SetSelectHdl ( HDL(Impl_SelectHdl) ); - aBtnOk .SetClickHdl ( HDL(Impl_BtnHdl) ); - aBtnCancel .SetClickHdl ( HDL(Impl_BtnHdl) ); + aLbPrintArea.SetSelectHdl ( HDL(Impl_SelectHdl) ); + aLbRepeatRow.SetSelectHdl ( HDL(Impl_SelectHdl) ); + aLbRepeatCol.SetSelectHdl ( HDL(Impl_SelectHdl) ); + aBtnOk .SetClickHdl ( HDL(Impl_BtnHdl) ); + aBtnCancel .SetClickHdl ( HDL(Impl_BtnHdl) ); Impl_FillLists(); @@ -347,7 +347,7 @@ void ScPrintAreasDlg::Impl_Reset() if( pDoc->IsPrintEntireSheet( nCurTab ) ) aLbPrintArea.SelectEntryPos( SC_AREASDLG_PR_ENTIRE ); - aEdPrintArea.SaveValue(); // fuer FillItemSet() merken: + aEdPrintArea.SaveValue(); // fuer FillItemSet() merken: aEdRepeatRow.SaveValue(); aEdRepeatCol.SaveValue(); } @@ -357,8 +357,8 @@ void ScPrintAreasDlg::Impl_Reset() BOOL ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) { - String aRangeStr = pEd->GetText(); - BOOL bDataChanged = (pEd->GetSavedValue() != aRangeStr); + String aRangeStr = pEd->GetText(); + BOOL bDataChanged = (pEd->GetSavedValue() != aRangeStr); if ( (aRangeStr.Len() > 0) && &aEdPrintArea != pEd ) { @@ -378,10 +378,10 @@ BOOL ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) BOOL ScPrintAreasDlg::Impl_CheckRefStrings() { - BOOL bOk = FALSE; - String aStrPrintArea = aEdPrintArea.GetText(); - String aStrRepeatRow = aEdRepeatRow.GetText(); - String aStrRepeatCol = aEdRepeatCol.GetText(); + BOOL bOk = FALSE; + String aStrPrintArea = aEdPrintArea.GetText(); + String aStrRepeatRow = aEdRepeatRow.GetText(); + String aStrRepeatCol = aEdRepeatCol.GetText(); BOOL bPrintAreaOk = TRUE; if ( aStrPrintArea.Len() ) @@ -443,8 +443,8 @@ void ScPrintAreasDlg::Impl_FillLists() //------------------------------------------------------ // Selektion holen und String in PrintArea-ListBox merken //------------------------------------------------------ - ScRange aRange; - String aStrRange; + ScRange aRange; + String aStrRange; BOOL bSimple = TRUE; if ( pViewData ) @@ -466,15 +466,15 @@ void ScPrintAreasDlg::Impl_FillLists() //------------------------------------------------------ // Ranges holen und in ListBoxen merken //------------------------------------------------------ - ScRangeName* pRangeNames = pDoc->GetRangeName(); - const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0; + ScRangeName* pRangeNames = pDoc->GetRangeName(); + const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0; if ( nCount > 0 ) { - String aName; - String aSymbol; + String aName; + String aSymbol; // ScRange aRange; - ScRangeData* pData = NULL; + ScRangeData* pData = NULL; for ( USHORT i=0; i<nCount; i++ ) { @@ -530,11 +530,11 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) { if ( Impl_CheckRefStrings() ) { - BOOL bDataChanged = FALSE; - String aStr; - SfxStringItem aPrintArea( SID_CHANGE_PRINTAREA, aStr ); - SfxStringItem aRepeatRow( FN_PARAM_2, aStr ); - SfxStringItem aRepeatCol( FN_PARAM_3, aStr ); + BOOL bDataChanged = FALSE; + String aStr; + SfxStringItem aPrintArea( SID_CHANGE_PRINTAREA, aStr ); + SfxStringItem aRepeatRow( FN_PARAM_2, aStr ); + SfxStringItem aRepeatCol( FN_PARAM_3, aStr ); //------------------------- // Druckbereich veraendert? @@ -670,15 +670,15 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) return 0; // set list box selection according to edit field - USHORT nEntryCount = pLb->GetEntryCount(); - String aStrEd( pEd->GetText() ); - String aEdUpper = aStrEd; + USHORT nEntryCount = pLb->GetEntryCount(); + String aStrEd( pEd->GetText() ); + String aEdUpper = aStrEd; aEdUpper.ToUpperAscii(); if ( (nEntryCount > nFirstCustomPos) && aStrEd.Len() > 0 ) { - BOOL bFound = FALSE; - String* pSymbol = NULL; + BOOL bFound = FALSE; + String* pSymbol = NULL; USHORT i; for ( i=nFirstCustomPos; i<nEntryCount && !bFound; i++ ) @@ -709,10 +709,10 @@ bool lcl_CheckOne_OOO( const String& rStr, bool bIsRow, SCCOLROW& rVal ) // Row: [$]1-MAXTAB // Col: [$]A-IV - String aStr = rStr; + String aStr = rStr; xub_StrLen nLen = aStr.Len(); - SCCOLROW nNum = 0; - BOOL bStrOk = ( nLen > 0 ) && ( bIsRow ? ( nLen < 6 ) : ( nLen < 4 ) ); + SCCOLROW nNum = 0; + BOOL bStrOk = ( nLen > 0 ) && ( bIsRow ? ( nLen < 6 ) : ( nLen < 4 ) ); if ( bStrOk ) { diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 3fa032989dfc..d2409e34c258 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.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 @@ -46,8 +46,8 @@ #include "scuitphfedit.hxx" //------------------------------------------------------------------ -// macros from docsh4.cxx -//! use SIDs? +// macros from docsh4.cxx +//! use SIDs? #define IS_SHARE_HEADER(set) \ ((SfxBoolItem&) \ @@ -62,9 +62,9 @@ //================================================================== ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, - Window* pParent, + Window* pParent, const SfxItemSet& rCoreSet, - const String& rPageStyle, + const String& rPageStyle, USHORT nResIdP ) : SfxTabDialog( pFrameP, pParent, ScResId( nResIdP ), &rCoreSet ) { @@ -131,7 +131,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, default: case RID_SCDLG_HFEDIT: { - const SvxPageItem& rPageItem = (const SvxPageItem&) + const SvxPageItem& rPageItem = (const SvxPageItem&) rCoreSet.Get( rCoreSet.GetPool()->GetWhich(SID_ATTR_PAGE) ); @@ -145,7 +145,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, } else { - // #69193a# respect "shared" setting + // #69193a# respect "shared" setting BOOL bShareHeader = IS_SHARE_HEADER(rCoreSet); if ( bShareHeader ) diff --git a/sc/source/ui/pagedlg/hfedtdlg.hrc b/sc/source/ui/pagedlg/hfedtdlg.hrc index 30e6f8ecae63..a8a32da3446f 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.hrc +++ b/sc/source/ui/pagedlg/hfedtdlg.hrc @@ -1,7 +1,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,10 +45,10 @@ #define BTN_FILE 6 #define BTN_TABLE 7 -#define RID_POPUP_FCOMMAND 10 -#define FILE_COMMAND_TITEL 11 -#define FILE_COMMAND_FILENAME 12 -#define FILE_COMMAND_PATH 13 +#define RID_POPUP_FCOMMAND 10 +#define FILE_COMMAND_TITEL 11 +#define FILE_COMMAND_FILENAME 12 +#define FILE_COMMAND_PATH 13 #define FL_INFO 14 diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src index 1445636e8cc6..749303ce7164 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.src +++ b/sc/source/ui/pagedlg/hfedtdlg.src @@ -1,7 +1,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,7 +57,7 @@ TabDialog RID_SCDLG_HFED_HEADER Size = MAP_APPFONT ( 270 , 140 ) ; Text [ en-US ] = "Headers" ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; TabControl 1 { OutputSize = TRUE ; @@ -88,7 +88,7 @@ TabDialog RID_SCDLG_HFED_FOOTER Size = MAP_APPFONT ( 270 , 140 ) ; Text [ en-US ] = "Footers" ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; TabControl 1 { OutputSize = TRUE ; @@ -121,7 +121,7 @@ TabDialog RID_SCDLG_HFEDIT_ALL SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -164,7 +164,7 @@ TabDialog RID_SCDLG_HFEDIT_SHDR SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -201,7 +201,7 @@ TabDialog RID_SCDLG_HFEDIT_SFTR SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -238,7 +238,7 @@ TabDialog RID_SCDLG_HFEDIT SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -269,7 +269,7 @@ TabDialog RID_SCDLG_HFEDIT_HEADER SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -300,7 +300,7 @@ TabDialog RID_SCDLG_HFEDIT_FOOTER SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -331,7 +331,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -356,7 +356,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTHEADER SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -381,7 +381,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -406,7 +406,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER SVLook = TRUE ; Size = MAP_APPFONT ( 270 , 140 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; HFEDIT_DLGTITLE TabControl 1 { @@ -440,7 +440,7 @@ TabPage RID_HFBASE Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "~Left area" ; }; - /* "Control" braucht eigene HelpId, darum in der Ableitung: + /* "Control" braucht eigene HelpId, darum in der Ableitung: Control WND_LEFT { Border = TRUE ; @@ -455,7 +455,7 @@ TabPage RID_HFBASE Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "~Center area" ; }; - /* "Control" braucht eigene HelpId, darum in der Ableitung: + /* "Control" braucht eigene HelpId, darum in der Ableitung: Control WND_CENTER { Border = TRUE ; @@ -470,7 +470,7 @@ TabPage RID_HFBASE Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "R~ight area" ; }; - /* "Control" braucht eigene HelpId, darum in der Ableitung: + /* "Control" braucht eigene HelpId, darum in der Ableitung: Control WND_RIGHT { Border = TRUE ; @@ -672,8 +672,8 @@ TabPage RID_HFBASE Text [ en-US ] = "Note" ; }; }; - // Kombinationen: Header/Footer links/rechts - // die Eingabefenster jeweils mit eigener ID, sonst aus RID_HFBASE kopiert + // Kombinationen: Header/Footer links/rechts + // die Eingabefenster jeweils mit eigener ID, sonst aus RID_HFBASE kopiert TabPage RID_SCPAGE_HFED_HL < RID_HFBASE { Hide = TRUE ; diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc index 2f3593c2f6d1..6a995b1679d4 100644 --- a/sc/source/ui/pagedlg/pagedlg.hrc +++ b/sc/source/ui/pagedlg/pagedlg.hrc @@ -1,7 +1,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 @@ -26,42 +26,42 @@ ************************************************************************/ -#include "sc.hrc" // -> RID_SCDLG_PAGE +#include "sc.hrc" // -> RID_SCDLG_PAGE // -> RID_SCPAGE_TABLE // -> RID_SCPAGE_AREAS -#define TP_PAGE_STD 1 -#define TP_PAGE_HEADER 2 -#define TP_PAGE_FOOTER 3 -#define TP_PAGE_TABLE 4 -#define TP_PAGE_AREAS 5 +#define TP_PAGE_STD 1 +#define TP_PAGE_HEADER 2 +#define TP_PAGE_FOOTER 3 +#define TP_PAGE_TABLE 4 +#define TP_PAGE_AREAS 5 //================================================ // TabPage: Tabelle -#define BTN_GRID 10 -#define BTN_HEADER 11 -#define BTN_NOTES 12 -#define BTN_CHARTS 13 -#define BTN_OBJECTS 14 -#define BTN_DRAWINGS 15 -#define BTN_FORMULAS 16 -#define BTN_NULLVALS 17 +#define BTN_GRID 10 +#define BTN_HEADER 11 +#define BTN_NOTES 12 +#define BTN_CHARTS 13 +#define BTN_OBJECTS 14 +#define BTN_DRAWINGS 15 +#define BTN_FORMULAS 16 +#define BTN_NULLVALS 17 #define FL_PRINT 19 -#define BTN_TOPDOWN 20 -#define BTN_LEFTRIGHT 21 -#define BMP_PAGEDIR 22 -#define IMG_LEFTRIGHT 23 -#define IMG_TOPDOWN 24 -#define BTN_PAGENO 25 -#define ED_PAGENO 26 +#define BTN_TOPDOWN 20 +#define BTN_LEFTRIGHT 21 +#define BMP_PAGEDIR 22 +#define IMG_LEFTRIGHT 23 +#define IMG_TOPDOWN 24 +#define BTN_PAGENO 25 +#define ED_PAGENO 26 #define FL_PAGEDIR 29 #define FT_SCALEMODE 30 #define LB_SCALEMODE 31 -#define ED_SCALEALL 32 -#define ED_SCALEPAGENUM 34 +#define ED_SCALEALL 32 +#define ED_SCALEPAGENUM 34 #define ED_SCALEPAGEWIDTH 35 #define ED_SCALEPAGEHEIGHT 36 #define FL_SCALE 39 @@ -83,21 +83,21 @@ // Dialog: Druckbereiche #define FL_PRINTAREA 10 -#define ED_PRINTAREA 11 -#define RB_PRINTAREA 12 -#define LB_PRINTAREA 13 +#define ED_PRINTAREA 11 +#define RB_PRINTAREA 12 +#define LB_PRINTAREA 13 #define FL_REPEATROW 20 -#define ED_REPEATROW 21 -#define RB_REPEATROW 22 -#define LB_REPEATROW 23 +#define ED_REPEATROW 21 +#define RB_REPEATROW 22 +#define LB_REPEATROW 23 #define FL_REPEATCOL 30 -#define ED_REPEATCOL 31 -#define RB_REPEATCOL 32 -#define LB_REPEATCOL 33 +#define ED_REPEATCOL 31 +#define RB_REPEATCOL 32 +#define LB_REPEATCOL 33 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src index d0f95c3d9f6b..a4e51bff0792 100644 --- a/sc/source/ui/pagedlg/pagedlg.src +++ b/sc/source/ui/pagedlg/pagedlg.src @@ -1,7 +1,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 @@ -31,7 +31,7 @@ ModelessDialog RID_SCDLG_AREAS Size = MAP_APPFONT ( 316 , 90 ) ; OutputSize = TRUE ; Moveable = TRUE ; - //Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! + //Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! Hide = TRUE ; SVLook = TRUE ; Text [ en-US ] = "Edit Print Ranges" ; diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 5ea90ef0d77d..05ee8962247b 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.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 @@ -93,52 +93,52 @@ static ScEditWindow* pActiveEdWnd = NULL; // class ScHFEditPage // -ScHFEditPage::ScHFEditPage( Window* pParent, - USHORT nResId, - const SfxItemSet& rCoreAttrs, - USHORT nWhichId, +ScHFEditPage::ScHFEditPage( Window* pParent, + USHORT nResId, + const SfxItemSet& rCoreAttrs, + USHORT nWhichId, bool bHeader ) - : SfxTabPage ( pParent, ScResId( nResId ), rCoreAttrs ), - - aFtLeft ( this, ScResId( FT_LEFT ) ), - aWndLeft ( this, ScResId( WND_LEFT ), Left ), - aFtCenter ( this, ScResId( FT_CENTER ) ), - aWndCenter ( this, ScResId( WND_CENTER ), Center ), - aFtRight ( this, ScResId( FT_RIGHT ) ), - aWndRight ( this, ScResId( WND_RIGHT ), Right ), - maFtDefinedHF ( this, ScResId( FT_HF_DEFINED ) ), - maLbDefined ( this, ScResId( LB_DEFINED ) ), - maFtCustomHF ( this, ScResId( FT_HF_CUSTOM ) ), - aBtnText ( this, ScResId( BTN_TEXT ) ), - aBtnFile ( this, ScResId( BTN_FILE ) ), - aBtnTable ( this, ScResId( BTN_TABLE ) ), - aBtnPage ( this, ScResId( BTN_PAGE ) ), - aBtnLastPage ( this, ScResId( BTN_PAGES ) ), - aBtnDate ( this, ScResId( BTN_DATE ) ), - aBtnTime ( this, ScResId( BTN_TIME ) ), - aFlInfo ( this, ScResId( FL_INFO ) ), - aFtInfo ( this, ScResId( FT_INFO ) ), - aPopUpFile ( ScResId( RID_POPUP_FCOMMAND) ), - nWhich ( nWhichId ) + : SfxTabPage ( pParent, ScResId( nResId ), rCoreAttrs ), + + aFtLeft ( this, ScResId( FT_LEFT ) ), + aWndLeft ( this, ScResId( WND_LEFT ), Left ), + aFtCenter ( this, ScResId( FT_CENTER ) ), + aWndCenter ( this, ScResId( WND_CENTER ), Center ), + aFtRight ( this, ScResId( FT_RIGHT ) ), + aWndRight ( this, ScResId( WND_RIGHT ), Right ), + maFtDefinedHF ( this, ScResId( FT_HF_DEFINED ) ), + maLbDefined ( this, ScResId( LB_DEFINED ) ), + maFtCustomHF ( this, ScResId( FT_HF_CUSTOM ) ), + aBtnText ( this, ScResId( BTN_TEXT ) ), + aBtnFile ( this, ScResId( BTN_FILE ) ), + aBtnTable ( this, ScResId( BTN_TABLE ) ), + aBtnPage ( this, ScResId( BTN_PAGE ) ), + aBtnLastPage ( this, ScResId( BTN_PAGES ) ), + aBtnDate ( this, ScResId( BTN_DATE ) ), + aBtnTime ( this, ScResId( BTN_TIME ) ), + aFlInfo ( this, ScResId( FL_INFO ) ), + aFtInfo ( this, ScResId( FT_INFO ) ), + aPopUpFile ( ScResId( RID_POPUP_FCOMMAND) ), + nWhich ( nWhichId ) { - //! use default style from current document? - //! if font color is used, header/footer background color must be set + //! use default style from current document? + //! if font color is used, header/footer background color must be set - ScPatternAttr aPatAttr( rCoreAttrs.GetPool() ); + ScPatternAttr aPatAttr( rCoreAttrs.GetPool() ); aBtnFile.SetPopupMenu(&aPopUpFile); maLbDefined.SetSelectHdl( LINK( this, ScHFEditPage, ListHdl_Impl ) ); aBtnFile.SetMenuHdl( LINK( this, ScHFEditPage, MenuHdl ) ); - aBtnText .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); - aBtnPage .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); + aBtnText .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); + aBtnPage .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); aBtnLastPage.SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); - aBtnDate .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); - aBtnTime .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); - aBtnFile .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); - aBtnTable .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); + aBtnDate .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); + aBtnTime .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); + aBtnFile .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); + aBtnTable .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) ); aBtnText .SetModeImage( Image( ScResId( IMG_TEXT_H ) ), BMP_COLOR_HIGHCONTRAST ); aBtnFile .SetModeImage( Image( ScResId( IMG_FILE_H ) ), BMP_COLOR_HIGHCONTRAST ); @@ -165,9 +165,9 @@ ScHFEditPage::ScHFEditPage( Window* pParent, aFtLeft.SetPosPixel(pt2); aFtRight.SetPosPixel(pt1); } - aWndLeft. SetFont( aPatAttr ); + aWndLeft. SetFont( aPatAttr ); aWndCenter. SetFont( aPatAttr ); - aWndRight. SetFont( aPatAttr ); + aWndRight. SetFont( aPatAttr ); FillCmdArr(); @@ -218,10 +218,10 @@ void __EXPORT ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) { - ScPageHFItem aItem( nWhich ); - EditTextObject* pLeft = aWndLeft .CreateTextObject(); + ScPageHFItem aItem( nWhich ); + EditTextObject* pLeft = aWndLeft .CreateTextObject(); EditTextObject* pCenter = aWndCenter.CreateTextObject(); - EditTextObject* pRight = aWndRight .CreateTextObject(); + EditTextObject* pRight = aWndRight .CreateTextObject(); aItem.SetLeftArea ( *pLeft ); aItem.SetCenterArea( *pCenter ); @@ -238,9 +238,9 @@ BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) // ----------------------------------------------------------------------- #define SET_CMD(i,id) \ - aCmd = aDel; \ - aCmd += ScGlobal::GetRscString( id ); \ - aCmd += aDel; \ + aCmd = aDel; \ + aCmd += ScGlobal::GetRscString( id ); \ + aCmd += aDel; \ aCmdArr[i] = aCmd; // ----------------------------------------------------------------------- diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 96150acf4960..f673a7a3a344 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.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 @@ -63,19 +63,19 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rSet, USHORT nSetId ) - : SvxHFPage ( pParent, nResId, rSet, nSetId ), - aBtnEdit ( this, ScResId( RID_SCBTN_HFEDIT ) ), - aDataSet ( *rSet.GetPool(), + : SvxHFPage ( pParent, nResId, rSet, nSetId ), + aBtnEdit ( this, ScResId( RID_SCBTN_HFEDIT ) ), + aDataSet ( *rSet.GetPool(), ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERRIGHT, ATTR_PAGE, ATTR_PAGE, 0 ), - nPageUsage ( (USHORT)SVX_PAGE_ALL ), - pStyleDlg ( NULL ) + nPageUsage ( (USHORT)SVX_PAGE_ALL ), + pStyleDlg ( NULL ) { SetExchangeSupport(); - SfxViewShell* pSh = SfxViewShell::Current(); + SfxViewShell* pSh = SfxViewShell::Current(); ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,pSh); - Point aPos( aBackgroundBtn.GetPosPixel() ); + Point aPos( aBackgroundBtn.GetPosPixel() ); // aBackgroundBtn position not changed anymore @@ -89,13 +89,13 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId, if ( pViewSh ) { ScViewData* pViewData = pViewSh->GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); + ScDocument* pDoc = pViewData->GetDocument(); aStrPageStyle = pDoc->GetPageStyle( pViewData->GetTabNo() ); } - aBtnEdit.SetClickHdl ( LINK( this, ScHFPage, BtnHdl ) ); - aTurnOnBox.SetClickHdl ( LINK( this, ScHFPage, TurnOnHdl ) ); + aBtnEdit.SetClickHdl ( LINK( this, ScHFPage, BtnHdl ) ); + aTurnOnBox.SetClickHdl ( LINK( this, ScHFPage, TurnOnHdl ) ); if ( nId == SID_ATTR_PAGE_HEADERSET ) aBtnEdit.SetHelpId( HID_SC_HEADER_EDIT ); @@ -141,8 +141,8 @@ BOOL __EXPORT ScHFPage::FillItemSet( SfxItemSet& rOutSet ) void __EXPORT ScHFPage::ActivatePage( const SfxItemSet& rSet ) { - USHORT nPageWhich = GetWhich( SID_ATTR_PAGE ); - const SvxPageItem& rPageItem = (const SvxPageItem&) + USHORT nPageWhich = GetWhich( SID_ATTR_PAGE ); + const SvxPageItem& rPageItem = (const SvxPageItem&) rSet.Get(nPageWhich); nPageUsage = rPageItem.GetPageUsage(); @@ -197,10 +197,10 @@ IMPL_LINK( ScHFPage, TurnOnHdl, CheckBox*, EMPTYARG ) IMPL_LINK( ScHFPage, BtnHdl, PushButton*, EMPTYARG ) { - // Wenn der Bearbeiten-Dialog direkt aus dem Click-Handler des Buttons - // aufgerufen wird, funktioniert im Bearbeiten-Dialog unter OS/2 das - // GrabFocus nicht (Bug #41805#). - // Mit dem neuen StarView sollte dieser Workaround wieder raus koennen! + // Wenn der Bearbeiten-Dialog direkt aus dem Click-Handler des Buttons + // aufgerufen wird, funktioniert im Bearbeiten-Dialog unter OS/2 das + // GrabFocus nicht (Bug #41805#). + // Mit dem neuen StarView sollte dieser Workaround wieder raus koennen! Application::PostUserEvent( LINK( this, ScHFPage, HFEditHdl ) ); return 0; @@ -208,7 +208,7 @@ IMPL_LINK( ScHFPage, BtnHdl, PushButton*, EMPTYARG ) IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG ) { - SfxViewShell* pViewSh = SfxViewShell::Current(); + SfxViewShell* pViewSh = SfxViewShell::Current(); if ( !pViewSh ) { @@ -236,7 +236,7 @@ IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG ) } else { - String aText; + String aText; SfxSingleTabDialog* pDlg = new SfxSingleTabDialog( this, aDataSet, 42 ); BOOL bRightPage = aCntSharedBox.IsChecked() || ( SVX_PAGE_LEFT != SvxPageUsage(nPageUsage) ); diff --git a/sc/source/ui/pagedlg/tphf.src b/sc/source/ui/pagedlg/tphf.src index b2f59e06da72..7970a0367019 100644 --- a/sc/source/ui/pagedlg/tphf.src +++ b/sc/source/ui/pagedlg/tphf.src @@ -1,7 +1,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/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 52d8d7cad040..e6ec74161ab1 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.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 @@ -91,7 +91,7 @@ void lcl_GetFieldData( ScHeaderFieldData& rData ) //======================================================================== ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLocation eLoc ) - : Control( pParent, rResId ), + : Control( pParent, rResId ), eLocation(eLoc), pAcc(NULL) { @@ -114,10 +114,10 @@ ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLo ScHeaderFieldData aData; lcl_GetFieldData( aData ); - // Feldbefehle: + // Feldbefehle: pEdEngine->SetData( aData ); pEdEngine->SetControlWord( pEdEngine->GetControlWord() | EE_CNTRL_MARKFIELDS ); - mbRTL = ScGlobal::IsSystemRTL(); + mbRTL = ScGlobal::IsSystemRTL(); if (mbRTL) pEdEngine->SetDefaultHorizontalTextDirection(EE_HTEXTDIR_R2L); @@ -155,8 +155,8 @@ void ScEditWindow::SetNumType(SvxNumType eNumType) EditTextObject* __EXPORT ScEditWindow::CreateTextObject() { - // wegen #38841# die Absatzattribute zuruecksetzen - // (GetAttribs beim Format-Dialog-Aufruf gibt immer gesetzte Items zurueck) + // wegen #38841# die Absatzattribute zuruecksetzen + // (GetAttribs beim Format-Dialog-Aufruf gibt immer gesetzte Items zurueck) const SfxItemSet& rEmpty = pEdEngine->GetEmptyItemSet(); USHORT nParCnt = pEdEngine->GetParagraphCount(); @@ -170,15 +170,15 @@ EditTextObject* __EXPORT ScEditWindow::CreateTextObject() void ScEditWindow::SetFont( const ScPatternAttr& rPattern ) { - SfxItemSet* pSet = new SfxItemSet( pEdEngine->GetEmptyItemSet() ); + SfxItemSet* pSet = new SfxItemSet( pEdEngine->GetEmptyItemSet() ); rPattern.FillEditItemSet( pSet ); - // 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: pSet->Put( rPattern.GetItem(ATTR_FONT_HEIGHT), EE_CHAR_FONTHEIGHT ); pSet->Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CJK ); pSet->Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CTL ); if (mbRTL) - pSet->Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); + pSet->Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); pEdEngine->SetDefaults( pSet ); } @@ -200,11 +200,11 @@ void ScEditWindow::InsertField( const SvxFieldItem& rFld ) void ScEditWindow::SetCharAttriutes() { - SfxObjectShell* pDocSh = SfxObjectShell::Current(); + SfxObjectShell* pDocSh = SfxObjectShell::Current(); - SfxViewShell* pViewSh = SfxViewShell::Current(); + SfxViewShell* pViewSh = SfxViewShell::Current(); - ScTabViewShell* pTabViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); + ScTabViewShell* pTabViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); DBG_ASSERT( pDocSh, "Current DocShell not found" ); @@ -246,7 +246,7 @@ void __EXPORT ScEditWindow::Paint( const Rectangle& rRec ) SetBackground( aBgColor ); - Control::Paint( rRec ); + Control::Paint( rRec ); pEdView->Paint( rRec ); } @@ -364,27 +364,27 @@ class ScExtIButton : public ImageButton { private: - Timer aTimer; - ScPopupMenu* pPopupMenu; + Timer aTimer; + ScPopupMenu* pPopupMenu; DECL_LINK( TimerHdl, Timer*); - void DrawArrow(); + void DrawArrow(); protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt); - virtual void StartPopup(); + virtual void StartPopup(); public: ScExtIButton(Window* pParent, const ResId& rResId ); - void SetPopupMenu(ScPopupMenu* pPopUp); + void SetPopupMenu(ScPopupMenu* pPopUp); - USHORT GetSelected(); + USHORT GetSelected(); void SetMenuHdl( const Link& rLink ) { aFxLink = rLink; } const Link& GetMenuHdl() const { return aFxLink; } @@ -392,14 +392,14 @@ public: } */ ScExtIButton::ScExtIButton(Window* pParent, const ResId& rResId ) -: ImageButton(pParent,rResId), +: ImageButton(pParent,rResId), pPopupMenu(NULL) { nSelected=0; aTimer.SetTimeout(600); SetDropDown( TRUE); -// DrawArrow(); +// DrawArrow(); } void ScExtIButton::SetPopupMenu(ScPopupMenu* pPopUp) @@ -478,8 +478,8 @@ IMPL_LINK( ScExtIButton, TimerHdl, Timer*, EMPTYARG ) static void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, BOOL bBlack, BOOL bLeft = FALSE, BOOL bTop = FALSE ) { - Color aOldFillColor = pBox->GetFillColor(); - WindowAlign eAlign = pBox->meAlign; + Color aOldFillColor = pBox->GetFillColor(); + WindowAlign eAlign = pBox->meAlign; if ( bLeft ) eAlign = WINDOWALIGN_RIGHT; else if ( bTop ) diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index a85ef657a3e1..2590601443cd 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.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,14 +77,14 @@ static USHORT pPageTableRanges[] = 0 }; -BOOL lcl_PutVObjModeItem( USHORT nWhich, - SfxItemSet& rCoreSet, - const SfxItemSet& rOldSet, - const CheckBox& rBtn ); +BOOL lcl_PutVObjModeItem( USHORT nWhich, + SfxItemSet& rCoreSet, + const SfxItemSet& rOldSet, + const CheckBox& rBtn ); -BOOL lcl_PutScaleItem( USHORT nWhich, - SfxItemSet& rCoreSet, - const SfxItemSet& rOldSet, +BOOL lcl_PutScaleItem( USHORT nWhich, + SfxItemSet& rCoreSet, + const SfxItemSet& rOldSet, const ListBox& rListBox, USHORT nLBEntry, const SpinField& rEd, @@ -98,22 +98,22 @@ BOOL lcl_PutScaleItem2( USHORT nWhich, const NumericField& rEd1, const NumericField& rEd2 ); -BOOL lcl_PutBoolItem( USHORT nWhich, - SfxItemSet& rCoreSet, - const SfxItemSet& rOldSet, - BOOL bIsChecked, - BOOL bSavedValue ); +BOOL lcl_PutBoolItem( USHORT nWhich, + SfxItemSet& rCoreSet, + const SfxItemSet& rOldSet, + BOOL bIsChecked, + BOOL bSavedValue ); //------------------------------------------------------------------------ -#define PAGENO_HDL LINK(this,ScTablePage,PageNoHdl) -#define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl) -#define SCALE_HDL LINK(this,ScTablePage,ScaleHdl) +#define PAGENO_HDL LINK(this,ScTablePage,PageNoHdl) +#define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl) +#define SCALE_HDL LINK(this,ScTablePage,ScaleHdl) #define WAS_DEFAULT(w,s) (SFX_ITEM_DEFAULT==(s).GetItemState((w),TRUE)) -#define GET_BOOL(sid,set) ((const SfxBoolItem&)((set).Get(GetWhich((sid))))).GetValue() -#define GET_USHORT(sid,set) (USHORT)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue() -#define GET_SHOW(sid,set) ( ScVObjMode( ((const ScViewObjectModeItem&)((set).Get(GetWhich((sid))))).GetValue() ) \ +#define GET_BOOL(sid,set) ((const SfxBoolItem&)((set).Get(GetWhich((sid))))).GetValue() +#define GET_USHORT(sid,set) (USHORT)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue() +#define GET_SHOW(sid,set) ( ScVObjMode( ((const ScViewObjectModeItem&)((set).Get(GetWhich((sid))))).GetValue() ) \ == VOBJ_MODE_SHOW ) //======================================================================== @@ -123,29 +123,29 @@ ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, ScResId( RID_SCPAGE_TABLE ), rCoreAttrs ), aFlPageDir ( this, ScResId( FL_PAGEDIR ) ), - aBtnTopDown ( this, ScResId( BTN_TOPDOWN ) ), - aBtnLeftRight ( this, ScResId( BTN_LEFTRIGHT ) ), - aBmpPageDir ( this, ScResId( BMP_PAGEDIR ) ), - aImgLeftRight ( ScResId( IMG_LEFTRIGHT ) ), - aImgTopDown ( ScResId( IMG_TOPDOWN ) ), + aBtnTopDown ( this, ScResId( BTN_TOPDOWN ) ), + aBtnLeftRight ( this, ScResId( BTN_LEFTRIGHT ) ), + aBmpPageDir ( this, ScResId( BMP_PAGEDIR ) ), + aImgLeftRight ( ScResId( IMG_LEFTRIGHT ) ), + aImgTopDown ( ScResId( IMG_TOPDOWN ) ), aImgLeftRightHC ( ScResId( IMG_LEFTRIGHT_H ) ), aImgTopDownHC ( ScResId( IMG_TOPDOWN_H ) ), - aBtnPageNo ( this, ScResId( BTN_PAGENO ) ), - aEdPageNo ( this, ScResId( ED_PAGENO ) ), + aBtnPageNo ( this, ScResId( BTN_PAGENO ) ), + aEdPageNo ( this, ScResId( ED_PAGENO ) ), aFlPrint ( this, ScResId( FL_PRINT ) ), - aBtnHeaders ( this, ScResId( BTN_HEADER ) ), - aBtnGrid ( this, ScResId( BTN_GRID ) ), - aBtnNotes ( this, ScResId( BTN_NOTES ) ), - aBtnObjects ( this, ScResId( BTN_OBJECTS ) ), - aBtnCharts ( this, ScResId( BTN_CHARTS ) ), - aBtnDrawings ( this, ScResId( BTN_DRAWINGS ) ), - aBtnFormulas ( this, ScResId( BTN_FORMULAS ) ), - aBtnNullVals ( this, ScResId( BTN_NULLVALS ) ), + aBtnHeaders ( this, ScResId( BTN_HEADER ) ), + aBtnGrid ( this, ScResId( BTN_GRID ) ), + aBtnNotes ( this, ScResId( BTN_NOTES ) ), + aBtnObjects ( this, ScResId( BTN_OBJECTS ) ), + aBtnCharts ( this, ScResId( BTN_CHARTS ) ), + aBtnDrawings ( this, ScResId( BTN_DRAWINGS ) ), + aBtnFormulas ( this, ScResId( BTN_FORMULAS ) ), + aBtnNullVals ( this, ScResId( BTN_NULLVALS ) ), aFlScale ( this, ScResId( FL_SCALE ) ), aFtScaleMode ( this, ScResId( FT_SCALEMODE ) ), aLbScaleMode ( this, ScResId( LB_SCALEMODE ) ), aFtScaleAll ( this, ScResId( FT_SCALEFACTOR ) ), - aEdScaleAll ( this, ScResId( ED_SCALEALL ) ), + aEdScaleAll ( this, ScResId( ED_SCALEALL ) ), aFtScalePageWidth ( this, ScResId( FT_SCALEPAGEWIDTH ) ), aEdScalePageWidth ( this, ScResId( ED_SCALEPAGEWIDTH ) ), aFtScalePageHeight ( this, ScResId( FT_SCALEPAGEHEIGHT ) ), @@ -200,19 +200,19 @@ SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet& rCoreSet ) void ScTablePage::Reset( const SfxItemSet& rCoreSet ) { - BOOL bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet ); - USHORT nWhich = 0; + BOOL bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet ); + USHORT nWhich = 0; //----------- // BOOL-Flags //----------- - aBtnNotes .Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,rCoreSet) ); - aBtnGrid .Check( GET_BOOL(SID_SCATTR_PAGE_GRID,rCoreSet) ); - aBtnHeaders .Check( GET_BOOL(SID_SCATTR_PAGE_HEADERS,rCoreSet) ); - aBtnFormulas .Check( GET_BOOL(SID_SCATTR_PAGE_FORMULAS,rCoreSet) ); - aBtnNullVals .Check( GET_BOOL(SID_SCATTR_PAGE_NULLVALS,rCoreSet) ); - aBtnTopDown .Check( bTopDown ); - aBtnLeftRight .Check( !bTopDown ); + aBtnNotes .Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,rCoreSet) ); + aBtnGrid .Check( GET_BOOL(SID_SCATTR_PAGE_GRID,rCoreSet) ); + aBtnHeaders .Check( GET_BOOL(SID_SCATTR_PAGE_HEADERS,rCoreSet) ); + aBtnFormulas .Check( GET_BOOL(SID_SCATTR_PAGE_FORMULAS,rCoreSet) ); + aBtnNullVals .Check( GET_BOOL(SID_SCATTR_PAGE_NULLVALS,rCoreSet) ); + aBtnTopDown .Check( bTopDown ); + aBtnLeftRight .Check( !bTopDown ); //------------------ // Erste Druckseite: @@ -225,9 +225,9 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) //------------------- // Objektdarstellung: //------------------- - aBtnCharts .Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, rCoreSet ) ); - aBtnObjects .Check( GET_SHOW( SID_SCATTR_PAGE_OBJECTS, rCoreSet ) ); - aBtnDrawings .Check( GET_SHOW( SID_SCATTR_PAGE_DRAWINGS, rCoreSet ) ); + aBtnCharts .Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, rCoreSet ) ); + aBtnObjects .Check( GET_SHOW( SID_SCATTR_PAGE_OBJECTS, rCoreSet ) ); + aBtnDrawings .Check( GET_SHOW( SID_SCATTR_PAGE_DRAWINGS, rCoreSet ) ); //------------ // Skalierung: @@ -279,32 +279,32 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) ScaleHdl( NULL ); // merken fuer FillItemSet - aBtnFormulas .SaveValue(); - aBtnNullVals .SaveValue(); - aBtnNotes .SaveValue(); - aBtnGrid .SaveValue(); - aBtnHeaders .SaveValue(); - aBtnTopDown .SaveValue(); - aBtnLeftRight .SaveValue(); + aBtnFormulas .SaveValue(); + aBtnNullVals .SaveValue(); + aBtnNotes .SaveValue(); + aBtnGrid .SaveValue(); + aBtnHeaders .SaveValue(); + aBtnTopDown .SaveValue(); + aBtnLeftRight .SaveValue(); aLbScaleMode .SaveValue(); - aBtnCharts .SaveValue(); - aBtnObjects .SaveValue(); - aBtnDrawings .SaveValue(); - aBtnPageNo .SaveValue(); - aEdPageNo .SaveValue(); - aEdScaleAll .SaveValue(); + aBtnCharts .SaveValue(); + aBtnObjects .SaveValue(); + aBtnDrawings .SaveValue(); + aBtnPageNo .SaveValue(); + aEdPageNo .SaveValue(); + aEdScaleAll .SaveValue(); aEdScalePageWidth.SaveValue(); aEdScalePageHeight.SaveValue(); - aEdScalePageNum .SaveValue(); + aEdScalePageNum .SaveValue(); } // ----------------------------------------------------------------------- BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) { - const SfxItemSet& rOldSet = GetItemSet(); - USHORT nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO); - BOOL bDataChanged = FALSE; + const SfxItemSet& rOldSet = GetItemSet(); + USHORT nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO); + BOOL bDataChanged = FALSE; //----------- // BOOL-Flags @@ -346,7 +346,7 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) BOOL bUseValue = aBtnPageNo.IsChecked(); if ( WAS_DEFAULT(nWhichPageNo,rOldSet) - && ( (!bUseValue && bUseValue == aBtnPageNo.GetSavedValue()) + && ( (!bUseValue && bUseValue == aBtnPageNo.GetSavedValue()) || ( bUseValue && bUseValue == aBtnPageNo.GetSavedValue() && aEdPageNo.GetText() == aEdPageNo.GetSavedValue() ) ) ) { @@ -476,11 +476,11 @@ IMPL_LINK( ScTablePage, ScaleHdl, ListBox*, EMPTYARG ) // Hilfsfunktionen fuer FillItemSet: //======================================================================== -BOOL lcl_PutBoolItem( USHORT nWhich, - SfxItemSet& rCoreSet, - const SfxItemSet& rOldSet, - BOOL bIsChecked, - BOOL bSavedValue ) +BOOL lcl_PutBoolItem( USHORT nWhich, + SfxItemSet& rCoreSet, + const SfxItemSet& rOldSet, + BOOL bIsChecked, + BOOL bSavedValue ) { BOOL bDataChanged = ( bSavedValue == bIsChecked && WAS_DEFAULT(nWhich,rOldSet) ); @@ -495,10 +495,10 @@ BOOL lcl_PutBoolItem( USHORT nWhich, //------------------------------------------------------------------------ -BOOL lcl_PutVObjModeItem( USHORT nWhich, - SfxItemSet& rCoreSet, - const SfxItemSet& rOldSet, - const CheckBox& rBtn ) +BOOL lcl_PutVObjModeItem( USHORT nWhich, + SfxItemSet& rCoreSet, + const SfxItemSet& rOldSet, + const CheckBox& rBtn ) { BOOL bIsChecked = rBtn.IsChecked(); BOOL bDataChanged = ( rBtn.GetSavedValue() == bIsChecked @@ -516,9 +516,9 @@ BOOL lcl_PutVObjModeItem( USHORT nWhich, //------------------------------------------------------------------------ -BOOL lcl_PutScaleItem( USHORT nWhich, - SfxItemSet& rCoreSet, - const SfxItemSet& rOldSet, +BOOL lcl_PutScaleItem( USHORT nWhich, + SfxItemSet& rCoreSet, + const SfxItemSet& rOldSet, const ListBox& rListBox, USHORT nLBEntry, const SpinField& rEd, diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src index ae130f7e8a96..14a53e12f123 100644 --- a/sc/source/ui/src/attrdlg.src +++ b/sc/source/ui/src/attrdlg.src @@ -1,7 +1,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/src/autofmt.src b/sc/source/ui/src/autofmt.src index cb56f6ac85a4..7f0c156a1f9a 100644 --- a/sc/source/ui/src/autofmt.src +++ b/sc/source/ui/src/autofmt.src @@ -1,7 +1,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/src/condfrmt.src b/sc/source/ui/src/condfrmt.src index 3018cc867e0d..18b08117cfe6 100644 --- a/sc/source/ui/src/condfrmt.src +++ b/sc/source/ui/src/condfrmt.src @@ -1,7 +1,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/src/crnrdlg.src b/sc/source/ui/src/crnrdlg.src index b16a3506bf7b..f4811bd63cb8 100644 --- a/sc/source/ui/src/crnrdlg.src +++ b/sc/source/ui/src/crnrdlg.src @@ -1,7 +1,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 @@ -33,7 +33,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES Size = MAP_APPFONT ( 256 , 181 ) ; HelpId = HID_COLROWNAMERANGES ; Moveable = TRUE ; - // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! + // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! FixedLine FL_ASSIGN { Pos = MAP_APPFONT ( 6 , 3 ) ; diff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.src index 50152d95d9d5..c5ff35bc42d6 100644 --- a/sc/source/ui/src/dbnamdlg.src +++ b/sc/source/ui/src/dbnamdlg.src @@ -1,7 +1,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 @@ -34,7 +34,7 @@ ModelessDialog RID_SCDLG_DBNAMES Size = MAP_APPFONT ( 222 , 142 ) ; Text [ en-US ] = "Define Database Range" ; Moveable = TRUE ; - // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! + // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! FixedLine FL_NAME { Pos = MAP_APPFONT ( 6 , 3 ) ; diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src index 52ce38db1516..a1338638682a 100644 --- a/sc/source/ui/src/filter.src +++ b/sc/source/ui/src/filter.src @@ -1,7 +1,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/src/hdrcont.src b/sc/source/ui/src/hdrcont.src index e4a82d38ec98..da3f5b6e1412 100644 --- a/sc/source/ui/src/hdrcont.src +++ b/sc/source/ui/src/hdrcont.src @@ -1,7 +1,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/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src index 6d4761c8589c..8f2dc9c2f0e3 100644 --- a/sc/source/ui/src/miscdlgs.src +++ b/sc/source/ui/src/miscdlgs.src @@ -1,7 +1,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 @@ -662,7 +662,7 @@ ModalDialog RID_SCDLG_MTRINPUT }; MetricField ED_VALUE { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen HelpId = HID_SC_MTRIN_VAL ; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 6 ) ; @@ -673,7 +673,7 @@ ModalDialog RID_SCDLG_MTRINPUT }; CheckBox BTN_DEFVAL { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; Size = MAP_APPFONT ( 58 , 10 ) ; @@ -728,7 +728,7 @@ ModalDialog RID_SCDLG_COL_MAN }; CheckBox BTN_DEFVAL { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; @@ -773,7 +773,7 @@ ModalDialog RID_SCDLG_COL_OPT }; MetricField ED_VALUE { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen Border = TRUE ; Pos = MAP_APPFONT ( 70 , 6 ) ; Size = MAP_APPFONT ( 70 , 12 ) ; @@ -783,7 +783,7 @@ ModalDialog RID_SCDLG_COL_OPT }; CheckBox BTN_DEFVAL { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; @@ -828,7 +828,7 @@ ModalDialog RID_SCDLG_ROW_MAN }; MetricField ED_VALUE { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen Border = TRUE ; Pos = MAP_APPFONT ( 70 , 6 ) ; Size = MAP_APPFONT ( 70 , 12 ) ; @@ -838,7 +838,7 @@ ModalDialog RID_SCDLG_ROW_MAN }; CheckBox BTN_DEFVAL { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; @@ -892,7 +892,7 @@ ModalDialog RID_SCDLG_ROW_OPT }; CheckBox BTN_DEFVAL { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; @@ -901,8 +901,8 @@ ModalDialog RID_SCDLG_ROW_OPT }; - // RID_SCDLG_SELENTRY als Basis fuer RID_SCDLG_SELECTDB und RID_SCDLG_SHOW_TAB - // gibt es nicht mehr, weil die beiden jetzt unterschiedlich sind + // RID_SCDLG_SELENTRY als Basis fuer RID_SCDLG_SELECTDB und RID_SCDLG_SHOW_TAB + // gibt es nicht mehr, weil die beiden jetzt unterschiedlich sind ModalDialog RID_SCDLG_SELECTDB { @@ -934,7 +934,7 @@ ModalDialog RID_SCDLG_SELECTDB }; ListBox LB_ENTRYLIST { - // HelpID aus Zeiten, als noch abgeleitet wurde + // HelpID aus Zeiten, als noch abgeleitet wurde HelpId = HID_SC_SELENTRY_LIST ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; @@ -1216,7 +1216,7 @@ ModalDialog RID_SCDLG_GROUP }; RadioButton BTN_GROUP_ROWS { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen HelpId = HID_SC_GROUP_ROWS ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 71 , 10 ) ; @@ -1225,7 +1225,7 @@ ModalDialog RID_SCDLG_GROUP }; RadioButton BTN_GROUP_COLS { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen + // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen HelpId = HID_SC_GROUP_COLS ; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 71 , 10 ) ; @@ -1249,11 +1249,11 @@ ModalDialog RID_SCDLG_GROUP Text [ en-US ] = "Group" ; }; - // Ableitungen + // Ableitungen ModalDialog RID_SCDLG_GRP_MAKE < RID_SCDLG_GROUP { HelpId = SID_OUTLINE_MAKE ; }; ModalDialog RID_SCDLG_GRP_KILL < RID_SCDLG_GROUP { HelpId = SID_OUTLINE_REMOVE ; }; - // RID_SCDLG_COLORROW wird nur in der Optionen-Sortierlisten-Seite benutzt + // RID_SCDLG_COLORROW wird nur in der Optionen-Sortierlisten-Seite benutzt ModalDialog RID_SCDLG_COLORROW { diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src index 38e1271b2959..51ad9f1d4f78 100644 --- a/sc/source/ui/src/namedlg.src +++ b/sc/source/ui/src/namedlg.src @@ -1,7 +1,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 @@ -35,7 +35,7 @@ ModelessDialog RID_SCDLG_NAMES Size = MAP_APPFONT ( 222 , 142 ) ; Text [ en-US ] = "Define Names" ; Moveable = TRUE ; - // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! + // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! OKButton BTN_OK { Pos = MAP_APPFONT ( 166 , 6 ) ; diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src index a8c2daf4892a..34813be0f786 100644 --- a/sc/source/ui/src/opredlin.src +++ b/sc/source/ui/src/opredlin.src @@ -1,7 +1,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/src/optdlg.src b/sc/source/ui/src/optdlg.src index 39fae40428e3..3f13db0bd8c4 100644 --- a/sc/source/ui/src/optdlg.src +++ b/sc/source/ui/src/optdlg.src @@ -1,7 +1,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 @@ -778,7 +778,7 @@ TabPage RID_SCPAGE_LAYOUT Size = MAP_APPFONT ( 60 , 60 ) ; Border = TRUE ; DropDown = TRUE ; - // Reihenfolge der Strings wie enum ScDirection + // Reihenfolge der Strings wie enum ScDirection StringList [ en-US ] = { < "Down" ; Default ; > ; diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src index 2fc5cf3a3c54..28ca5ae9afec 100644 --- a/sc/source/ui/src/optsolver.src +++ b/sc/source/ui/src/optsolver.src @@ -1,7 +1,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/src/popup.src b/sc/source/ui/src/popup.src index 9753aa1590e3..a4f96b4e8969 100644 --- a/sc/source/ui/src/popup.src +++ b/sc/source/ui/src/popup.src @@ -1,7 +1,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/src/pseudo.src b/sc/source/ui/src/pseudo.src index e3d27edf0ecb..589520ee1eb5 100644 --- a/sc/source/ui/src/pseudo.src +++ b/sc/source/ui/src/pseudo.src @@ -1,7 +1,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/src/sc.src b/sc/source/ui/src/sc.src index dae422e15cd0..4fa37b2dab91 100644 --- a/sc/source/ui/src/sc.src +++ b/sc/source/ui/src/sc.src @@ -1,7 +1,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/src/scerrors.src b/sc/source/ui/src/scerrors.src index bdb76b2b710c..e28dde2f9b8c 100644 --- a/sc/source/ui/src/scerrors.src +++ b/sc/source/ui/src/scerrors.src @@ -1,7 +1,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/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 2f5a2d8c88fb..610c1f4b782b 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -1,7 +1,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 @@ -72,7 +72,7 @@ */ // Hack: -#define U2S(x) ((x)-HID_START) +#define U2S(x) ((x)-HID_START) // Macro U2S: unsigned to signed // is needed because the resource compiler only knows signed short int in // ExtraData, but the HID_XXX are unsigned and exceed 32k. Code reading the @@ -95,7 +95,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBANZAHL ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -135,7 +135,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBANZAHL2 ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -175,7 +175,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBMITTELWERT ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -215,7 +215,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBAUSZUG ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -255,7 +255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBMAX ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -295,7 +295,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBMIN ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -335,7 +335,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBPRODUKT ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -375,7 +375,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBSTDABW ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -415,7 +415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBSTDABWN ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -455,7 +455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBSUMME ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -495,7 +495,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBVARIANZ ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -535,7 +535,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATABASE; U2S( HID_FUNC_DBVARIANZEN ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -575,7 +575,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_DATUM ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -615,7 +615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_DATWERT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -639,7 +639,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_TAG ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -663,7 +663,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_TAGE360 ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -703,7 +703,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_STUNDE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -727,7 +727,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_MINUTE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -751,7 +751,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_MONAT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -791,7 +791,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_SEKUNDE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -815,7 +815,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_ZEIT ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -855,7 +855,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_ZEITWERT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -895,7 +895,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_WOCHENTAG ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -927,7 +927,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_JAHR ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -951,7 +951,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_TAGE ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -983,7 +983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_KALENDERWOCHE ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -1015,7 +1015,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_DATETIME; U2S( HID_FUNC_OSTERSONNTAG ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -1039,7 +1039,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_BW ); - 5; 0; 0; 0; 1; 1; + 5; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -1095,7 +1095,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_ZW ); - 5; 0; 0; 0; 1; 1; + 5; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -1151,7 +1151,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_ZZR ); - 5; 0; 0; 0; 1; 1; + 5; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -1207,7 +1207,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_RMZ ); - 5; 0; 0; 0; 1; 1; + 5; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -1263,7 +1263,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_ZINS ); - 6; 0; 0; 0; 1; 1; 1; + 6; 0; 0; 0; 1; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -1327,7 +1327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_ZINSZ ); - 6; 0; 0; 0; 0; 1; 1; + 6; 0; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -1391,7 +1391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_KAPZ ); - 6; 0; 0; 0; 0; 1; 1; + 6; 0; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -1455,7 +1455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_KUMKAPITAL ); - 6; 0; 0; 0; 0; 0; 0; + 6; 0; 0; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -1519,7 +1519,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_KUMZINSZ ); - 6; 0; 0; 0; 0; 0; 0; + 6; 0; 0; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -1583,7 +1583,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_DIA ); - 4; 0; 0; 0; 0; + 4; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -1631,7 +1631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_LIA ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -1671,7 +1671,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_GDA ); - 5; 0; 0; 0; 0; 1; + 5; 0; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -1727,7 +1727,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_GDA2 ); - 5; 0; 0; 0; 0; 1; + 5; 0; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -1783,7 +1783,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_VDB ); - 7; 0; 0; 0; 0; 0; 1; 1; + 7; 0; 0; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -1855,7 +1855,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_EFFEKTIV ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -1887,7 +1887,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_NOMINAL ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -1919,7 +1919,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_NBW ); - VAR_ARGS+1; 0; 0; + VAR_ARGS+1; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -1951,7 +1951,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_IKV ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -1983,7 +1983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_QIKV ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -2023,7 +2023,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_ISPMT ); - 4; 0; 0; 0; 0; + 4; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -2071,7 +2071,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_LAUFZEIT ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -2111,7 +2111,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_FINANZ; U2S( HID_FUNC_ZGZ ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -2151,7 +2151,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTBEZUG ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2175,7 +2175,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTFEHL ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2199,7 +2199,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTFEHLER ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2223,7 +2223,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTLEER ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2247,7 +2247,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTLOG ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2271,7 +2271,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTNV ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2295,7 +2295,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTKTEXT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2319,7 +2319,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTTEXT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2343,7 +2343,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTZAHL ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2367,7 +2367,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ISTFORMEL ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2391,7 +2391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_FORMEL ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2415,7 +2415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_N ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2455,7 +2455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_TYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2479,7 +2479,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_ZELLE ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -2543,7 +2543,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_LOGIC; U2S( HID_FUNC_NICHT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2583,7 +2583,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_LOGIC; U2S( HID_FUNC_WENN ); - 3; 0; 1; 1; + 3; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -2623,7 +2623,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_LOGIC; U2S( HID_FUNC_ODER ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -2647,7 +2647,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_LOGIC; U2S( HID_FUNC_UND ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -2671,7 +2671,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ABS ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2695,7 +2695,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_POTENZ ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -2727,7 +2727,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ANZAHLLEEREZELLEN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2767,7 +2767,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_SUMME ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -2791,7 +2791,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_QUADRATESUMME ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -2815,7 +2815,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_PRODUKT ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -2839,7 +2839,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_SUMMEWENN ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -2879,7 +2879,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ZAEHLENWENN ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -2911,7 +2911,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_WURZEL ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2951,7 +2951,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ISTGERADE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2975,7 +2975,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ISTUNGERADE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -2999,7 +2999,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_KOMBINATIONEN ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -3031,7 +3031,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_KOMBINATIONEN2 ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -3063,7 +3063,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ARCCOS ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3087,7 +3087,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ARCSIN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3111,7 +3111,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ARCOSHYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3135,7 +3135,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ARSINHYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3159,7 +3159,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ARCCOT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3183,7 +3183,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ARCTAN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3207,7 +3207,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ARCOTHYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3231,7 +3231,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ARTANHYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3255,7 +3255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_COS ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3279,7 +3279,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_SIN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3303,7 +3303,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_COT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3327,7 +3327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_TAN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3351,7 +3351,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_COSHYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3375,7 +3375,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_SINHYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3399,7 +3399,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_COTHYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3423,7 +3423,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_TANHYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3447,7 +3447,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ARCTAN2 ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -3479,7 +3479,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_DEG ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3503,7 +3503,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_RAD ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3527,7 +3527,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_EXP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3551,7 +3551,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_LOG ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -3583,7 +3583,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_LN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3607,7 +3607,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_LOG10 ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3631,7 +3631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_FAKULTAET ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3655,7 +3655,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_REST ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -3687,7 +3687,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_VORZEICHEN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3711,7 +3711,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_TEILERGEBNIS ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -3743,7 +3743,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_GANZZAHL ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3767,7 +3767,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_KUERZEN ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -3799,7 +3799,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_RUNDEN ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -3831,7 +3831,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_AUFRUNDEN ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -3863,7 +3863,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_ABRUNDEN ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -3895,7 +3895,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_GERADE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3919,7 +3919,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_UNGERADE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -3943,7 +3943,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_OBERGRENZE ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -3983,7 +3983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_UNTERGRENZE ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -4023,7 +4023,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_GGT ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4047,7 +4047,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_KGV ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4071,7 +4071,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_MTRANS ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -4095,7 +4095,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_MMULT ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -4127,7 +4127,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_MDET ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -4151,7 +4151,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_MINV ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -4175,7 +4175,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_EINHEITSMATRIX ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -4199,7 +4199,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_SUMMENPRODUKT ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4223,7 +4223,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_SUMMEX2MY2 ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -4255,7 +4255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_SUMMEX2PY2 ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -4287,7 +4287,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_SUMMEXMY2 ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -4323,7 +4323,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_HAEUFIGKEIT ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -4355,7 +4355,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_RGP ); - 4; 0; 1; 1; 1; + 4; 0; 1; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -4403,7 +4403,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_RKP ); - 4; 0; 1; 1; 1; + 4; 0; 1; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -4451,7 +4451,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_TREND ); - 4; 0; 1; 1; 1; + 4; 0; 1; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -4499,7 +4499,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_MATRIX; U2S( HID_FUNC_VARIATION ); - 4; 0; 1; 1; 1; + 4; 0; 1; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -4547,7 +4547,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_ANZAHL ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4571,7 +4571,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_ANZAHL2 ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4595,7 +4595,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_MAX ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4619,7 +4619,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_MAXA ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4643,7 +4643,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_MIN ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4667,7 +4667,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_MINA ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4691,7 +4691,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_VARIANZ ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4715,7 +4715,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_VARIANZA ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4739,7 +4739,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_VARIANZEN ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4763,7 +4763,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_VARIANZENA ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4787,7 +4787,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_STABW ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4811,7 +4811,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_STABWA ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4835,7 +4835,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_STABWN ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4859,7 +4859,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_STABWNA ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4883,7 +4883,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_MITTELWERT ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4907,7 +4907,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_MITTELWERTA ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4931,7 +4931,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_SUMQUADABW ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4955,7 +4955,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_MITTELABW ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -4979,7 +4979,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_SCHIEFE ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -5003,7 +5003,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_KURT ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -5027,7 +5027,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_GEOMITTEL ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -5051,7 +5051,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_HARMITTEL ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -5075,7 +5075,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_MODALWERT ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -5099,7 +5099,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_MEDIAN ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -5123,7 +5123,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_QUANTIL ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5155,7 +5155,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_QUARTILE ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5187,7 +5187,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_KGROESSTE ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5219,7 +5219,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_KKLEINSTE ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5251,7 +5251,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_QUANTILSRANG ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5283,7 +5283,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_RANG ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -5323,7 +5323,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_GESTUTZTMITTEL ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5355,7 +5355,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_WAHRSCHBEREICH ); - 4; 0; 0; 0; 1; + 4; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -5403,7 +5403,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_B ); - 4; 0; 0; 0; 1; + 4; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -5451,7 +5451,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_PHI ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -5475,7 +5475,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_GAUSS ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -5499,7 +5499,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_FISHER ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -5523,7 +5523,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_FISHERINV ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -5547,7 +5547,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_BINOMVERT ); - 4; 0; 0; 0; 0; + 4; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5595,7 +5595,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_NEGBINOMVERT ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5635,7 +5635,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_KRITBINOM ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5675,7 +5675,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_POISSON ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -5715,7 +5715,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_NORMVERT ); - 4; 0; 0; 0; 1; + 4; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -5763,7 +5763,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_NORMINV ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5803,7 +5803,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_STANDNORMVERT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -5827,7 +5827,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_STANDNORMINV ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -5851,7 +5851,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_LOGNORMVERT ); - 4; 0; 1; 1; 1; + 4; 0; 1; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -5899,7 +5899,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_LOGINV ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5939,7 +5939,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_EXPONVERT ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -5979,7 +5979,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_GAMMAVERT ); - 4; 0; 0; 0; 1; + 4; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -6027,7 +6027,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_GAMMAINV ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6067,7 +6067,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_GAMMALN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -6079,7 +6079,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ en-US ] = "The value for which the natural logarithm of the gamma function is to be calculated." ; }; }; - + // -=*# Resource for function GAMMA #*=- Resource SC_OPCODE_GAMMA { @@ -6181,7 +6181,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_BETAINV ); - 5; 0; 0; 0; 1; 1; + 5; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -6237,7 +6237,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_WEIBULL ); - 4; 0; 0; 0; 0; + 4; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6285,7 +6285,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_HYPGEOMVERT ); - 4; 0; 0; 0; 0; + 4; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6333,7 +6333,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_TVERT ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6373,7 +6373,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_TINV ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6405,7 +6405,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_FVERT ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6445,7 +6445,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_FINV ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6485,7 +6485,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_CHIVERT ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6560,7 +6560,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_CHIINV ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6626,7 +6626,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_STANDARDISIERUNG ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6666,7 +6666,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_VARIATIONEN ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6698,7 +6698,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_VARIATIONEN2 ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6730,7 +6730,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_KONFIDENZ ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6770,7 +6770,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_GTEST ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -6810,7 +6810,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_CHITEST ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6842,7 +6842,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_FTEST ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6874,7 +6874,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_TTEST ); - 4; 0; 0; 0; 0; + 4; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6922,7 +6922,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_BESTIMMTHEITSMASS ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6954,7 +6954,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_ACHSENABSCHNITT ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -6986,7 +6986,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_STEIGUNG ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -7018,7 +7018,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_STFEHLERYX ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -7050,7 +7050,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_PEARSON ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -7082,7 +7082,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_KORREL ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -7114,7 +7114,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_KOVAR ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -7146,7 +7146,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_SCHAETZER ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -7186,7 +7186,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_ADRESSE ); - 5; 0; 0; 1; 1; 1; + 5; 0; 0; 1; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -7244,7 +7244,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_BEREICHE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -7268,7 +7268,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_WAHL ); - VAR_ARGS+1; 0; 0; + VAR_ARGS+1; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -7300,7 +7300,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_SPALTE ); - 1; 1; + 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -7324,7 +7324,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_ZEILE ); - 1; 1; + 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -7348,7 +7348,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_TABELLE ); - 1; 1; + 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -7372,7 +7372,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_SPALTEN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -7396,7 +7396,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_ZEILEN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -7420,7 +7420,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_TABELLEN ); - 1; 1; + 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -7444,7 +7444,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_WVERWEIS ); - 4; 0; 0; 0; 1; + 4; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -7492,7 +7492,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_SVERWEIS ); - 4; 0; 0; 0; 1; + 4; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -7540,7 +7540,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_INDEX ); - 4; 0; 1; 1; 1; + 4; 0; 1; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -7588,7 +7588,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_INDIREKT ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -7620,7 +7620,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_VERWEIS ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -7660,7 +7660,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_VERGLEICH ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -7700,7 +7700,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_VERSCHIEBUNG ); - 5; 0; 0; 0; 1; 1; + 5; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -7756,7 +7756,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_FEHLERTYP ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -7780,7 +7780,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_VORLAGE ); - 3; 0; 1; 1; + 3; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -7820,7 +7820,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_DDE ); - 4; 0; 0; 0; 1; + 4; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -7868,7 +7868,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TABLE; U2S( HID_FUNC_HYPERLINK ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8012,7 +8012,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_CODE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8036,7 +8036,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_DM ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8068,7 +8068,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_ZEICHEN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8092,7 +8092,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_SAEUBERN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8116,7 +8116,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_VERKETTEN ); - VAR_ARGS; 0; + VAR_ARGS; 0; 0; }; String 2 // Name of Parameter 1 @@ -8140,7 +8140,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_IDENTISCH ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -8172,7 +8172,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_FINDEN ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8212,7 +8212,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_SUCHEN ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8252,7 +8252,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_GLAETTEN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8276,7 +8276,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_GROSS2 ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8300,7 +8300,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_GROSS ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8324,7 +8324,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_KLEIN ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8348,7 +8348,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_WERT ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8372,7 +8372,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_TEXT ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -8404,7 +8404,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_T ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8428,7 +8428,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_ERSETZEN ); - 4; 0; 0; 0; 0; + 4; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -8476,7 +8476,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_FEST ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8516,7 +8516,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_LAENGE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8540,7 +8540,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_LINKS ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8572,7 +8572,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_RECHTS ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8604,7 +8604,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_TEIL ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -8644,7 +8644,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_WIEDERHOLEN ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -8676,7 +8676,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_WECHSELN ); - 4; 0; 0; 0; 1; + 4; 0; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8724,7 +8724,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_BASIS ); - 3; 0; 0; 1; + 3; 0; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8764,7 +8764,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_DEZIMAL ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -8796,7 +8796,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_UMRECHNEN ); - 3; 0; 0; 0; + 3; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 @@ -8836,7 +8836,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_ROEMISCH ); - 2; 0; 1; + 2; 0; 1; 0; }; String 2 // Name of Parameter 1 @@ -8868,7 +8868,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_ARABISCH ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8891,7 +8891,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_INFO; U2S( HID_FUNC_INFO ); - 1; 0; + 1; 0; 0; }; String 2 @@ -8911,10 +8911,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 }; ExtraData = { - 0; + 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_UNICODE ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8934,10 +8934,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 }; ExtraData = { - 0; + 0; ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_UNICHAR ); - 1; 0; + 1; 0; 0; }; String 2 // Name of Parameter 1 @@ -8957,10 +8957,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 }; ExtraData = { - 0; // DOING + 0; // DOING ID_FUNCTION_GRP_MATH; U2S( HID_FUNC_EUROCONVERT ); - 5; 0; 0; 0; 1; 1; + 5; 0; 0; 0; 1; 1; 0; }; String 2 // Name of Parameter 1 @@ -9016,7 +9016,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 1; // TODO: implementation and unsuppress ID_FUNCTION_GRP_TEXT; U2S( HID_FUNC_NUMBERVALUE ); - 2; 0; 0; + 2; 0; 0; 0; }; String 2 // Name of Parameter 1 diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index 9c47a42239cc..f7c44c1fcd95 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -1,7 +1,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 @@ -472,7 +472,7 @@ String SCSTR_VALID_LIST Text [ en-US ] = "~Entries" ; }; - // fuer Dialoge: + // fuer Dialoge: String SCSTR_CHARSET_USER { @@ -499,7 +499,7 @@ String SCSTR_FORMULA_AUTOCORRECTION Text [ en-US ] = "%PRODUCTNAME Calc found an error in the formula entered.\nDo you want to accept the correction proposed below?\n\n" ; }; -//! the graphics filter error strings should be moved to svx or offapp! +//! the graphics filter error strings should be moved to svx or offapp! String SCSTR_GRFILTER_OPENERROR { diff --git a/sc/source/ui/src/scwarngs.src b/sc/source/ui/src/scwarngs.src index 9cd22567d77c..64184e9e41e5 100644 --- a/sc/source/ui/src/scwarngs.src +++ b/sc/source/ui/src/scwarngs.src @@ -1,7 +1,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/src/simpref.src b/sc/source/ui/src/simpref.src index 03f41c1a56aa..d0bf767f4f50 100644 --- a/sc/source/ui/src/simpref.src +++ b/sc/source/ui/src/simpref.src @@ -1,7 +1,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 @@ -35,7 +35,7 @@ ModelessDialog RID_SCDLG_SIMPLEREF Size = MAP_APPFONT ( 222 , 60 ) ; Text = "Bereich festlegen" ; Moveable = TRUE ; - // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! + // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! FixedText FT_ASSIGN { Pos = MAP_APPFONT ( 6 , 6 ) ; @@ -48,7 +48,7 @@ ModelessDialog RID_SCDLG_SIMPLEREF Pos = MAP_APPFONT ( 48 , 6 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; TabStop = TRUE ; - // Text = "<Tabellenbereich>" ; + // Text = "<Tabellenbereich>" ; }; ImageButton RB_ASSIGN { diff --git a/sc/source/ui/src/solveroptions.src b/sc/source/ui/src/solveroptions.src index 0a3432344f35..12e02f690e2a 100644 --- a/sc/source/ui/src/solveroptions.src +++ b/sc/source/ui/src/solveroptions.src @@ -1,7 +1,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/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src index 6a8a3d955644..c067a6db14c6 100644 --- a/sc/source/ui/src/solvrdlg.src +++ b/sc/source/ui/src/solvrdlg.src @@ -1,7 +1,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/src/sortdlg.src b/sc/source/ui/src/sortdlg.src index 1062eb58e1dc..4090bbaa4554 100644 --- a/sc/source/ui/src/sortdlg.src +++ b/sc/source/ui/src/sortdlg.src @@ -1,7 +1,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 @@ -317,13 +317,13 @@ TabDialog RID_SCDLG_SORT ModalDialog RID_SCDLG_SORT_WARNING { OutputSize = TRUE ; - SVLook = TRUE ; + SVLook = TRUE ; Size = MAP_APPFONT ( 180 , 91 ) ; Text [ en-US ] = "Sort Range" ; Moveable = TRUE ; Closeable = FALSE ; FixedText FT_TEXT - { + { Pos = MAP_APPFONT ( 8 , 3 ) ; Size = MAP_APPFONT ( 170 , 33 ) ; WordBreak = TRUE; diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src index c0bcfba1b07b..b97b6c8383c5 100644 --- a/sc/source/ui/src/subtdlg.src +++ b/sc/source/ui/src/subtdlg.src @@ -1,7 +1,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 @@ -109,8 +109,8 @@ TabPage RID_SCPAGE_SUBT_OPTIONS TabPage RID_SUBTBASE { - // Die Elemente haben hart vergebene Hilfe-IDs, weil automatisch generierte - // aus den Ableitungen nicht in der HID-Liste auftauchen wuerden + // Die Elemente haben hart vergebene Hilfe-IDs, weil automatisch generierte + // aus den Ableitungen nicht in der HID-Liste auftauchen wuerden HelpId = HID_SCPAGE_SUBT_GROUP ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 260 , 185 ) ; diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src index 25af654f4147..6df01004931e 100644 --- a/sc/source/ui/src/tabopdlg.src +++ b/sc/source/ui/src/tabopdlg.src @@ -1,7 +1,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/src/textdlgs.src b/sc/source/ui/src/textdlgs.src index 2b0e408262ba..447b174e1aec 100644 --- a/sc/source/ui/src/textdlgs.src +++ b/sc/source/ui/src/textdlgs.src @@ -1,7 +1,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/src/toolbox.src b/sc/source/ui/src/toolbox.src index 6e4b89e5faa0..85fb80bfcc5f 100644 --- a/sc/source/ui/src/toolbox.src +++ b/sc/source/ui/src/toolbox.src @@ -1,7 +1,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 @@ -124,7 +124,7 @@ String SCSTR_QHELP_BTNEQUAL }; // -------------------------------------------------------------------- - // PopUp's fuer Werkzeugleiste + // PopUp's fuer Werkzeugleiste // -------------------------------------------------------------------- FloatingWindow RID_TBXCTL_INSERT @@ -259,10 +259,10 @@ FloatingWindow RID_TBXCTL_INSOBJ #define DEFAULT_IDLIST \ IdList = { \ - /* Eingabezeile */ \ - SID_INPUT_FUNCTION; /* 20047 */ \ - SID_INPUT_SUM; /* 20048 */ \ - SID_INPUT_EQUAL; /* 20049 */ \ + /* Eingabezeile */ \ + SID_INPUT_FUNCTION; /* 20047 */ \ + SID_INPUT_SUM; /* 20048 */ \ + SID_INPUT_EQUAL; /* 20049 */ \ SID_INPUT_CANCEL; \ SID_INPUT_OK; \ }; \ diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src index 1968b6dca877..8c057d65f70a 100644 --- a/sc/source/ui/styleui/scstyles.src +++ b/sc/source/ui/styleui/scstyles.src @@ -1,7 +1,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 @@ -28,7 +28,7 @@ #include "sc.hrc" #include <svl/style.hrc> #define IMPL_FAMILY(family,filter) \ - StyleFamily = family; \ + StyleFamily = family; \ FilterList = { filter } //------------------------------------------------------------------------ @@ -53,15 +53,15 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; }; - // style family images are now taken from an ImageList - // (for each family, there's one entry in the IdList) - ImageList 1 // == BMP_COLOR_NORMAL + 1 + // style family images are now taken from an ImageList + // (for each family, there's one entry in the IdList) + ImageList 1 // == BMP_COLOR_NORMAL + 1 { Prefix = "sf"; MaskColor = STD_MASKCOLOR ; IdList = { 1; 2; }; }; - ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1 + ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1 { Prefix = "sfh"; MaskColor = SC_HC_MASKCOLOR ; diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index bc2d2f2dfdf0..ae9d2e98c350 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.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 @@ -42,9 +42,9 @@ #include <svl/cjkoptions.hxx> #include "styledlg.hxx" -#include "tabpages.hxx" // Zellvorlagen -#include "tphf.hxx" // Seitenvorlage: Kopf-/Fusszeilen -#include "tptable.hxx" // Seitenvorlage: Tabelle +#include "tabpages.hxx" // Zellvorlagen +#include "tphf.hxx" // Seitenvorlage: Kopf-/Fusszeilen +#include "tptable.hxx" // Seitenvorlage: Tabelle #include "scresid.hxx" #include "sc.hrc" #include "styledlg.hrc" @@ -57,21 +57,21 @@ #include <svx/flagsdef.hxx> //================================================================== -ScStyleDlg::ScStyleDlg( Window* pParent, - SfxStyleSheetBase& rStyleBase, - USHORT nRscId ) +ScStyleDlg::ScStyleDlg( Window* pParent, + SfxStyleSheetBase& rStyleBase, + USHORT nRscId ) - : SfxStyleDialog ( pParent, + : SfxStyleDialog ( pParent, ScResId( nRscId ), rStyleBase, FALSE ), - nDlgRsc ( nRscId ) + nDlgRsc ( nRscId ) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); switch ( nRscId ) { - case RID_SCDLG_STYLES_PAR: // Zellformatvorlagen + case RID_SCDLG_STYLES_PAR: // Zellformatvorlagen { SvtCJKOptions aCJKOptions; DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!"); @@ -90,7 +90,7 @@ ScStyleDlg::ScStyleDlg( Window* pParent, { DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); + AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); } else RemoveTabPage( TP_ASIAN ); @@ -100,11 +100,11 @@ ScStyleDlg::ScStyleDlg( Window* pParent, DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); - AddTabPage( TP_PROTECTION, &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges ); + AddTabPage( TP_PROTECTION, &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges ); } break; - case RID_SCDLG_STYLES_PAGE: // Seitenvorlagen + case RID_SCDLG_STYLES_PAGE: // Seitenvorlagen { DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!"); @@ -115,9 +115,9 @@ ScStyleDlg::ScStyleDlg( Window* pParent, DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); - AddTabPage( TP_PAGE_HEADER, &ScHeaderPage::Create, &ScHeaderPage::GetRanges ); - AddTabPage( TP_PAGE_FOOTER, &ScFooterPage::Create, &ScFooterPage::GetRanges ); - AddTabPage( TP_TABLE, &ScTablePage::Create, &ScTablePage::GetRanges ); + AddTabPage( TP_PAGE_HEADER, &ScHeaderPage::Create, &ScHeaderPage::GetRanges ); + AddTabPage( TP_PAGE_FOOTER, &ScFooterPage::Create, &ScFooterPage::GetRanges ); + AddTabPage( TP_TABLE, &ScTablePage::Create, &ScTablePage::GetRanges ); } break; diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.src index 4c862e21ebd0..be1f7d3457fd 100644 --- a/sc/source/ui/styleui/styledlg.src +++ b/sc/source/ui/styleui/styledlg.src @@ -1,7 +1,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/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index 9f2b4eb7f03c..54d09946bab3 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.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,22 +45,22 @@ // ----------------------------------------------------------------------- ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLink& rSource ) : - aFileName ( rSource.GetFile() ), - aFilterName ( rSource.GetFilter() ), - aOptions ( rSource.GetOptions() ), - aSourceArea ( rSource.GetSource() ), - aDestArea ( rSource.GetDestArea() ), + aFileName ( rSource.GetFile() ), + aFilterName ( rSource.GetFilter() ), + aOptions ( rSource.GetOptions() ), + aSourceArea ( rSource.GetSource() ), + aDestArea ( rSource.GetDestArea() ), nRefresh ( rSource.GetRefreshDelay() ) // seconds { } ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ) : ScDataObject(), - aFileName ( rCopy.aFileName ), - aFilterName ( rCopy.aFilterName ), - aOptions ( rCopy.aOptions ), - aSourceArea ( rCopy.aSourceArea ), - aDestArea ( rCopy.aDestArea ), + aFileName ( rCopy.aFileName ), + aFilterName ( rCopy.aFilterName ), + aOptions ( rCopy.aOptions ), + aSourceArea ( rCopy.aSourceArea ), + aDestArea ( rCopy.aDestArea ), nRefresh ( rCopy.nRefresh ) { } @@ -69,16 +69,16 @@ ScAreaLinkSaver::~ScAreaLinkSaver() { } -ScDataObject* ScAreaLinkSaver::Clone() const +ScDataObject* ScAreaLinkSaver::Clone() const { return new ScAreaLinkSaver( *this ); } BOOL ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const { - return ( aFileName == rCompare.GetFile() && + return ( aFileName == rCompare.GetFile() && aFilterName == rCompare.GetFilter() && - aOptions == rCompare.GetOptions() && + aOptions == rCompare.GetOptions() && aSourceArea == rCompare.GetSource() && nRefresh == rCompare.GetRefreshDelay() ); } @@ -128,7 +128,7 @@ ScAreaLinkSaveCollection::~ScAreaLinkSaveCollection() { } -ScDataObject* ScAreaLinkSaveCollection::Clone() const +ScDataObject* ScAreaLinkSaveCollection::Clone() const { return new ScAreaLinkSaveCollection( *this ); } diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx index e4ca41b3ed30..3fd8fbf82f00 100644 --- a/sc/source/ui/undo/refundo.cxx +++ b/sc/source/ui/undo/refundo.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 @@ -59,14 +59,14 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) : ScDBCollection* pOldDBColl = pDoc->GetDBCollection(); pDBCollection = pOldDBColl ? new ScDBCollection(*pOldDBColl) : NULL; - ScRangeName* pOldRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const + ScRangeName* pOldRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const pRangeName = pOldRanges ? new ScRangeName(*pOldRanges) : NULL; - pPrintRanges = pDoc->CreatePrintRangeSaver(); // neu erzeugt + pPrintRanges = pDoc->CreatePrintRangeSaver(); // neu erzeugt - //! bei Pivot nur Bereiche merken ??? + //! bei Pivot nur Bereiche merken ??? - ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const + ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const pDPCollection = pOldDP ? new ScDPCollection(*pOldDP) : NULL; ScConditionalFormatList* pOldCond = pDoc->GetCondFormList(); @@ -80,7 +80,7 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) : pChartListenerCollection = pOldChartListenerCollection ? new ScChartListenerCollection( *pOldChartListenerCollection ) : NULL; - pAreaLinks = ScAreaLinkSaveCollection::CreateFromDoc(pDoc); // returns NULL if empty + pAreaLinks = ScAreaLinkSaveCollection::CreateFromDoc(pDoc); // returns NULL if empty const_cast<ScDocument*>(pDoc)->BeginUnoRefUndo(); } @@ -108,7 +108,7 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc ) } if (pRangeName) { - ScRangeName* pNewRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const + ScRangeName* pNewRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const if ( pNewRanges && *pRangeName == *pNewRanges ) DELETEZ(pRangeName); } @@ -123,7 +123,7 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc ) if (pDPCollection) { - ScDPCollection* pNewDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const + ScDPCollection* pNewDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const if ( pNewDP && pDPCollection->RefsEqual(*pNewDP) ) DELETEZ(pDPCollection); } @@ -197,7 +197,7 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst ) if (pDBCollection || pRangeName) { BOOL bOldAutoCalc = pDoc->GetAutoCalc(); - pDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden pDoc->CompileAll(); pDoc->SetDirty(); pDoc->SetAutoCalc( bOldAutoCalc ); diff --git a/sc/source/ui/undo/target.cxx b/sc/source/ui/undo/target.cxx index 492c18bebc9a..6c7c29f08d52 100644 --- a/sc/source/ui/undo/target.cxx +++ b/sc/source/ui/undo/target.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/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index e1d7c65c5072..38e7addc42aa 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.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 @@ -48,7 +48,7 @@ // STATIC DATA ----------------------------------------------------------- -TYPEINIT1(ScSimpleUndo, SfxUndoAction); +TYPEINIT1(ScSimpleUndo, SfxUndoAction); TYPEINIT1(ScBlockUndo, ScSimpleUndo); TYPEINIT1(ScMoveUndo, ScSimpleUndo); TYPEINIT1(ScDBFuncUndo, ScSimpleUndo); @@ -69,17 +69,17 @@ __EXPORT ScSimpleUndo::~ScSimpleUndo() BOOL __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) { - // Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren - // der Detektiv-Pfeile gehoeren. - // DetectiveRefresh kommt immer hinterher, die SdrUndoGroup ist in - // eine ScUndoDraw Action verpackt. - // Nur beim automatischen Aktualisieren wird AddUndoAction mit - // bTryMerg=TRUE gerufen. + // Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren + // der Detektiv-Pfeile gehoeren. + // DetectiveRefresh kommt immer hinterher, die SdrUndoGroup ist in + // eine ScUndoDraw Action verpackt. + // Nur beim automatischen Aktualisieren wird AddUndoAction mit + // bTryMerg=TRUE gerufen. if ( !pDetectiveUndo && pNextAction->ISA(ScUndoDraw) ) { - // SdrUndoAction aus der ScUndoDraw Action uebernehmen, - // ScUndoDraw wird dann vom UndoManager geloescht + // SdrUndoAction aus der ScUndoDraw Action uebernehmen, + // ScUndoDraw wird dann vom UndoManager geloescht ScUndoDraw* pCalcUndo = (ScUndoDraw*)pNextAction; pDetectiveUndo = pCalcUndo->GetDrawUndo(); @@ -96,9 +96,9 @@ void ScSimpleUndo::BeginUndo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen + pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen - // detective updates happened last, must be undone first + // detective updates happened last, must be undone first if (pDetectiveUndo) pDetectiveUndo->Undo(); } @@ -120,11 +120,11 @@ void ScSimpleUndo::EndUndo() void ScSimpleUndo::BeginRedo() { - pDocShell->SetInUndo( TRUE ); //! eigenes Flag fuer Redo? + pDocShell->SetInUndo( TRUE ); //! eigenes Flag fuer Redo? ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen + pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen } void ScSimpleUndo::EndRedo() @@ -145,14 +145,14 @@ void ScSimpleUndo::EndRedo() pDocShell->SetInUndo( FALSE ); } -void ScSimpleUndo::ShowTable( SCTAB nTab ) // static +void ScSimpleUndo::ShowTable( SCTAB nTab ) // static { ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) pViewShell->SetTabNo( nTab ); } -void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static +void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static { ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) @@ -160,8 +160,8 @@ void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static SCTAB nStart = rRange.aStart.Tab(); SCTAB nEnd = rRange.aEnd.Tab(); SCTAB nTab = pViewShell->GetViewData()->GetTabNo(); - if ( nTab < nStart || nTab > nEnd ) // wenn nicht im Bereich: - pViewShell->SetTabNo( nStart ); // auf erste des Bereiches + if ( nTab < nStart || nTab > nEnd ) // wenn nicht im Bereich: + pViewShell->SetTabNo( nStart ); // auf erste des Bereiches } } @@ -235,13 +235,13 @@ BOOL ScBlockUndo::AdjustHeight() } else { - // Zoom auf 100 lassen + // Zoom auf 100 lassen nPPTX = ScGlobal::nScreenPPTX; nPPTY = ScGlobal::nScreenPPTY; } BOOL bRet = pDoc->SetOptimalHeight( aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(), -/*!*/ aBlockRange.aStart.Tab(), 0, &aVirtDev, +/*!*/ aBlockRange.aStart.Tab(), 0, &aVirtDev, nPPTX, nPPTY, aZoomX, aZoomY, FALSE ); if (bRet) @@ -257,7 +257,7 @@ void ScBlockUndo::ShowBlock() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) { - ShowTable( aBlockRange ); // bei mehreren Tabs im Range ist jede davon gut + ShowTable( aBlockRange ); // bei mehreren Tabs im Range ist jede davon gut pViewShell->MoveCursorAbs( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(), SC_FOLLOW_JUMP, FALSE, FALSE ); SCTAB nTab = pViewShell->GetViewData()->GetTabNo(); @@ -266,7 +266,7 @@ void ScBlockUndo::ShowBlock() aRange.aEnd.SetTab( nTab ); pViewShell->MarkRange( aRange ); - // nicht per SetMarkArea an MarkData, wegen evtl. fehlendem Paint + // nicht per SetMarkArea an MarkData, wegen evtl. fehlendem Paint } } diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index eda49aa114c5..c46a59d80722 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.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,37 +70,37 @@ // STATIC DATA ----------------------------------------------------------- -TYPEINIT1(ScUndoInsertCells, SfxUndoAction); -TYPEINIT1(ScUndoDeleteCells, SfxUndoAction); -TYPEINIT1(ScUndoDeleteMulti, SfxUndoAction); -TYPEINIT1(ScUndoCut, ScBlockUndo); -TYPEINIT1(ScUndoPaste, SfxUndoAction); -TYPEINIT1(ScUndoDragDrop, SfxUndoAction); -TYPEINIT1(ScUndoListNames, SfxUndoAction); -TYPEINIT1(ScUndoUseScenario, SfxUndoAction); -TYPEINIT1(ScUndoSelectionStyle, SfxUndoAction); -TYPEINIT1(ScUndoEnterMatrix, ScBlockUndo); -TYPEINIT1(ScUndoIndent, ScBlockUndo); -TYPEINIT1(ScUndoTransliterate, ScBlockUndo); -TYPEINIT1(ScUndoClearItems, ScBlockUndo); -TYPEINIT1(ScUndoRemoveBreaks, SfxUndoAction); -TYPEINIT1(ScUndoRemoveMerge, ScBlockUndo); -TYPEINIT1(ScUndoBorder, ScBlockUndo); +TYPEINIT1(ScUndoInsertCells, SfxUndoAction); +TYPEINIT1(ScUndoDeleteCells, SfxUndoAction); +TYPEINIT1(ScUndoDeleteMulti, SfxUndoAction); +TYPEINIT1(ScUndoCut, ScBlockUndo); +TYPEINIT1(ScUndoPaste, SfxUndoAction); +TYPEINIT1(ScUndoDragDrop, SfxUndoAction); +TYPEINIT1(ScUndoListNames, SfxUndoAction); +TYPEINIT1(ScUndoUseScenario, SfxUndoAction); +TYPEINIT1(ScUndoSelectionStyle, SfxUndoAction); +TYPEINIT1(ScUndoEnterMatrix, ScBlockUndo); +TYPEINIT1(ScUndoIndent, ScBlockUndo); +TYPEINIT1(ScUndoTransliterate, ScBlockUndo); +TYPEINIT1(ScUndoClearItems, ScBlockUndo); +TYPEINIT1(ScUndoRemoveBreaks, SfxUndoAction); +TYPEINIT1(ScUndoRemoveMerge, ScBlockUndo); +TYPEINIT1(ScUndoBorder, ScBlockUndo); // To Do: -/*A*/ // SetOptimalHeight auf Dokument, wenn keine View -/*B*/ // gelinkte Tabellen -/*C*/ // ScArea -//? // spaeter mal pruefen +/*A*/ // SetOptimalHeight auf Dokument, wenn keine View +/*B*/ // gelinkte Tabellen +/*C*/ // ScArea +//? // spaeter mal pruefen // ----------------------------------------------------------------------- // -// Zellen einfuegen +// Zellen einfuegen // Zeilen einfuegen -// einzeln oder Block +// einzeln oder Block // ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell, @@ -116,13 +116,13 @@ ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell, bPartOfPaste( bNewPartOfPaste ), pPasteUndo( NULL ) { - if (eCmd == INS_INSROWS) // ganze Zeilen? + if (eCmd == INS_INSROWS) // ganze Zeilen? { aEffRange.aStart.SetCol(0); aEffRange.aEnd.SetCol(MAXCOL); } - if (eCmd == INS_INSCOLS) // ganze Spalten? + if (eCmd == INS_INSCOLS) // ganze Spalten? { aEffRange.aStart.SetRow(0); aEffRange.aEnd.SetRow(MAXROW); @@ -145,7 +145,7 @@ String __EXPORT ScUndoInsertCells::GetComment() const BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction ) { - // If a paste undo action has already been added, append (detective) action there. + // If a paste undo action has already been added, append (detective) action there. if ( pPasteUndo ) return pPasteUndo->Merge( pNextAction ); @@ -155,16 +155,16 @@ BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction ) SfxUndoAction* pWrappedAction = pWrapper->GetWrappedUndo(); if ( pWrappedAction && pWrappedAction->ISA( ScUndoPaste ) ) { - // Store paste action if this is part of paste with inserting cells. - // A list action isn't used because Repeat wouldn't work (insert wrong cells). + // Store paste action if this is part of paste with inserting cells. + // A list action isn't used because Repeat wouldn't work (insert wrong cells). pPasteUndo = pWrappedAction; - pWrapper->ForgetWrappedUndo(); // pWrapper is deleted by UndoManager + pWrapper->ForgetWrappedUndo(); // pWrapper is deleted by UndoManager return TRUE; } } - // Call base class for detective handling + // Call base class for detective handling return ScMoveUndo::Merge( pNextAction ); } @@ -242,7 +242,7 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo ) } } -//? Undo fuer herausgeschobene Attribute ? +//? Undo fuer herausgeschobene Attribute ? USHORT nPaint = PAINT_GRID; ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); @@ -265,14 +265,14 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo ) } break; case INS_INSCOLS: - nPaint |= PAINT_TOP; // obere Leiste + nPaint |= PAINT_TOP; // obere Leiste case INS_CELLSRIGHT: for( i=0; i<nCount; i++ ) { - aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts + aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts if ( pDocShell->AdjustRowHeight( aWorkRange.aStart.Row(), aWorkRange.aEnd.Row(), pTabs[i]) ) - { // AdjustDraw zeichnet PAINT_TOP nicht, - aWorkRange.aStart.SetCol(0); // daher so geloest + { // AdjustDraw zeichnet PAINT_TOP nicht, + aWorkRange.aStart.SetCol(0); // daher so geloest aWorkRange.aEnd.SetRow(MAXROW); nPaint |= PAINT_LEFT; } @@ -297,9 +297,9 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo ) void __EXPORT ScUndoInsertCells::Undo() { if ( pPasteUndo ) - pPasteUndo->Undo(); // undo paste first + pPasteUndo->Undo(); // undo paste first - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginUndo(); DoChange( TRUE ); EndUndo(); @@ -307,13 +307,13 @@ void __EXPORT ScUndoInsertCells::Undo() void __EXPORT ScUndoInsertCells::Redo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginRedo(); DoChange( FALSE ); EndRedo(); if ( pPasteUndo ) - pPasteUndo->Redo(); // redo paste last + pPasteUndo->Redo(); // redo paste last } void __EXPORT ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) @@ -322,8 +322,8 @@ void __EXPORT ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) { if ( pPasteUndo ) { - // #94115# Repeat for paste with inserting cells is handled completely - // by the Paste undo action + // #94115# Repeat for paste with inserting cells is handled completely + // by the Paste undo action pPasteUndo->Repeat( rTarget ); } @@ -340,9 +340,9 @@ BOOL __EXPORT ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Zellen loeschen +// Zellen loeschen // Zeilen loeschen -// einzeln oder Block +// einzeln oder Block // ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell, @@ -355,13 +355,13 @@ ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell, pScenarios( pNewScenarios ), eCmd( eNewCmd ) { - if (eCmd == DEL_DELROWS) // gaze Zeilen? + if (eCmd == DEL_DELROWS) // gaze Zeilen? { aEffRange.aStart.SetCol(0); aEffRange.aEnd.SetCol(MAXCOL); } - if (eCmd == DEL_DELCOLS) // ganze Spalten? + if (eCmd == DEL_DELCOLS) // ganze Spalten? { aEffRange.aStart.SetRow(0); aEffRange.aEnd.SetRow(MAXROW); @@ -461,7 +461,7 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo ) { if ( eCmd==DEL_DELCOLS || eCmd==DEL_CELLSLEFT ) aWorkRange.aEnd.SetCol(MAXCOL); - if ( eCmd==DEL_DELROWS || eCmd==DEL_CELLSUP ) + if ( eCmd==DEL_DELROWS || eCmd==DEL_CELLSUP ) aWorkRange.aEnd.SetRow(MAXROW); ScMarkData aMarkData; aMarkData.SelectOneTable( aWorkRange.aStart.Tab() ); @@ -499,11 +499,11 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo ) } break; case DEL_DELCOLS: - nPaint |= PAINT_TOP; // obere Leiste + nPaint |= PAINT_TOP; // obere Leiste case DEL_CELLSLEFT: for( i=0; i<nCount; i++ ) { - aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts + aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts if ( pDocShell->AdjustRowHeight( aWorkRange.aStart.Row(), aWorkRange.aEnd.Row(), pTabs[i] ) ) { aWorkRange.aStart.SetCol(0); @@ -526,12 +526,12 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo ) // Markierung erst nach EndUndo pDocShell->PostDataChanged(); - // CellContentChanged kommt mit der Markierung + // CellContentChanged kommt mit der Markierung } void __EXPORT ScUndoDeleteCells::Undo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginUndo(); DoChange( TRUE ); EndUndo(); @@ -550,7 +550,7 @@ void __EXPORT ScUndoDeleteCells::Undo() void __EXPORT ScUndoDeleteCells::Redo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginRedo(); DoChange( FALSE); EndRedo(); @@ -558,7 +558,7 @@ void __EXPORT ScUndoDeleteCells::Redo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->DoneBlockMode(); // aktuelle weg + pViewShell->DoneBlockMode(); // aktuelle weg } void __EXPORT ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget) @@ -575,7 +575,7 @@ BOOL __EXPORT ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Zellen loeschen auf Mehrfachselektion +// Zellen loeschen auf Mehrfachselektion // ScUndoDeleteMulti::ScUndoDeleteMulti( ScDocShell* pNewDocShell, @@ -600,7 +600,7 @@ __EXPORT ScUndoDeleteMulti::~ScUndoDeleteMulti() String __EXPORT ScUndoDeleteMulti::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // wie DeleteCells + return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // wie DeleteCells } void ScUndoDeleteMulti::DoChange() const @@ -677,14 +677,14 @@ void ScUndoDeleteMulti::SetChangeTrack() void __EXPORT ScUndoDeleteMulti::Undo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginUndo(); ScDocument* pDoc = pDocShell->GetDocument(); SCCOLROW* pOneRange; SCCOLROW nRangeNo; - // rueckwaerts geloescht -> vorwaerts einfuegen + // rueckwaerts geloescht -> vorwaerts einfuegen pOneRange = pRanges; for (nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++) { @@ -714,8 +714,8 @@ void __EXPORT ScUndoDeleteMulti::Undo() DoChange(); - //! Markierung wieder einzeichnen - //! geht im Moment nicht, da keine Daten fuer Markierung vorhanden! + //! Markierung wieder einzeichnen + //! geht im Moment nicht, da keine Daten fuer Markierung vorhanden! EndUndo(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); @@ -723,7 +723,7 @@ void __EXPORT ScUndoDeleteMulti::Undo() void __EXPORT ScUndoDeleteMulti::Redo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginRedo(); ScDocument* pDoc = pDocShell->GetDocument(); @@ -744,10 +744,10 @@ void __EXPORT ScUndoDeleteMulti::Redo() DoChange(); -//! Markierung loeschen, derzeit unnoetig (s.o.) -//! ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); -//! if (pViewShell) -//! DoneBlockMode(); +//! Markierung loeschen, derzeit unnoetig (s.o.) +//! ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); +//! if (pViewShell) +//! DoneBlockMode(); EndRedo(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); @@ -755,7 +755,7 @@ void __EXPORT ScUndoDeleteMulti::Redo() void __EXPORT ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget) { - // DeleteCells, falls einfache Selektion + // DeleteCells, falls einfache Selektion if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, TRUE ); } @@ -768,7 +768,7 @@ BOOL __EXPORT ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Ausschneiden (Cut) +// Ausschneiden (Cut) // ScUndoCut::ScUndoCut( ScDocShell* pNewDocShell, @@ -810,7 +810,7 @@ void ScUndoCut::DoChange( const BOOL bUndo ) // do not undo/redo objects and note captions, they are handled via drawing undo USHORT nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS; - if (bUndo) // nur bei Undo + if (bUndo) // nur bei Undo { // all sheets - CopyToDocument skips those that don't exist in pUndoDoc SCTAB nTabCount = pDoc->GetTableCount(); @@ -822,7 +822,7 @@ void ScUndoCut::DoChange( const BOOL bUndo ) if ( pChangeTrack ) pChangeTrack->Undo( nStartChangeAction, nEndChangeAction ); } - else // nur bei Redo + else // nur bei Redo { pDocShell->UpdatePaintExt( nExtFlags, aExtendedRange ); pDoc->DeleteArea( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(), @@ -832,10 +832,10 @@ void ScUndoCut::DoChange( const BOOL bUndo ) ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) ) -/*A*/ pDocShell->PostPaint( aExtendedRange, PAINT_GRID, nExtFlags ); +/*A*/ pDocShell->PostPaint( aExtendedRange, PAINT_GRID, nExtFlags ); if ( !bUndo ) // draw redo after updating row heights - RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo? + RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo? pDocShell->PostDataChanged(); if (pViewShell) @@ -853,9 +853,9 @@ void __EXPORT ScUndoCut::Redo() { BeginRedo(); ScDocument* pDoc = pDocShell->GetDocument(); - EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo? + EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo? DoChange( FALSE ); - EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo? + EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo? EndRedo(); } @@ -873,7 +873,7 @@ BOOL __EXPORT ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Einfuegen (Paste) +// Einfuegen (Paste) // ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell, @@ -894,18 +894,18 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell, pRefRedoData( NULL ), bRedoFilled( bRedoIsFilled ) { - // pFill1,pFill2,pFill3 are there so the ctor calls for simple paste (without cutting) - // don't have to be changed and branched for 641. - // They can be removed later. + // pFill1,pFill2,pFill3 are there so the ctor calls for simple paste (without cutting) + // don't have to be changed and branched for 641. + // They can be removed later. - if ( !aMarkData.IsMarked() ) // no cell marked: - aMarkData.SetMarkArea( aBlockRange ); // mark paste block + if ( !aMarkData.IsMarked() ) // no cell marked: + aMarkData.SetMarkArea( aBlockRange ); // mark paste block if ( pRefUndoData ) pRefUndoData->DeleteUnchanged( pDocShell->GetDocument() ); if ( pOptions ) - aPasteOptions = *pOptions; // used only for Repeat + aPasteOptions = *pOptions; // used only for Repeat SetChangeTrack(); } @@ -937,15 +937,15 @@ void ScUndoPaste::DoChange( const BOOL bUndo ) { ScDocument* pDoc = pDocShell->GetDocument(); - // RefUndoData for redo is created before first undo - // (with DeleteUnchanged after the DoUndo call) + // RefUndoData for redo is created before first undo + // (with DeleteUnchanged after the DoUndo call) BOOL bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData ); if ( bCreateRedoData ) pRefRedoData = new ScRefUndoData( pDoc ); ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData; - // fuer Undo immer alle oder keine Inhalte sichern + // fuer Undo immer alle oder keine Inhalte sichern USHORT nUndoFlags = IDF_NONE; if (nFlags & IDF_CONTENTS) nUndoFlags |= IDF_CONTENTS; @@ -1009,7 +1009,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo ) if (pWorkRefData) { - pWorkRefData->DoUndo( pDoc, TRUE ); // TRUE = bSetChartRangeLists for SetChartListenerCollection + pWorkRefData->DoUndo( pDoc, TRUE ); // TRUE = bSetChartRangeLists for SetChartListenerCollection if ( pDoc->RefreshAutoFilter( 0,0, MAXCOL,MAXROW, aBlockRange.aStart.Tab() ) ) bPaintAll = TRUE; } @@ -1050,22 +1050,22 @@ void ScUndoPaste::DoChange( const BOOL bUndo ) aDrawRange.aEnd.SetCol(MAXCOL); aDrawRange.aEnd.SetRow(MAXROW); nPaint |= PAINT_TOP | PAINT_LEFT; -/*A*/ if (pViewShell) +/*A*/ if (pViewShell) pViewShell->AdjustBlockHeight(FALSE); } else { - if ( aBlockRange.aStart.Row() == 0 && aBlockRange.aEnd.Row() == MAXROW ) // ganze Spalte + if ( aBlockRange.aStart.Row() == 0 && aBlockRange.aEnd.Row() == MAXROW ) // ganze Spalte { nPaint |= PAINT_TOP; aDrawRange.aEnd.SetCol(MAXCOL); } - if ( aBlockRange.aStart.Col() == 0 && aBlockRange.aEnd.Col() == MAXCOL ) // ganze Zeile + if ( aBlockRange.aStart.Col() == 0 && aBlockRange.aEnd.Col() == MAXCOL ) // ganze Zeile { nPaint |= PAINT_LEFT; aDrawRange.aEnd.SetRow(MAXROW); } -/*A*/ if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE)) +/*A*/ if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE)) { aDrawRange.aStart.SetCol(0); aDrawRange.aStart.SetRow(0); @@ -1077,7 +1077,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo ) } if ( !bUndo ) // draw redo after updating row heights - RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo? + RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo? pDocShell->PostPaint( aDrawRange, nPaint, nExtFlags ); @@ -1099,9 +1099,9 @@ void __EXPORT ScUndoPaste::Redo() { BeginRedo(); ScDocument* pDoc = pDocShell->GetDocument(); - EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo? + EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo? DoChange( FALSE ); - EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo? + EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo? EndRedo(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); } @@ -1119,7 +1119,7 @@ void __EXPORT ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) pViewSh->PasteFromClip( nFlags, pOwnClip->GetDocument(), aPasteOptions.nFunction, aPasteOptions.bSkipEmpty, aPasteOptions.bTranspose, aPasteOptions.bAsLink, aPasteOptions.eMoveMode, IDF_NONE, - TRUE ); // allow warning dialog + TRUE ); // allow warning dialog } } } @@ -1132,7 +1132,7 @@ BOOL __EXPORT ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Verschieben/Kopieren (Drag & Drop) +// Verschieben/Kopieren (Drag & Drop) // ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell, @@ -1171,7 +1171,7 @@ __EXPORT ScUndoDragDrop::~ScUndoDragDrop() } String __EXPORT ScUndoDragDrop::GetComment() const -{ // "Verschieben" : "Kopieren" +{ // "Verschieben" : "Kopieren" return bCut ? ScGlobal::GetRscString( STR_UNDO_MOVE ) : ScGlobal::GetRscString( STR_UNDO_COPY ); @@ -1222,14 +1222,14 @@ void ScUndoDragDrop::PaintArea( ScRange aRange, USHORT nExtFlags ) const if ( bKeepScenarioFlags ) { - // Szenarien mitkopiert -> auch Szenario-Rahmen painten + // Szenarien mitkopiert -> auch Szenario-Rahmen painten aRange.aStart.SetCol(0); aRange.aStart.SetRow(0); aRange.aEnd.SetCol(MAXCOL); aRange.aEnd.SetRow(MAXROW); } - // column/row info (width/height) included if whole columns/rows were copied + // column/row info (width/height) included if whole columns/rows were copied if ( aSrcRange.aStart.Col() == 0 && aSrcRange.aEnd.Col() == MAXCOL ) { nPaint |= PAINT_LEFT; @@ -1253,10 +1253,10 @@ void ScUndoDragDrop::DoUndo( ScRange aRange ) const if ( pChangeTrack ) pChangeTrack->Undo( nStartChangeAction, nEndChangeAction ); -//? DB-Areas vor Daten, damit bei ExtendMerge die Autofilter-Knoepfe stimmen +//? DB-Areas vor Daten, damit bei ExtendMerge die Autofilter-Knoepfe stimmen ScRange aPaintRange = aRange; - pDoc->ExtendMerge( aPaintRange ); // before deleting + pDoc->ExtendMerge( aPaintRange ); // before deleting USHORT nExtFlags = 0; pDocShell->UpdatePaintExt( nExtFlags, aPaintRange ); @@ -1293,7 +1293,7 @@ void __EXPORT ScUndoDragDrop::Redo() ScDocument* pDoc = pDocShell->GetDocument(); ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); - EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo? + EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo? // do not undo/redo objects and note captions, they are handled via drawing undo USHORT nRedoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS; @@ -1323,7 +1323,7 @@ void __EXPORT ScUndoDragDrop::Redo() if (bCut) { ScRange aSrcPaintRange = aSrcRange; - pDoc->ExtendMerge( aSrcPaintRange ); // before deleting + pDoc->ExtendMerge( aSrcPaintRange ); // before deleting USHORT nExtFlags = 0; pDocShell->UpdatePaintExt( nExtFlags, aSrcPaintRange ); pDoc->DeleteAreaTab( aSrcRange, nRedoFlags ); @@ -1363,7 +1363,7 @@ void __EXPORT ScUndoDragDrop::Redo() ShowTable( aDestRange.aStart.Tab() ); RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo? - EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo? + EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo? EndRedo(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); @@ -1375,14 +1375,14 @@ void __EXPORT ScUndoDragDrop::Repeat(SfxRepeatTarget& /* rTarget */) BOOL __EXPORT ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - return FALSE; // geht nicht + return FALSE; // geht nicht } // ----------------------------------------------------------------------- // -// Liste der Bereichsnamen einfuegen -// (Einfuegen|Name|Einfuegen =>[Liste]) +// Liste der Bereichsnamen einfuegen +// (Einfuegen|Name|Einfuegen =>[Liste]) // ScUndoListNames::ScUndoListNames( ScDocShell* pNewDocShell, const ScRange& rRange, @@ -1445,13 +1445,13 @@ BOOL __EXPORT ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Szenario anwenden -// (Extras|Szenarien) +// Szenario anwenden +// (Extras|Szenarien) // ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell, const ScMarkData& rMark, -/*C*/ const ScArea& rDestArea, +/*C*/ const ScArea& rDestArea, ScDocument* pNewUndoDoc, const String& rNewName ) : ScSimpleUndo( pNewDocShell ), @@ -1492,7 +1492,7 @@ void __EXPORT ScUndoUseScenario::Undo() pDoc->DeleteSelection( IDF_ALL, aMarkData ); pUndoDoc->CopyToDocument( aRange, IDF_ALL, TRUE, pDoc, &aMarkData ); - // Szenario-Tabellen + // Szenario-Tabellen BOOL bFrame = FALSE; SCTAB nTab = aRange.aStart.Tab(); SCTAB nEndTab = nTab; @@ -1500,7 +1500,7 @@ void __EXPORT ScUndoUseScenario::Undo() ++nEndTab; for (SCTAB i = nTab+1; i<=nEndTab; i++) { - // Flags immer + // Flags immer String aComment; Color aColor; USHORT nScenFlags; @@ -1508,7 +1508,7 @@ void __EXPORT ScUndoUseScenario::Undo() pDoc->SetScenarioData( i, aComment, aColor, nScenFlags ); BOOL bActive = pUndoDoc->IsActiveScenario( i ); pDoc->SetActiveScenario( i, bActive ); - // Bei Zurueckkopier-Szenarios auch Inhalte + // Bei Zurueckkopier-Szenarios auch Inhalte if ( nScenFlags & SC_SCENARIO_TWOWAY ) { pDoc->DeleteAreaTab( 0,0, MAXCOL,MAXROW, i, IDF_ALL ); @@ -1518,7 +1518,7 @@ void __EXPORT ScUndoUseScenario::Undo() bFrame = TRUE; } - // Wenn sichtbare Rahmen, dann alles painten + // Wenn sichtbare Rahmen, dann alles painten if (bFrame) pDocShell->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_EXTRAS ); else @@ -1572,8 +1572,8 @@ BOOL __EXPORT ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Vorlage anwenden -// (Format|Vorlagenkatalog) +// Vorlage anwenden +// (Format|Vorlagenkatalog) // ScUndoSelectionStyle::ScUndoSelectionStyle( ScDocShell* pNewDocShell, @@ -1609,13 +1609,13 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo ) pViewShell->SetMarkData( aMarkData ); ScRange aWorkRange( aRange ); - if ( pDoc->HasAttrib( aWorkRange, HASATTR_MERGED ) ) // zusammengefasste Zellen? + if ( pDoc->HasAttrib( aWorkRange, HASATTR_MERGED ) ) // zusammengefasste Zellen? pDoc->ExtendMerge( aWorkRange, TRUE ); USHORT nExtFlags = 0; pDocShell->UpdatePaintExt( nExtFlags, aWorkRange ); - if (bUndo) // bei Undo alte Daten wieder reinschubsen + if (bUndo) // bei Undo alte Daten wieder reinschubsen { SCTAB nTabCount = pDoc->GetTableCount(); ScRange aCopyRange = aWorkRange; @@ -1623,7 +1623,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo ) aCopyRange.aEnd.SetTab(nTabCount-1); pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData ); } - else // bei Redo Style wieder zuweisen + else // bei Redo Style wieder zuweisen { ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool(); ScStyleSheet* pStyleSheet = @@ -1639,7 +1639,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo ) pDocShell->UpdatePaintExt( nExtFlags, aWorkRange ); if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) ) -/*A*/ pDocShell->PostPaint( aWorkRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags ); +/*A*/ pDocShell->PostPaint( aWorkRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags ); ShowTable( aWorkRange.aStart.Tab() ); } @@ -1690,7 +1690,7 @@ USHORT __EXPORT ScUndoSelectionStyle::GetId() const // ----------------------------------------------------------------------- // -// Matrix-Formel eingeben +// Matrix-Formel eingeben // ScUndoEnterMatrix::ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& rArea, @@ -1757,7 +1757,7 @@ void __EXPORT ScUndoEnterMatrix::Redo() pDoc->InsertMatrixFormula( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(), aBlockRange.aEnd.Col(), aBlockRange.aEnd.Row(), aDestMark, aFormula ); -// pDocShell->PostPaint( aBlockRange, PAINT_GRID ); // nicht noetig ??? +// pDocShell->PostPaint( aBlockRange, PAINT_GRID ); // nicht noetig ??? SetChangeTrack(); @@ -1780,7 +1780,7 @@ BOOL __EXPORT ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Einzug vermindern / erhoehen +// Einzug vermindern / erhoehen // ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark ) @@ -1851,7 +1851,7 @@ BOOL __EXPORT ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Transliteration for cells +// Transliteration for cells // ScUndoTransliterate::ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark, @@ -1912,7 +1912,7 @@ BOOL __EXPORT ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// einzelne Items per Which-IDs aus Bereich loeschen +// einzelne Items per Which-IDs aus Bereich loeschen // ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark, @@ -1982,7 +1982,7 @@ BOOL __EXPORT ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Alle Umbrueche einer Tabelle loeschen +// Alle Umbrueche einer Tabelle loeschen // ScUndoRemoveBreaks::ScUndoRemoveBreaks( ScDocShell* pNewDocShell, @@ -2050,7 +2050,7 @@ BOOL __EXPORT ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Zusammenfassung aufheben (fuer einen ganzen Bereich) +// Zusammenfassung aufheben (fuer einen ganzen Bereich) // ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell, @@ -2068,7 +2068,7 @@ __EXPORT ScUndoRemoveMerge::~ScUndoRemoveMerge() String __EXPORT ScUndoRemoveMerge::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "Zusammenfassung aufheben" + return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "Zusammenfassung aufheben" } void __EXPORT ScUndoRemoveMerge::Undo() @@ -2119,7 +2119,7 @@ void __EXPORT ScUndoRemoveMerge::Redo() // There is no need to extend merge area because it's already been extended. ScRange aRange = maOption.getSingleRange(nTab); - // ausfuehren + // ausfuehren const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE ); ScPatternAttr aPattern( pDoc->GetPool() ); @@ -2134,7 +2134,7 @@ void __EXPORT ScUndoRemoveMerge::Redo() pDoc->ExtendMerge(aRange, TRUE, FALSE); - // Paint + // Paint BOOL bDidPaint = FALSE; if ( pViewShell ) @@ -2169,7 +2169,7 @@ void ScUndoRemoveMerge::SetCurTab() // ----------------------------------------------------------------------- // -// nur Umrandung setzen, per ScRangeList (StarOne) +// nur Umrandung setzen, per ScRangeList (StarOne) // ScRange lcl_TotalRange( const ScRangeList& rRanges ) @@ -2221,7 +2221,7 @@ __EXPORT ScUndoBorder::~ScUndoBorder() String __EXPORT ScUndoBorder::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String? + return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String? } void __EXPORT ScUndoBorder::Undo() @@ -2241,7 +2241,7 @@ void __EXPORT ScUndoBorder::Redo() { BeginRedo(); - ScDocument* pDoc = pDocShell->GetDocument(); //! Funktion an docfunc aufrufen + ScDocument* pDoc = pDocShell->GetDocument(); //! Funktion an docfunc aufrufen ULONG nCount = pRanges->Count(); ULONG i; for (i=0; i<nCount; i++) @@ -2263,12 +2263,12 @@ void __EXPORT ScUndoBorder::Redo() void __EXPORT ScUndoBorder::Repeat(SfxRepeatTarget& /* rTarget */) { - //! spaeter (wenn die Funktion aus cellsuno nach docfunc gewandert ist) + //! spaeter (wenn die Funktion aus cellsuno nach docfunc gewandert ist) } BOOL __EXPORT ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - return FALSE; // s.o. + return FALSE; // s.o. } diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx index 4a46c61683c5..101dcc9b12e7 100644 --- a/sc/source/ui/undo/undoblk2.cxx +++ b/sc/source/ui/undo/undoblk2.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 @@ -53,14 +53,14 @@ // STATIC DATA ----------------------------------------------------------- -TYPEINIT1(ScUndoWidthOrHeight, SfxUndoAction); +TYPEINIT1(ScUndoWidthOrHeight, SfxUndoAction); // ----------------------------------------------------------------------- // -// Spaltenbreiten oder Zeilenhoehen aendern +// Spaltenbreiten oder Zeilenhoehen aendern // ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell, @@ -124,12 +124,12 @@ void __EXPORT ScUndoWidthOrHeight::Undo() { pViewShell->SetMarkData( aMarkData ); - nPaintStart = 0; // paint all, because of changed selection + nPaintStart = 0; // paint all, because of changed selection } } - //! outlines from all tables? - if (pUndoTab) // Outlines mit gespeichert? + //! outlines from all tables? + if (pUndoTab) // Outlines mit gespeichert? pDoc->SetOutlineTable( nStartTab, pUndoTab ); SCTAB nTabCount = pDoc->GetTableCount(); @@ -137,7 +137,7 @@ void __EXPORT ScUndoWidthOrHeight::Undo() for (nTab=0; nTab<nTabCount; nTab++) if (aMarkData.GetTableSelect(nTab)) { - if (bWidth) // Width + if (bWidth) // Width { pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, @@ -146,7 +146,7 @@ void __EXPORT ScUndoWidthOrHeight::Undo() pDocShell->PostPaint( static_cast<SCCOL>(nPaintStart), 0, nTab, MAXCOL, MAXROW, nTab, PAINT_GRID | PAINT_TOP ); } - else // Height + else // Height { pUndoDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pDoc ); pDoc->UpdatePageBreaks( nTab ); @@ -181,7 +181,7 @@ void __EXPORT ScUndoWidthOrHeight::Redo() { pViewShell->SetMarkData( aMarkData ); - bPaintAll = TRUE; // paint all, because of changed selection + bPaintAll = TRUE; // paint all, because of changed selection } } diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index f73e664a5bcd..6b25be0ef684 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.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,30 +65,30 @@ // STATIC DATA --------------------------------------------------------------- -TYPEINIT1(ScUndoDeleteContents, SfxUndoAction); -TYPEINIT1(ScUndoFillTable, SfxUndoAction); -TYPEINIT1(ScUndoSelectionAttr, SfxUndoAction); -TYPEINIT1(ScUndoAutoFill, SfxUndoAction); -TYPEINIT1(ScUndoMerge, SfxUndoAction); -TYPEINIT1(ScUndoAutoFormat, SfxUndoAction); -TYPEINIT1(ScUndoReplace, SfxUndoAction); -TYPEINIT1(ScUndoTabOp, SfxUndoAction); +TYPEINIT1(ScUndoDeleteContents, SfxUndoAction); +TYPEINIT1(ScUndoFillTable, SfxUndoAction); +TYPEINIT1(ScUndoSelectionAttr, SfxUndoAction); +TYPEINIT1(ScUndoAutoFill, SfxUndoAction); +TYPEINIT1(ScUndoMerge, SfxUndoAction); +TYPEINIT1(ScUndoAutoFormat, SfxUndoAction); +TYPEINIT1(ScUndoReplace, SfxUndoAction); +TYPEINIT1(ScUndoTabOp, SfxUndoAction); TYPEINIT1(ScUndoConversion, SfxUndoAction); TYPEINIT1(ScUndoRefConversion, SfxUndoAction); -TYPEINIT1(ScUndoRefreshLink, SfxUndoAction); -TYPEINIT1(ScUndoInsertAreaLink, SfxUndoAction); -TYPEINIT1(ScUndoRemoveAreaLink, SfxUndoAction); -TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction); +TYPEINIT1(ScUndoRefreshLink, SfxUndoAction); +TYPEINIT1(ScUndoInsertAreaLink, SfxUndoAction); +TYPEINIT1(ScUndoRemoveAreaLink, SfxUndoAction); +TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction); // To Do: -/*A*/ // SetOptimalHeight auf Dokument, wenn keine View +/*A*/ // SetOptimalHeight auf Dokument, wenn keine View //============================================================================ -// class ScUndoDeleteContents +// class ScUndoDeleteContents // -// Inhalte loeschen +// Inhalte loeschen //---------------------------------------------------------------------------- @@ -98,20 +98,20 @@ ScUndoDeleteContents::ScUndoDeleteContents( ScDocument* pNewUndoDoc, BOOL bNewMulti, USHORT nNewFlags, BOOL bObjects ) // - : ScSimpleUndo( pNewDocShell ), + : ScSimpleUndo( pNewDocShell ), // - aRange ( rRange ), - aMarkData ( rMark ), - pUndoDoc ( pNewUndoDoc ), - pDrawUndo ( NULL ), - nFlags ( nNewFlags ), - bMulti ( bNewMulti ) // ueberliquid + aRange ( rRange ), + aMarkData ( rMark ), + pUndoDoc ( pNewUndoDoc ), + pDrawUndo ( NULL ), + nFlags ( nNewFlags ), + bMulti ( bNewMulti ) // ueberliquid { if (bObjects) pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() ); - if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) ) // keine Zelle markiert: - aMarkData.SetMarkArea( aRange ); // Zelle unter Cursor markieren + if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) ) // keine Zelle markiert: + aMarkData.SetMarkArea( aRange ); // Zelle unter Cursor markieren SetChangeTrack(); } @@ -130,7 +130,7 @@ __EXPORT ScUndoDeleteContents::~ScUndoDeleteContents() String __EXPORT ScUndoDeleteContents::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Loeschen" + return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Loeschen" } @@ -157,15 +157,15 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo ) USHORT nExtFlags = 0; - if (bUndo) // nur Undo + if (bUndo) // nur Undo { - USHORT nUndoFlags = IDF_NONE; // entweder alle oder keine Inhalte kopieren - if (nFlags & IDF_CONTENTS) // (es sind nur die richtigen ins UndoDoc kopiert worden) + USHORT nUndoFlags = IDF_NONE; // entweder alle oder keine Inhalte kopieren + if (nFlags & IDF_CONTENTS) // (es sind nur die richtigen ins UndoDoc kopiert worden) nUndoFlags |= IDF_CONTENTS; if (nFlags & IDF_ATTRIB) nUndoFlags |= IDF_ATTRIB; - if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute - nUndoFlags |= IDF_STRING; // -> Zellen werden geaendert + if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute + nUndoFlags |= IDF_STRING; // -> Zellen werden geaendert // do not create clones of note captions, they will be restored via drawing undo nUndoFlags |= IDF_NOCAPTIONS; @@ -182,11 +182,11 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo ) if ( pChangeTrack ) pChangeTrack->Undo( nStartChangeAction, nEndChangeAction ); - pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content after the change + pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content after the change } - else // nur Redo + else // nur Redo { - pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content before the change + pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content before the change aMarkData.MarkToMulti(); RedoSdrUndoAction( pDrawUndo ); @@ -200,7 +200,7 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo ) if ( !( (pViewShell) && pViewShell->AdjustRowHeight( aRange.aStart.Row(), aRange.aEnd.Row() ) ) ) -/*A*/ pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags ); +/*A*/ pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags ); pDocShell->PostDataChanged(); if (pViewShell) @@ -266,10 +266,10 @@ BOOL __EXPORT ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const //============================================================================ -// class ScUndoFillTable +// class ScUndoFillTable // -// Tabellen ausfuellen -// (Bearbeiten|Ausfuellen|...) +// Tabellen ausfuellen +// (Bearbeiten|Ausfuellen|...) //---------------------------------------------------------------------------- @@ -280,17 +280,17 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell, ScDocument* pNewUndoDoc, BOOL bNewMulti, SCTAB nSrc, USHORT nFlg, USHORT nFunc, BOOL bSkip, BOOL bLink ) // - : ScSimpleUndo( pNewDocShell ), + : ScSimpleUndo( pNewDocShell ), // - aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), - aMarkData ( rMark ), - pUndoDoc ( pNewUndoDoc ), - nFlags ( nFlg ), - nFunction ( nFunc ), - nSrcTab ( nSrc ), - bMulti ( bNewMulti ), - bSkipEmpty ( bSkip ), - bAsLink ( bLink ) + aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), + aMarkData ( rMark ), + pUndoDoc ( pNewUndoDoc ), + nFlags ( nFlg ), + nFunction ( nFunc ), + nSrcTab ( nSrc ), + bMulti ( bNewMulti ), + bSkipEmpty ( bSkip ), + bAsLink ( bLink ) { SetChangeTrack(); } @@ -349,7 +349,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo ) if (pViewShell) pViewShell->SetMarkData( aMarkData ); - if (bUndo) // nur Undo + if (bUndo) // nur Undo { SCTAB nTabCount = pDoc->GetTableCount(); ScRange aWorkRange(aRange); @@ -369,7 +369,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo ) if ( pChangeTrack ) pChangeTrack->Undo( nStartChangeAction, nEndChangeAction ); } - else // nur Redo + else // nur Redo { aMarkData.MarkToMulti(); pDoc->FillTabMarked( nSrcTab, aMarkData, nFlags, nFunction, bSkipEmpty, bAsLink ); @@ -380,7 +380,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo ) pDocShell->PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_GRID|PAINT_EXTRAS); pDocShell->PostDataChanged(); - // CellContentChanged kommt mit der Markierung + // CellContentChanged kommt mit der Markierung if (pViewShell) { @@ -388,7 +388,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo ) if ( !aMarkData.GetTableSelect(nTab) ) pViewShell->SetTabNo( nSrcTab ); - pViewShell->DoneBlockMode(); // gibt sonst Probleme, weil Markierung auf falscher Tabelle + pViewShell->DoneBlockMode(); // gibt sonst Probleme, weil Markierung auf falscher Tabelle } } @@ -431,9 +431,9 @@ BOOL __EXPORT ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const //============================================================================ -// class ScUndoSelectionAttr +// class ScUndoSelectionAttr // -// Zellformat aendern +// Zellformat aendern //---------------------------------------------------------------------------- @@ -445,12 +445,12 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell, const ScPatternAttr* pNewApply, const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner ) // - : ScSimpleUndo( pNewDocShell ), + : ScSimpleUndo( pNewDocShell ), // - aMarkData ( rMark ), - aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), - pUndoDoc ( pNewUndoDoc ), - bMulti ( bNewMulti ) + aMarkData ( rMark ), + aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), + pUndoDoc ( pNewUndoDoc ), + bMulti ( bNewMulti ) { ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool(); pApplyPattern = (ScPatternAttr*) &pPool->Put( *pNewApply ); @@ -500,7 +500,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo ) pViewShell->SetMarkData( aMarkData ); ScRange aEffRange( aRange ); - if ( pDoc->HasAttrib( aEffRange, HASATTR_MERGED ) ) // zusammengefasste Zellen? + if ( pDoc->HasAttrib( aEffRange, HASATTR_MERGED ) ) // zusammengefasste Zellen? pDoc->ExtendMerge( aEffRange ); USHORT nExtFlags = 0; @@ -508,7 +508,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo ) ChangeEditData(bUndo); - if (bUndo) // nur bei Undo + if (bUndo) // nur bei Undo { ScRange aCopyRange = aRange; SCTAB nTabCount = pDoc->GetTableCount(); @@ -516,7 +516,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo ) aCopyRange.aEnd.SetTab(nTabCount-1); pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, bMulti, pDoc, &aMarkData ); } - else // nur bei Redo + else // nur bei Redo { aMarkData.MarkToMulti(); pDoc->ApplySelectionPattern( *pApplyPattern, aMarkData ); @@ -527,7 +527,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo ) } if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) ) -/*A*/ pDocShell->PostPaint( aEffRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags ); +/*A*/ pDocShell->PostPaint( aEffRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags ); ShowTable( aRange ); } @@ -595,9 +595,9 @@ BOOL __EXPORT ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const //============================================================================ -// class ScUndoAutoFill +// class ScUndoAutoFill // -// Auto-Fill (nur einfache Bloecke) +// Auto-Fill (nur einfache Bloecke) //---------------------------------------------------------------------------- @@ -608,18 +608,18 @@ ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell, double fNewStartValue, double fNewStepValue, double fNewMaxValue, USHORT nMaxShIndex ) // - : ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ), + : ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ), // - aSource ( rSourceArea ), - aMarkData ( rMark ), - pUndoDoc ( pNewUndoDoc ), - eFillDir ( eNewFillDir ), - eFillCmd ( eNewFillCmd ), - eFillDateCmd ( eNewFillDateCmd ), - fStartValue ( fNewStartValue ), - fStepValue ( fNewStepValue ), - fMaxValue ( fNewMaxValue ), - nMaxSharedIndex ( nMaxShIndex) + aSource ( rSourceArea ), + aMarkData ( rMark ), + pUndoDoc ( pNewUndoDoc ), + eFillDir ( eNewFillDir ), + eFillCmd ( eNewFillCmd ), + eFillDateCmd ( eNewFillDateCmd ), + fStartValue ( fNewStartValue ), + fStepValue ( fNewStepValue ), + fMaxValue ( fNewMaxValue ), + nMaxSharedIndex ( nMaxShIndex) { SetChangeTrack(); } @@ -725,7 +725,7 @@ void __EXPORT ScUndoAutoFill::Redo() { BeginRedo(); -//! Tabellen selektieren +//! Tabellen selektieren SCCOLROW nCount = 0; switch (eFillDir) @@ -795,16 +795,16 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const //============================================================================ -// class ScUndoMerge +// class ScUndoMerge // -// Zellen zusammenfassen / Zusammenfassung aufheben +// Zellen zusammenfassen / Zusammenfassung aufheben //---------------------------------------------------------------------------- ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo ) // - : ScSimpleUndo( pNewDocShell ), + : ScSimpleUndo( pNewDocShell ), // maOption(rOption), mbMergeContents( bMergeContents ), @@ -951,9 +951,9 @@ BOOL ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const //============================================================================ -// class ScUndoAutoFormat +// class ScUndoAutoFormat // -// Auto-Format (nur einfache Bloecke) +// Auto-Format (nur einfache Bloecke) //---------------------------------------------------------------------------- @@ -961,12 +961,12 @@ ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell, const ScRange& rRange, ScDocument* pNewUndoDoc, const ScMarkData& rMark, BOOL bNewSize, USHORT nNewFormatNo ) // - : ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ), + : ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ), // - pUndoDoc ( pNewUndoDoc ), - aMarkData ( rMark ), - bSize ( bNewSize ), - nFormatNo ( nNewFormatNo ) + pUndoDoc ( pNewUndoDoc ), + aMarkData ( rMark ), + bSize ( bNewSize ), + nFormatNo ( nNewFormatNo ) { } @@ -983,7 +983,7 @@ __EXPORT ScUndoAutoFormat::~ScUndoAutoFormat() String __EXPORT ScUndoAutoFormat::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format" + return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format" } @@ -996,8 +996,8 @@ void __EXPORT ScUndoAutoFormat::Undo() ScDocument* pDoc = pDocShell->GetDocument(); // Attribute -// pDoc->DeleteAreaTab( aBlockRange, IDF_ATTRIB ); -// pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, FALSE, pDoc ); +// pDoc->DeleteAreaTab( aBlockRange, IDF_ATTRIB ); +// pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, FALSE, pDoc ); SCTAB nTabCount = pDoc->GetTableCount(); pDoc->DeleteArea( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(), @@ -1066,12 +1066,12 @@ void __EXPORT ScUndoAutoFormat::Redo() } else { - // Zoom auf 100 lassen + // Zoom auf 100 lassen nPPTX = ScGlobal::nScreenPPTX; nPPTY = ScGlobal::nScreenPPTY; } - BOOL bFormula = FALSE; //! merken + BOOL bFormula = FALSE; //! merken for (SCTAB nTab=nStartZ; nTab<=nEndZ; nTab++) { @@ -1133,9 +1133,9 @@ BOOL __EXPORT ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const //============================================================================ -// class ScUndoReplace +// class ScUndoReplace // -// Ersetzen +// Ersetzen //---------------------------------------------------------------------------- @@ -1144,12 +1144,12 @@ ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark, const String& rNewUndoStr, ScDocument* pNewUndoDoc, const SvxSearchItem* pItem ) // - : ScSimpleUndo( pNewDocShell ), + : ScSimpleUndo( pNewDocShell ), // - aCursorPos ( nCurX, nCurY, nCurZ ), - aMarkData ( rMark ), - aUndoStr ( rNewUndoStr ), - pUndoDoc ( pNewUndoDoc ) + aCursorPos ( nCurX, nCurY, nCurZ ), + aMarkData ( rMark ), + aUndoStr ( rNewUndoStr ), + pUndoDoc ( pNewUndoDoc ) { pSearchItem = new SvxSearchItem( *pItem ); SetChangeTrack(); @@ -1174,10 +1174,10 @@ void ScUndoReplace::SetChangeTrack() if ( pChangeTrack ) { if ( pUndoDoc ) - { //! im UndoDoc stehen nur die geaenderten Zellen, + { //! im UndoDoc stehen nur die geaenderten Zellen, // deswegen per Iterator moeglich pChangeTrack->AppendContentsIfInRefDoc( pUndoDoc, - nStartChangeAction, nEndChangeAction ); + nStartChangeAction, nEndChangeAction ); } else { @@ -1198,7 +1198,7 @@ void ScUndoReplace::SetChangeTrack() String __EXPORT ScUndoReplace::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Ersetzen" + return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Ersetzen" } @@ -1213,7 +1213,7 @@ void __EXPORT ScUndoReplace::Undo() ShowTable( aCursorPos.Tab() ); - if (pUndoDoc) // nur bei ReplaceAll !! + if (pUndoDoc) // nur bei ReplaceAll !! { DBG_ASSERT(pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE_ALL, "ScUndoReplace:: Falscher Modus"); @@ -1221,22 +1221,22 @@ void __EXPORT ScUndoReplace::Undo() if (pViewShell) pViewShell->SetMarkData( aMarkData ); -//! markierte Tabellen -//! Bereich merken ? +//! markierte Tabellen +//! Bereich merken ? - // Undo-Dokument hat keine Zeilen-/Spalten-Infos, also mit bColRowFlags = FALSE - // kopieren, um Outline-Gruppen nicht kaputtzumachen. + // Undo-Dokument hat keine Zeilen-/Spalten-Infos, also mit bColRowFlags = FALSE + // kopieren, um Outline-Gruppen nicht kaputtzumachen. USHORT nUndoFlags = (pSearchItem->GetPattern()) ? IDF_ATTRIB : IDF_CONTENTS; pUndoDoc->CopyToDocument( 0, 0, 0, MAXCOL, MAXROW, MAXTAB, - nUndoFlags, FALSE, pDoc, NULL, FALSE ); // ohne Row-Flags + nUndoFlags, FALSE, pDoc, NULL, FALSE ); // ohne Row-Flags pDocShell->PostPaintGridAll(); } else if (pSearchItem->GetPattern() && pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE) { - String aTempStr = pSearchItem->GetSearchString(); // vertauschen + String aTempStr = pSearchItem->GetSearchString(); // vertauschen pSearchItem->SetSearchString(pSearchItem->GetReplaceString()); pSearchItem->SetReplaceString(aTempStr); pDoc->ReplaceStyle( *pSearchItem, @@ -1337,9 +1337,9 @@ BOOL __EXPORT ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const //============================================================================ -// class ScUndoTabOp +// class ScUndoTabOp // -// Mehrfachoperation (nur einfache Bloecke) +// Mehrfachoperation (nur einfache Bloecke) //---------------------------------------------------------------------------- @@ -1352,15 +1352,15 @@ ScUndoTabOp::ScUndoTabOp( ScDocShell* pNewDocShell, const ScRefAddress& rColCell, BYTE nMd ) // - : ScSimpleUndo( pNewDocShell ), + : ScSimpleUndo( pNewDocShell ), // - aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), - pUndoDoc ( pNewUndoDoc ), - theFormulaCell ( rFormulaCell ), - theFormulaEnd ( rFormulaEnd ), - theRowCell ( rRowCell ), - theColCell ( rColCell ), - nMode ( nMd ) + aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), + pUndoDoc ( pNewUndoDoc ), + theFormulaCell ( rFormulaCell ), + theFormulaEnd ( rFormulaEnd ), + theRowCell ( rRowCell ), + theColCell ( rColCell ), + nMode ( nMd ) { } @@ -1377,7 +1377,7 @@ __EXPORT ScUndoTabOp::~ScUndoTabOp() String __EXPORT ScUndoTabOp::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Mehrfachoperation" + return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Mehrfachoperation" } @@ -1443,7 +1443,7 @@ BOOL __EXPORT ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const //============================================================================ // class ScUndoConversion // -// Spelling +// Spelling //---------------------------------------------------------------------------- @@ -1524,7 +1524,7 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo pViewShell->SetMarkData( aMarkData ); SCTAB nTabCount = pDoc->GetTableCount(); - // Undo/Redo-doc has only selected tables + // Undo/Redo-doc has only selected tables BOOL bMulti = aMarkData.IsMultiMarked(); pRefDoc->CopyToDocument( 0, 0, 0, @@ -1583,7 +1583,7 @@ BOOL ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const //============================================================================ // class ScUndoRefConversion // -// cell reference conversion +// cell reference conversion //---------------------------------------------------------------------------- @@ -1592,9 +1592,9 @@ ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, BOOL bNewMulti, USHORT nNewFlag) : ScSimpleUndo( pNewDocShell ), aMarkData ( rMark ), -pUndoDoc ( pNewUndoDoc ), -pRedoDoc ( pNewRedoDoc ), -aRange ( aMarkRange ), +pUndoDoc ( pNewUndoDoc ), +pRedoDoc ( pNewRedoDoc ), +aRange ( aMarkRange ), bMulti ( bNewMulti ), nFlags ( nNewFlag ) { @@ -1673,16 +1673,16 @@ BOOL __EXPORT ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const return (rTarget.ISA(ScTabViewTarget)); } //============================================================================ -// class ScUndoRefreshLink +// class ScUndoRefreshLink // -// Link aktualisieren / aendern +// Link aktualisieren / aendern //---------------------------------------------------------------------------- ScUndoRefreshLink::ScUndoRefreshLink( ScDocShell* pNewDocShell, ScDocument* pNewUndoDoc ) // - : ScSimpleUndo( pNewDocShell ), + : ScSimpleUndo( pNewDocShell ), // pUndoDoc( pNewUndoDoc ), pRedoDoc( NULL ) @@ -1732,7 +1732,7 @@ void __EXPORT ScUndoRefreshLink::Undo() pRedoDoc->AddUndoTab( nTab, nTab, TRUE, TRUE ); bFirst = FALSE; pDoc->CopyToDocument(aRange, IDF_ALL, FALSE, pRedoDoc); -// pRedoDoc->TransferDrawPage( pDoc, nTab, nTab ); +// pRedoDoc->TransferDrawPage( pDoc, nTab, nTab ); pRedoDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), pDoc->GetLinkDoc(nTab), @@ -1744,7 +1744,7 @@ void __EXPORT ScUndoRefreshLink::Undo() pDoc->DeleteAreaTab( aRange,IDF_ALL ); pUndoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc ); -// pDoc->TransferDrawPage( pUndoDoc, nTab, nTab ); +// pDoc->TransferDrawPage( pUndoDoc, nTab, nTab ); pDoc->SetLink( nTab, pUndoDoc->GetLinkMode(nTab), pUndoDoc->GetLinkDoc(nTab), pUndoDoc->GetLinkFlt(nTab), pUndoDoc->GetLinkOpt(nTab), pUndoDoc->GetLinkTab(nTab), @@ -1774,7 +1774,7 @@ void __EXPORT ScUndoRefreshLink::Redo() pDoc->DeleteAreaTab( aRange, IDF_ALL ); pRedoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc ); -// pDoc->TransferDrawPage( pRedoDoc, nTab, nTab ); +// pDoc->TransferDrawPage( pRedoDoc, nTab, nTab ); pDoc->SetLink( nTab, pRedoDoc->GetLinkMode(nTab), pRedoDoc->GetLinkDoc(nTab), @@ -1794,7 +1794,7 @@ void __EXPORT ScUndoRefreshLink::Redo() void __EXPORT ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */) { - // gippsnich + // gippsnich } @@ -1828,9 +1828,9 @@ ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDo //============================================================================ -// class ScUndoInsertAreaLink +// class ScUndoInsertAreaLink // -// Bereichs-Verknuepfung einfuegen +// Bereichs-Verknuepfung einfuegen //---------------------------------------------------------------------------- @@ -1840,14 +1840,14 @@ ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell, const String& rArea, const ScRange& rDestRange, ULONG nRefresh ) // - : ScSimpleUndo ( pShell ), + : ScSimpleUndo ( pShell ), // - aDocName ( rDoc ), - aFltName ( rFlt ), - aOptions ( rOpt ), - aAreaName ( rArea ), - aRange ( rDestRange ), - nRefreshDelay ( nRefresh ) + aDocName ( rDoc ), + aFltName ( rFlt ), + aOptions ( rOpt ), + aAreaName ( rArea ), + aRange ( rDestRange ), + nRefreshDelay ( nRefresh ) { } @@ -1879,7 +1879,7 @@ void __EXPORT ScUndoInsertAreaLink::Undo() if (pLink) pLinkManager->Remove( pLink ); - SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator } @@ -1898,7 +1898,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo() pLink->Update(); pLink->SetInCreate( FALSE ); - SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator } @@ -1906,7 +1906,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo() void __EXPORT ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) { - //! .... + //! .... } @@ -1919,9 +1919,9 @@ BOOL __EXPORT ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co //============================================================================ -// class ScUndoRemoveAreaLink +// class ScUndoRemoveAreaLink // -// Bereichs-Verknuepfung loeschen +// Bereichs-Verknuepfung loeschen //---------------------------------------------------------------------------- @@ -1930,14 +1930,14 @@ ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell, const String& rArea, const ScRange& rDestRange, ULONG nRefresh ) // - : ScSimpleUndo ( pShell ), + : ScSimpleUndo ( pShell ), // - aDocName ( rDoc ), - aFltName ( rFlt ), - aOptions ( rOpt ), - aAreaName ( rArea ), - aRange ( rDestRange ), - nRefreshDelay ( nRefresh ) + aDocName ( rDoc ), + aFltName ( rFlt ), + aOptions ( rOpt ), + aAreaName ( rArea ), + aRange ( rDestRange ), + nRefreshDelay ( nRefresh ) { } @@ -1953,7 +1953,7 @@ __EXPORT ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink() String __EXPORT ScUndoRemoveAreaLink::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ?? + return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ?? } @@ -1972,7 +1972,7 @@ void __EXPORT ScUndoRemoveAreaLink::Undo() pLink->Update(); pLink->SetInCreate( FALSE ); - SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator } @@ -1988,7 +1988,7 @@ void __EXPORT ScUndoRemoveAreaLink::Redo() if (pLink) pLinkManager->Remove( pLink ); - SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator } @@ -1996,7 +1996,7 @@ void __EXPORT ScUndoRemoveAreaLink::Redo() void __EXPORT ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) { - // gippsnich + // gippsnich } @@ -2009,9 +2009,9 @@ BOOL __EXPORT ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co //============================================================================ -// class ScUndoUpdateAreaLink +// class ScUndoUpdateAreaLink // -// Bereichs-Verknuepfung aktualisieren +// Bereichs-Verknuepfung aktualisieren //---------------------------------------------------------------------------- @@ -2022,23 +2022,23 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell, const String& rNewA, const ScRange& rNewR, ULONG nNewRD, ScDocument* pUndo, ScDocument* pRedo, BOOL bDoInsert ) // - : ScSimpleUndo( pShell ), + : ScSimpleUndo( pShell ), // - aOldDoc ( rOldD ), - aOldFlt ( rOldF ), - aOldOpt ( rOldO ), - aOldArea ( rOldA ), - aOldRange ( rOldR ), - aNewDoc ( rNewD ), - aNewFlt ( rNewF ), - aNewOpt ( rNewO ), - aNewArea ( rNewA ), - aNewRange ( rNewR ), - pUndoDoc ( pUndo ), - pRedoDoc ( pRedo ), - nOldRefresh ( nOldRD ), - nNewRefresh ( nNewRD ), - bWithInsert ( bDoInsert ) + aOldDoc ( rOldD ), + aOldFlt ( rOldF ), + aOldOpt ( rOldO ), + aOldArea ( rOldA ), + aOldRange ( rOldR ), + aNewDoc ( rNewD ), + aNewFlt ( rNewF ), + aNewOpt ( rNewO ), + aNewArea ( rNewA ), + aNewRange ( rNewR ), + pUndoDoc ( pUndo ), + pRedoDoc ( pRedo ), + nOldRefresh ( nOldRD ), + nNewRefresh ( nNewRD ), + bWithInsert ( bDoInsert ) { DBG_ASSERT( aOldRange.aStart == aNewRange.aStart, "AreaLink verschoben ?" ); } @@ -2057,7 +2057,7 @@ __EXPORT ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink() String __EXPORT ScUndoUpdateAreaLink::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! eigener Text ?? + return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! eigener Text ?? } @@ -2069,7 +2069,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const SCCOL nEndX = Max( aOldRange.aEnd.Col(), aNewRange.aEnd.Col() ); SCROW nEndY = Max( aOldRange.aEnd.Row(), aNewRange.aEnd.Row() ); - SCTAB nEndZ = Max( aOldRange.aEnd.Tab(), aNewRange.aEnd.Tab() ); //? + SCTAB nEndZ = Max( aOldRange.aEnd.Tab(), aNewRange.aEnd.Tab() ); //? if ( bUndo ) { @@ -2105,7 +2105,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const ScRange aWorkRange( aNewRange.aStart, ScAddress( nEndX, nEndY, nEndZ ) ); pDoc->ExtendMerge( aWorkRange, TRUE ); - // Paint + // Paint if ( aNewRange.aEnd.Col() != aOldRange.aEnd.Col() ) aWorkRange.aEnd.SetCol(MAXCOL); @@ -2132,7 +2132,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo() aNewArea, aNewRange ); if (pLink) { - pLink->SetSource( aOldDoc, aOldFlt, aOldOpt, aOldArea ); // alte Werte im Link + pLink->SetSource( aOldDoc, aOldFlt, aOldOpt, aOldArea ); // alte Werte im Link pLink->SetDestArea( aOldRange ); pLink->SetRefreshDelay( nOldRefresh ); } @@ -2151,7 +2151,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo() aOldArea, aOldRange ); if (pLink) { - pLink->SetSource( aNewDoc, aNewFlt, aNewOpt, aNewArea ); // neue Werte im Link + pLink->SetSource( aNewDoc, aNewFlt, aNewOpt, aNewArea ); // neue Werte im Link pLink->SetDestArea( aNewRange ); pLink->SetRefreshDelay( nNewRefresh ); } @@ -2164,7 +2164,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo() void __EXPORT ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) { - // gippsnich + // gippsnich } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 65e903c42990..0a96ee409fd3 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.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 @@ -74,7 +74,7 @@ TYPEINIT1(ScUndoRangeNames, ScSimpleUndo); // ----------------------------------------------------------------------- // -// Attribute auf Cursor anwenden +// Attribute auf Cursor anwenden // ScUndoCursorAttr::ScUndoCursorAttr( ScDocShell* pNewDocShell, @@ -105,9 +105,9 @@ __EXPORT ScUndoCursorAttr::~ScUndoCursorAttr() String __EXPORT ScUndoCursorAttr::GetComment() const { - //! eigener Text fuer automatische Attributierung + //! eigener Text fuer automatische Attributierung - USHORT nId = STR_UNDO_CURSORATTR; // "Attribute" + USHORT nId = STR_UNDO_CURSORATTR; // "Attribute" return ScGlobal::GetRscString( nId ); } @@ -155,8 +155,8 @@ void __EXPORT ScUndoCursorAttr::Undo() if ( bIsAutomatic ) { - // wenn automatische Formatierung rueckgaengig gemacht wird, - // soll auch nicht weiter automatisch formatiert werden: + // wenn automatische Formatierung rueckgaengig gemacht wird, + // soll auch nicht weiter automatisch formatiert werden: ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) @@ -187,7 +187,7 @@ BOOL __EXPORT ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Daten eingeben +// Daten eingeben // ScUndoEnterData::ScUndoEnterData( ScDocShell* pNewDocShell, @@ -231,8 +231,8 @@ String __EXPORT ScUndoEnterData::GetComment() const void ScUndoEnterData::DoChange() const { - // Zeilenhoehe anpassen - //! nur wenn noetig (alte oder neue EditZelle, oder Attribute) ?? + // Zeilenhoehe anpassen + //! nur wenn noetig (alte oder neue EditZelle, oder Attribute) ?? for (USHORT i=0; i<nCount; i++) pDocShell->AdjustRowHeight( nRow, nRow, pTabs[i] ); @@ -265,7 +265,7 @@ void ScUndoEnterData::SetChangeTrack() pChangeTrack->AppendContent( aPos, ppOldCells[i], nFormat ); } if ( nEndChangeAction > pChangeTrack->GetActionMax() ) - nEndChangeAction = 0; // nichts appended + nEndChangeAction = 0; // nichts appended } else nEndChangeAction = 0; @@ -366,16 +366,16 @@ BOOL __EXPORT ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Wert aendern +// Wert aendern // ScUndoEnterValue::ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos, ScBaseCell* pUndoCell, double nVal, BOOL bHeight ) : ScSimpleUndo( pNewDocShell ), - aPos ( rNewPos ), - pOldCell ( pUndoCell ), - nValue ( nVal ), - bNeedHeight ( bHeight ) + aPos ( rNewPos ), + pOldCell ( pUndoCell ), + nValue ( nVal ), + bNeedHeight ( bHeight ) { SetChangeTrack(); } @@ -400,7 +400,7 @@ void ScUndoEnterValue::SetChangeTrack() nEndChangeAction = pChangeTrack->GetActionMax() + 1; pChangeTrack->AppendContent( aPos, pOldCell ); if ( nEndChangeAction > pChangeTrack->GetActionMax() ) - nEndChangeAction = 0; // nichts appended + nEndChangeAction = 0; // nichts appended } else nEndChangeAction = 0; @@ -439,7 +439,7 @@ void __EXPORT ScUndoEnterValue::Redo() void __EXPORT ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */) { - // gippsnich + // gippsnich } BOOL __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const @@ -450,16 +450,16 @@ BOOL __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const // ----------------------------------------------------------------------- // -// Beliebige Zelle eingeben +// Beliebige Zelle eingeben // ScUndoPutCell::ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos, ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, BOOL bHeight ) : ScSimpleUndo( pNewDocShell ), - aPos ( rNewPos ), - pOldCell ( pUndoCell ), + aPos ( rNewPos ), + pOldCell ( pUndoCell ), pEnteredCell( pRedoCell ), - bNeedHeight ( bHeight ) + bNeedHeight ( bHeight ) { SetChangeTrack(); } @@ -486,7 +486,7 @@ void ScUndoPutCell::SetChangeTrack() nEndChangeAction = pChangeTrack->GetActionMax() + 1; pChangeTrack->AppendContent( aPos, pOldCell ); if ( nEndChangeAction > pChangeTrack->GetActionMax() ) - nEndChangeAction = 0; // nichts appended + nEndChangeAction = 0; // nichts appended } else nEndChangeAction = 0; @@ -528,7 +528,7 @@ void __EXPORT ScUndoPutCell::Redo() void __EXPORT ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */) { - // gippsnich + // gippsnich } BOOL __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const @@ -539,7 +539,7 @@ BOOL __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const // ----------------------------------------------------------------------- // -// Seitenumbrueche +// Seitenumbrueche // ScUndoPageBreak::ScUndoPageBreak( ScDocShell* pNewDocShell, @@ -624,7 +624,7 @@ BOOL __EXPORT ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Druck-Skalierung +// Druck-Skalierung // ScUndoPrintZoom::ScUndoPrintZoom( ScDocShell* pNewDocShell, @@ -700,7 +700,7 @@ BOOL __EXPORT ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Thesaurus +// Thesaurus // ScUndoThesaurus::ScUndoThesaurus( ScDocShell* pNewDocShell, @@ -734,7 +734,7 @@ __EXPORT ScUndoThesaurus::~ScUndoThesaurus() String __EXPORT ScUndoThesaurus::GetComment() const { - return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus" + return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus" } void ScUndoThesaurus::SetChangeTrack( ScBaseCell* pOldCell ) @@ -745,7 +745,7 @@ void ScUndoThesaurus::SetChangeTrack( ScBaseCell* pOldCell ) nEndChangeAction = pChangeTrack->GetActionMax() + 1; pChangeTrack->AppendContent( ScAddress( nCol, nRow, nTab ), pOldCell ); if ( nEndChangeAction > pChangeTrack->GetActionMax() ) - nEndChangeAction = 0; // nichts appended + nEndChangeAction = 0; // nichts appended } else nEndChangeAction = 0; @@ -969,16 +969,16 @@ String ScUndoShowHideNote::GetComment() const // ----------------------------------------------------------------------- // -// Detektiv +// Detektiv // ScUndoDetective::ScUndoDetective( ScDocShell* pNewDocShell, SdrUndoAction* pDraw, const ScDetOpData* pOperation, ScDetOpList* pUndoList ) : ScSimpleUndo( pNewDocShell ), - pOldList ( pUndoList ), - nAction ( 0 ), - pDrawUndo ( pDraw ) + pOldList ( pUndoList ), + nAction ( 0 ), + pDrawUndo ( pDraw ) { bIsDelete = ( pOperation == NULL ); if (!bIsDelete) @@ -1000,11 +1000,11 @@ String __EXPORT ScUndoDetective::GetComment() const if ( !bIsDelete ) switch ( (ScDetOpType) nAction ) { - case SCDETOP_ADDSUCC: nId = STR_UNDO_DETADDSUCC; break; - case SCDETOP_DELSUCC: nId = STR_UNDO_DETDELSUCC; break; - case SCDETOP_ADDPRED: nId = STR_UNDO_DETADDPRED; break; - case SCDETOP_DELPRED: nId = STR_UNDO_DETDELPRED; break; - case SCDETOP_ADDERROR: nId = STR_UNDO_DETADDERROR; break; + case SCDETOP_ADDSUCC: nId = STR_UNDO_DETADDSUCC; break; + case SCDETOP_DELSUCC: nId = STR_UNDO_DETDELSUCC; break; + case SCDETOP_ADDPRED: nId = STR_UNDO_DETADDPRED; break; + case SCDETOP_DELPRED: nId = STR_UNDO_DETDELPRED; break; + case SCDETOP_ADDERROR: nId = STR_UNDO_DETADDERROR; break; } return ScGlobal::GetRscString( nId ); @@ -1025,7 +1025,7 @@ void __EXPORT ScUndoDetective::Undo() } else { - // Eintrag aus der Liste loeschen + // Eintrag aus der Liste loeschen ScDetOpList* pList = pDoc->GetDetOpList(); if (pList && pList->Count()) @@ -1043,7 +1043,7 @@ void __EXPORT ScUndoDetective::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->RecalcPPT(); //! use broadcast instead? + pViewShell->RecalcPPT(); //! use broadcast instead? EndUndo(); } @@ -1063,14 +1063,14 @@ void __EXPORT ScUndoDetective::Redo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->RecalcPPT(); //! use broadcast instead? + pViewShell->RecalcPPT(); //! use broadcast instead? EndRedo(); } void __EXPORT ScUndoDetective::Repeat(SfxRepeatTarget& /* rTarget */) { - // hammanich + // hammanich } BOOL __EXPORT ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const @@ -1080,14 +1080,14 @@ BOOL __EXPORT ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const // ----------------------------------------------------------------------- // -// Benannte Bereiche +// Benannte Bereiche // ScUndoRangeNames::ScUndoRangeNames( ScDocShell* pNewDocShell, ScRangeName* pOld, ScRangeName* pNew ) : ScSimpleUndo( pNewDocShell ), - pOldRanges ( pOld ), - pNewRanges ( pNew ) + pOldRanges ( pOld ), + pNewRanges ( pNew ) { } @@ -1105,14 +1105,14 @@ String __EXPORT ScUndoRangeNames::GetComment() const void ScUndoRangeNames::DoChange( BOOL bUndo ) { ScDocument* pDoc = pDocShell->GetDocument(); - pDoc->CompileNameFormula( TRUE ); // CreateFormulaString + pDoc->CompileNameFormula( TRUE ); // CreateFormulaString if ( bUndo ) pDoc->SetRangeName( new ScRangeName( *pOldRanges ) ); else pDoc->SetRangeName( new ScRangeName( *pNewRanges ) ); - pDoc->CompileNameFormula( FALSE ); // CompileFormulaString + pDoc->CompileNameFormula( FALSE ); // CompileFormulaString SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) ); } @@ -1133,7 +1133,7 @@ void __EXPORT ScUndoRangeNames::Redo() void __EXPORT ScUndoRangeNames::Repeat(SfxRepeatTarget& /* rTarget */) { - // hammanich + // hammanich } BOOL __EXPORT ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 308a3e7b2ef7..6dd1c57d9b4d 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -80,7 +80,7 @@ TYPEINIT1(ScUndoDataForm, SfxUndoAction); // amelia // -// Outline-Gruppen ein- oder ausblenden +// Outline-Gruppen ein- oder ausblenden // ScUndoDoOutline::ScUndoDoOutline( ScDocShell* pNewDocShell, @@ -105,7 +105,7 @@ __EXPORT ScUndoDoOutline::~ScUndoDoOutline() } String __EXPORT ScUndoDoOutline::GetComment() const -{ // Detail einblenden" "Detail ausblenden" +{ // Detail einblenden" "Detail ausblenden" return bShow ? ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ) : ScGlobal::GetRscString( STR_UNDO_REDOOUTLINE ); @@ -118,20 +118,20 @@ void __EXPORT ScUndoDoOutline::Undo() ScDocument* pDoc = pDocShell->GetDocument(); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - // Tabelle muss vorher umgeschaltet sein (#46952#) !!! + // Tabelle muss vorher umgeschaltet sein (#46952#) !!! SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nTab ) pViewShell->SetTabNo( nTab ); - // inverse Funktion ausfuehren + // inverse Funktion ausfuehren if (bShow) pViewShell->HideOutline( bColumns, nLevel, nEntry, FALSE, FALSE ); else pViewShell->ShowOutline( bColumns, nLevel, nEntry, FALSE, FALSE ); - // Original Spalten-/Zeilenstatus + // Original Spalten-/Zeilenstatus if (bColumns) pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, @@ -152,7 +152,7 @@ void __EXPORT ScUndoDoOutline::Redo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - // Tabelle muss vorher umgeschaltet sein (#46952#) !!! + // Tabelle muss vorher umgeschaltet sein (#46952#) !!! SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nTab ) @@ -172,11 +172,11 @@ void __EXPORT ScUndoDoOutline::Repeat(SfxRepeatTarget& /* rTarget */) BOOL __EXPORT ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - return FALSE; // geht nicht + return FALSE; // geht nicht } // -// Outline-Gruppen erzeugen oder loeschen +// Outline-Gruppen erzeugen oder loeschen // ScUndoMakeOutline::ScUndoMakeOutline( ScDocShell* pNewDocShell, @@ -198,7 +198,7 @@ __EXPORT ScUndoMakeOutline::~ScUndoMakeOutline() } String __EXPORT ScUndoMakeOutline::GetComment() const -{ // "Gruppierung" "Gruppierung aufheben" +{ // "Gruppierung" "Gruppierung aufheben" return bMake ? ScGlobal::GetRscString( STR_UNDO_MAKEOUTLINE ) : ScGlobal::GetRscString( STR_UNDO_REMAKEOUTLINE ); @@ -262,7 +262,7 @@ BOOL __EXPORT ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const } // -// Outline-Ebene auswaehlen +// Outline-Ebene auswaehlen // ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell, @@ -287,7 +287,7 @@ __EXPORT ScUndoOutlineLevel::~ScUndoOutlineLevel() } String __EXPORT ScUndoOutlineLevel::GetComment() const -{ // "Gliederungsebene auswaehlen"; +{ // "Gliederungsebene auswaehlen"; return ScGlobal::GetRscString( STR_UNDO_OUTLINELEVEL ); } @@ -298,11 +298,11 @@ void __EXPORT ScUndoOutlineLevel::Undo() ScDocument* pDoc = pDocShell->GetDocument(); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - // Original Outline-Table + // Original Outline-Table pDoc->SetOutlineTable( nTab, pUndoTable ); - // Original Spalten-/Zeilenstatus + // Original Spalten-/Zeilenstatus if (bColumns) pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, @@ -329,7 +329,7 @@ void __EXPORT ScUndoOutlineLevel::Redo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - // Tabelle muss vorher umgeschaltet sein (#46952#) !!! + // Tabelle muss vorher umgeschaltet sein (#46952#) !!! SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nTab ) @@ -352,7 +352,7 @@ BOOL __EXPORT ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const } // -// Outline ueber Blockmarken ein- oder ausblenden +// Outline ueber Blockmarken ein- oder ausblenden // ScUndoOutlineBlock::ScUndoOutlineBlock( ScDocShell* pNewDocShell, @@ -375,7 +375,7 @@ __EXPORT ScUndoOutlineBlock::~ScUndoOutlineBlock() } String __EXPORT ScUndoOutlineBlock::GetComment() const -{ // "Detail einblenden" "Detail ausblenden" +{ // "Detail einblenden" "Detail ausblenden" return bShow ? ScGlobal::GetRscString( STR_UNDO_DOOUTLINEBLK ) : ScGlobal::GetRscString( STR_UNDO_REDOOUTLINEBLK ); @@ -389,19 +389,19 @@ void __EXPORT ScUndoOutlineBlock::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); SCTAB nTab = aBlockStart.Tab(); - // Original Outline-Table + // Original Outline-Table pDoc->SetOutlineTable( nTab, pUndoTable ); - // Original Spalten-/Zeilenstatus + // Original Spalten-/Zeilenstatus - SCCOLROW nStartCol = aBlockStart.Col(); - SCCOLROW nEndCol = aBlockEnd.Col(); - SCCOLROW nStartRow = aBlockStart.Row(); - SCCOLROW nEndRow = aBlockEnd.Row(); + SCCOLROW nStartCol = aBlockStart.Col(); + SCCOLROW nEndCol = aBlockEnd.Col(); + SCCOLROW nStartRow = aBlockStart.Row(); + SCCOLROW nEndRow = aBlockEnd.Row(); if (!bShow) - { // Groesse des ausgeblendeten Blocks + { // Groesse des ausgeblendeten Blocks USHORT nLevel; pUndoTable->GetColArray()->FindTouchedLevel( nStartCol, nEndCol, nLevel ); pUndoTable->GetColArray()->ExtendBlock( nLevel, nStartCol, nEndCol ); @@ -460,7 +460,7 @@ BOOL __EXPORT ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const } // -// alle Outlines loeschen +// alle Outlines loeschen // ScUndoRemoveAllOutlines::ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell, @@ -482,7 +482,7 @@ __EXPORT ScUndoRemoveAllOutlines::~ScUndoRemoveAllOutlines() } String __EXPORT ScUndoRemoveAllOutlines::GetComment() const -{ // "Gliederung entfernen" +{ // "Gliederung entfernen" return ScGlobal::GetRscString( STR_UNDO_REMOVEALLOTLNS ); } @@ -494,16 +494,16 @@ void __EXPORT ScUndoRemoveAllOutlines::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); SCTAB nTab = aBlockStart.Tab(); - // Original Outline-Table + // Original Outline-Table pDoc->SetOutlineTable( nTab, pUndoTable ); - // Original Spalten-/Zeilenstatus + // Original Spalten-/Zeilenstatus - SCCOL nStartCol = aBlockStart.Col(); - SCCOL nEndCol = aBlockEnd.Col(); - SCROW nStartRow = aBlockStart.Row(); - SCROW nEndRow = aBlockEnd.Row(); + SCCOL nStartCol = aBlockStart.Col(); + SCCOL nEndCol = aBlockEnd.Col(); + SCROW nStartRow = aBlockStart.Row(); + SCROW nEndRow = aBlockEnd.Row(); pUndoDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, FALSE, pDoc ); pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pDoc ); @@ -527,7 +527,7 @@ void __EXPORT ScUndoRemoveAllOutlines::Redo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - // Tabelle muss vorher umgeschaltet sein (#46952#) !!! + // Tabelle muss vorher umgeschaltet sein (#46952#) !!! SCTAB nTab = aBlockStart.Tab(); SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); @@ -551,7 +551,7 @@ BOOL __EXPORT ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const } // -// Auto-Outline +// Auto-Outline // ScUndoAutoOutline::ScUndoAutoOutline( ScDocShell* pNewDocShell, @@ -573,7 +573,7 @@ __EXPORT ScUndoAutoOutline::~ScUndoAutoOutline() } String __EXPORT ScUndoAutoOutline::GetComment() const -{ // "Auto-Gliederung" +{ // "Auto-Gliederung" return ScGlobal::GetRscString( STR_UNDO_AUTOOUTLINE ); } @@ -585,11 +585,11 @@ void __EXPORT ScUndoAutoOutline::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); SCTAB nTab = aBlockStart.Tab(); - // Original Outline-Table + // Original Outline-Table pDoc->SetOutlineTable( nTab, pUndoTable ); - // Original Spalten-/Zeilenstatus + // Original Spalten-/Zeilenstatus if (pUndoDoc && pUndoTable) { @@ -626,7 +626,7 @@ void __EXPORT ScUndoAutoOutline::Redo() SCTAB nTab = aBlockStart.Tab(); if (pViewShell) { - // Tabelle muss vorher umgeschaltet sein (#46952#) !!! + // Tabelle muss vorher umgeschaltet sein (#46952#) !!! SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nTab ) @@ -638,9 +638,9 @@ void __EXPORT ScUndoAutoOutline::Redo() ScOutlineDocFunc aFunc( *pDocShell ); aFunc.AutoOutline( aRange, FALSE, FALSE ); - // auf der View markieren - // Wenn's beim Aufruf eine Mehrfachselektion war, ist es jetzt der - // umschliessende Bereich... + // auf der View markieren + // Wenn's beim Aufruf eine Mehrfachselektion war, ist es jetzt der + // umschliessende Bereich... if (pViewShell) pViewShell->MarkRange( aRange ); @@ -660,7 +660,7 @@ BOOL __EXPORT ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const } // -// Zwischenergebnisse +// Zwischenergebnisse // ScUndoSubTotals::ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab, @@ -688,7 +688,7 @@ __EXPORT ScUndoSubTotals::~ScUndoSubTotals() } String __EXPORT ScUndoSubTotals::GetComment() const -{ // "Teilergebnisse" +{ // "Teilergebnisse" return ScGlobal::GetRscString( STR_UNDO_SUBTOTALS ); } @@ -699,8 +699,8 @@ void __EXPORT ScUndoSubTotals::Undo() ScDocument* pDoc = pDocShell->GetDocument(); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - // um einzelnen DB-Bereich anzupassen -/* ScDBData* pOldDBData = ScUndoUtil::GetOldDBData( pUndoDBData, pDoc, nTab, + // um einzelnen DB-Bereich anzupassen +/* ScDBData* pOldDBData = ScUndoUtil::GetOldDBData( pUndoDBData, pDoc, nTab, aParam.nCol1, aParam.nRow1, aParam.nCol2, nNewEndRow ); */ @@ -714,11 +714,11 @@ void __EXPORT ScUndoSubTotals::Undo() } - // Original Outline-Table + // Original Outline-Table pDoc->SetOutlineTable( nTab, pUndoTable ); - // Original Spalten-/Zeilenstatus + // Original Spalten-/Zeilenstatus if (pUndoDoc && pUndoTable) { @@ -737,7 +737,7 @@ void __EXPORT ScUndoSubTotals::Undo() pViewShell->UpdateScrollBars(); } - // Original-Daten & Referenzen + // Original-Daten & Referenzen ScUndoUtil::MarkSimpleBlock( pDocShell, 0, aParam.nRow1+1, nTab, MAXCOL, aParam.nRow2, nTab ); @@ -745,14 +745,14 @@ void __EXPORT ScUndoSubTotals::Undo() pDoc->DeleteAreaTab( 0,aParam.nRow1+1, MAXCOL,aParam.nRow2, nTab, IDF_ALL ); pUndoDoc->CopyToDocument( 0, aParam.nRow1+1, nTab, MAXCOL, aParam.nRow2, nTab, - IDF_NONE, FALSE, pDoc ); // Flags + IDF_NONE, FALSE, pDoc ); // Flags pUndoDoc->UndoToDocument( 0, aParam.nRow1+1, nTab, MAXCOL, aParam.nRow2, nTab, IDF_ALL, FALSE, pDoc ); ScUndoUtil::MarkSimpleBlock( pDocShell, aParam.nCol1,aParam.nRow1,nTab, aParam.nCol2,aParam.nRow2,nTab ); -/* if (pUndoDBData) +/* if (pUndoDBData) *pOldDBData = *pUndoDBData; */ if (pUndoRange) @@ -793,11 +793,11 @@ void __EXPORT ScUndoSubTotals::Repeat(SfxRepeatTarget& /* rTarget */) BOOL __EXPORT ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - return FALSE; // geht nicht wegen Spaltennummern + return FALSE; // geht nicht wegen Spaltennummern } // -// Sortieren +// Sortieren // ScUndoSort::ScUndoSort( ScDocShell* pNewDocShell, @@ -840,8 +840,8 @@ void __EXPORT ScUndoSort::Undo() SCCOL nStartCol = aSortParam.nCol1; SCROW nStartRow = aSortParam.nRow1; - SCCOL nEndCol = aSortParam.nCol2; - SCROW nEndRow = aSortParam.nRow2; + SCCOL nEndCol = aSortParam.nCol2; + SCROW nEndRow = aSortParam.nRow2; SCTAB nSortTab = nTab; if ( !aSortParam.bInplace ) { @@ -867,9 +867,9 @@ void __EXPORT ScUndoSort::Undo() pUndoDoc->CopyToDocument( aDestRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc ); } - // Zeilenhoehen immer (wegen automatischer Anpassung) - //! auf ScBlockUndo umstellen -// if (bRepeatQuery) + // Zeilenhoehen immer (wegen automatischer Anpassung) + //! auf ScBlockUndo umstellen +// if (bRepeatQuery) pUndoDoc->CopyToDocument( 0, nStartRow, nSortTab, MAXCOL, nEndRow, nSortTab, IDF_NONE, FALSE, pDoc ); @@ -896,16 +896,16 @@ void __EXPORT ScUndoSort::Redo() if ( nVisTab != nTab ) pViewShell->SetTabNo( nTab ); -// pViewShell->DoneBlockMode(); -// pViewShell->InitOwnBlockMode(); -// pViewShell->GetViewData()->GetMarkData() = aMarkData; // CopyMarksTo +// pViewShell->DoneBlockMode(); +// pViewShell->InitOwnBlockMode(); +// pViewShell->GetViewData()->GetMarkData() = aMarkData; // CopyMarksTo pViewShell->MarkRange( ScRange( aSortParam.nCol1, aSortParam.nRow1, nTab, aSortParam.nCol2, aSortParam.nRow2, nTab ) ); pViewShell->Sort( aSortParam, FALSE ); - // Quellbereich painten wegen Markierung + // Quellbereich painten wegen Markierung if ( !aSortParam.bInplace ) pDocShell->PostPaint( aSortParam.nCol1, aSortParam.nRow1, nTab, aSortParam.nCol2, aSortParam.nRow2, nTab, PAINT_GRID ); @@ -919,11 +919,11 @@ void __EXPORT ScUndoSort::Repeat(SfxRepeatTarget& /* rTarget */) BOOL __EXPORT ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - return FALSE; // geht nicht wegen Spaltennummern + return FALSE; // geht nicht wegen Spaltennummern } // -// Filtern +// Filtern // ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQueryParam& rParam, @@ -935,7 +935,7 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery nTab( nNewTab ), aQueryParam( rParam ), pUndoDoc( pNewUndoDoc ), -// pUndoDBData( pNewData ) +// pUndoDBData( pNewData ) pUndoDB( pNewUndoDB ), bIsAdvanced( FALSE ), bDestArea( FALSE ), @@ -958,13 +958,13 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery __EXPORT ScUndoQuery::~ScUndoQuery() { delete pUndoDoc; -// delete pUndoDBData; +// delete pUndoDBData; delete pUndoDB; DeleteSdrUndoAction( pDrawUndo ); } String __EXPORT ScUndoQuery::GetComment() const -{ // "Filtern"; +{ // "Filtern"; return ScGlobal::GetRscString( STR_UNDO_QUERY ); } @@ -995,7 +995,7 @@ void __EXPORT ScUndoQuery::Undo() if ( bDoSize && bDestArea ) { - // aDestRange ist der alte Bereich + // aDestRange ist der alte Bereich pDoc->FitBlock( ScRange( aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab, nDestEndCol, nDestEndRow, aQueryParam.nDestTab ), @@ -1013,9 +1013,9 @@ void __EXPORT ScUndoQuery::Undo() pUndoDoc->CopyToDocument( aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab, nDestEndCol, nDestEndRow, aQueryParam.nDestTab, IDF_ALL, FALSE, pDoc ); - // Attribute werden immer mitkopiert (#49287#) + // Attribute werden immer mitkopiert (#49287#) - // Rest von altem Bereich + // Rest von altem Bereich if ( bDestArea && !bDoSize ) { pDoc->DeleteAreaTab( aOldDest, IDF_ALL ); @@ -1045,7 +1045,7 @@ void __EXPORT ScUndoQuery::Undo() if ( nVisTab != nTab ) pViewShell->SetTabNo( nTab ); - // Paint + // Paint if (bCopy) { @@ -1095,7 +1095,7 @@ void __EXPORT ScUndoQuery::Repeat(SfxRepeatTarget& /* rTarget */) BOOL __EXPORT ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - return FALSE; // geht nicht wegen Spaltennummern + return FALSE; // geht nicht wegen Spaltennummern } // @@ -1171,7 +1171,7 @@ BOOL ScUndoAutoFilter::CanRepeat(SfxRepeatTarget& /* rTarget */) const } // -// Datenbankbereiche aendern (Dialog) +// Datenbankbereiche aendern (Dialog) // ScUndoDBData::ScUndoDBData( ScDocShell* pNewDocShell, @@ -1189,7 +1189,7 @@ __EXPORT ScUndoDBData::~ScUndoDBData() } String __EXPORT ScUndoDBData::GetComment() const -{ // "Datenbankbereiche aendern"; +{ // "Datenbankbereiche aendern"; return ScGlobal::GetRscString( STR_UNDO_DBDATA ); } @@ -1200,10 +1200,10 @@ void __EXPORT ScUndoDBData::Undo() ScDocument* pDoc = pDocShell->GetDocument(); BOOL bOldAutoCalc = pDoc->GetAutoCalc(); - pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden - pDoc->CompileDBFormula( TRUE ); // CreateFormulaString + pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden + pDoc->CompileDBFormula( TRUE ); // CreateFormulaString pDoc->SetDBCollection( new ScDBCollection(*pUndoColl), TRUE ); - pDoc->CompileDBFormula( FALSE ); // CompileFormulaString + pDoc->CompileDBFormula( FALSE ); // CompileFormulaString pDoc->SetAutoCalc( bOldAutoCalc ); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) ); @@ -1218,10 +1218,10 @@ void __EXPORT ScUndoDBData::Redo() ScDocument* pDoc = pDocShell->GetDocument(); BOOL bOldAutoCalc = pDoc->GetAutoCalc(); - pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden - pDoc->CompileDBFormula( TRUE ); // CreateFormulaString + pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden + pDoc->CompileDBFormula( TRUE ); // CreateFormulaString pDoc->SetDBCollection( new ScDBCollection(*pRedoColl), TRUE ); - pDoc->CompileDBFormula( FALSE ); // CompileFormulaString + pDoc->CompileDBFormula( FALSE ); // CompileFormulaString pDoc->SetAutoCalc( bOldAutoCalc ); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) ); @@ -1235,11 +1235,11 @@ void __EXPORT ScUndoDBData::Repeat(SfxRepeatTarget& /* rTarget */) BOOL __EXPORT ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - return FALSE; // geht nicht + return FALSE; // geht nicht } // -// Import +// Import // ScUndoImportData::ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab, @@ -1271,7 +1271,7 @@ __EXPORT ScUndoImportData::~ScUndoImportData() } String __EXPORT ScUndoImportData::GetComment() const -{ // "Importieren"; +{ // "Importieren"; return ScGlobal::GetRscString( STR_UNDO_IMPORTDATA ); } @@ -1297,12 +1297,12 @@ void __EXPORT ScUndoImportData::Undo() if ( !bRedoFilled ) { - // read redo data from document at first undo - // imported data is deleted later anyway, - // so now delete each column after copying to save memory (#41216#) + // read redo data from document at first undo + // imported data is deleted later anyway, + // so now delete each column after copying to save memory (#41216#) BOOL bOldAutoCalc = pDoc->GetAutoCalc(); - pDoc->SetAutoCalc( FALSE ); // outside of the loop + pDoc->SetAutoCalc( FALSE ); // outside of the loop for (SCCOL nCopyCol = nCol1; nCopyCol <= nCol2; nCopyCol++) { pDoc->CopyToDocument( nCopyCol,nRow1,nTab, nCopyCol,nRow2,nTab, @@ -1315,10 +1315,10 @@ void __EXPORT ScUndoImportData::Undo() } } BOOL bMoveCells = pUndoDBData && pRedoDBData && - pRedoDBData->IsDoSize(); // in alt und neu gleich + pRedoDBData->IsDoSize(); // in alt und neu gleich if (bMoveCells) { - // Undo: erst die neuen Daten loeschen, dann FitBlock rueckwaerts + // Undo: erst die neuen Daten loeschen, dann FitBlock rueckwaerts ScRange aOld, aNew; pUndoDBData->GetArea( aOld ); @@ -1327,9 +1327,9 @@ void __EXPORT ScUndoImportData::Undo() pDoc->DeleteAreaTab( aNew.aStart.Col(), aNew.aStart.Row(), aNew.aEnd.Col(), aNew.aEnd.Row(), nTab, IDF_ALL & ~IDF_NOTE ); - aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln + aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln aNew.aEnd.SetCol( aNew.aEnd.Col() + nFormulaCols ); - pDoc->FitBlock( aNew, aOld, FALSE ); // rueckwaerts + pDoc->FitBlock( aNew, aOld, FALSE ); // rueckwaerts } else pDoc->DeleteAreaTab( aImportParam.nCol1,aImportParam.nRow1, @@ -1348,7 +1348,7 @@ void __EXPORT ScUndoImportData::Undo() } // erack! it's broadcasted -// pDoc->SetDirty(); +// pDoc->SetDirty(); SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nTab ) @@ -1385,16 +1385,16 @@ void __EXPORT ScUndoImportData::Redo() nCol1, nRow1, nCol2, nRow2 ); } BOOL bMoveCells = pUndoDBData && pRedoDBData && - pRedoDBData->IsDoSize(); // in alt und neu gleich + pRedoDBData->IsDoSize(); // in alt und neu gleich if (bMoveCells) { - // Redo: FitBlock, dann Daten loeschen (noetig fuer CopyToDocument) + // Redo: FitBlock, dann Daten loeschen (noetig fuer CopyToDocument) ScRange aOld, aNew; pUndoDBData->GetArea( aOld ); pRedoDBData->GetArea( aNew ); - aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln + aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln aNew.aEnd.SetCol( aNew.aEnd.Col() + nFormulaCols ); pDoc->FitBlock( aOld, aNew ); @@ -1420,7 +1420,7 @@ void __EXPORT ScUndoImportData::Redo() } // erack! it's broadcasted -// pDoc->SetDirty(); +// pDoc->SetDirty(); SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nTab ) @@ -1453,16 +1453,16 @@ void __EXPORT ScUndoImportData::Repeat(SfxRepeatTarget& rTarget) BOOL __EXPORT ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const { - // Repeat nur fuer Import per DB-Bereich, dann ist pUndoDBData gesetzt + // Repeat nur fuer Import per DB-Bereich, dann ist pUndoDBData gesetzt if (pUndoDBData) return (rTarget.ISA(ScTabViewTarget)); else - return FALSE; // Adressbuch + return FALSE; // Adressbuch } // -// Operationen wiederholen +// Operationen wiederholen // ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab, @@ -1499,7 +1499,7 @@ __EXPORT ScUndoRepeatDB::~ScUndoRepeatDB() } String __EXPORT ScUndoRepeatDB::GetComment() const -{ // "Wiederholen"; //! bessere Beschreibung! +{ // "Wiederholen"; //! bessere Beschreibung! return ScGlobal::GetRscString( STR_UNDO_REPEATDB ); } @@ -1519,7 +1519,7 @@ void __EXPORT ScUndoRepeatDB::Undo() { SCCOL nFormulaCols = 0; SCCOL nCol = aOldQuery.aEnd.Col() + 1; - SCROW nRow = aOldQuery.aStart.Row() + 1; //! Header testen + SCROW nRow = aOldQuery.aStart.Row() + 1; //! Header testen while ( nCol <= MAXCOL && pDoc->GetCellType(ScAddress( nCol, nRow, nTab )) == CELLTYPE_FORMULA ) ++nCol, ++nFormulaCols; @@ -1536,7 +1536,7 @@ void __EXPORT ScUndoRepeatDB::Undo() } } - //! Daten von Filter in anderen Bereich fehlen noch !!!!!!!!!!!!!!!!! + //! Daten von Filter in anderen Bereich fehlen noch !!!!!!!!!!!!!!!!! if (nNewEndRow > aBlockEnd.Row()) { @@ -1547,11 +1547,11 @@ void __EXPORT ScUndoRepeatDB::Undo() pDoc->InsertRow( 0,nTab, MAXCOL,nTab, nNewEndRow+1, static_cast<SCSIZE>(nNewEndRow-aBlockEnd.Row()) ); } - // Original Outline-Table + // Original Outline-Table pDoc->SetOutlineTable( nTab, pUndoTable ); - // Original Spalten-/Zeilenstatus + // Original Spalten-/Zeilenstatus if (pUndoDoc && pUndoTable) { @@ -1570,7 +1570,7 @@ void __EXPORT ScUndoRepeatDB::Undo() pViewShell->UpdateScrollBars(); } - // Original-Daten & Referenzen + // Original-Daten & Referenzen ScUndoUtil::MarkSimpleBlock( pDocShell, 0, aBlockStart.Row(), nTab, MAXCOL, aBlockEnd.Row(), nTab ); @@ -1578,7 +1578,7 @@ void __EXPORT ScUndoRepeatDB::Undo() MAXCOL, aBlockEnd.Row(), nTab, IDF_ALL ); pUndoDoc->CopyToDocument( 0, aBlockStart.Row(), nTab, MAXCOL, aBlockEnd.Row(), nTab, - IDF_NONE, FALSE, pDoc ); // Flags + IDF_NONE, FALSE, pDoc ); // Flags pUndoDoc->UndoToDocument( 0, aBlockStart.Row(), nTab, MAXCOL, aBlockEnd.Row(), nTab, IDF_ALL, FALSE, pDoc ); @@ -1591,7 +1591,7 @@ void __EXPORT ScUndoRepeatDB::Undo() pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE ); // erack! it's broadcasted -// pDoc->SetDirty(); +// pDoc->SetDirty(); SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nTab ) @@ -1635,7 +1635,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const } // -// data pilot +// data pilot // ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell, @@ -1697,12 +1697,12 @@ void __EXPORT ScUndoDataPilot::Undo() pOldUndoDoc->CopyToDocument( aOldRange, IDF_ALL, FALSE, pDoc ); } - // update objects in collection + // update objects in collection if ( pNewDPObject ) { - // find updated object - //! find by name! + // find updated object + //! find by name! ScDPObject* pDocObj = pDoc->GetDPAtCursor( aNewRange.aStart.Col(), aNewRange.aStart.Row(), aNewRange.aStart.Tab() ); @@ -1711,7 +1711,7 @@ void __EXPORT ScUndoDataPilot::Undo() { if ( pOldDPObject ) { - // restore old settings + // restore old settings pOldDPObject->WriteSourceDataTo( *pDocObj ); ScDPSaveData* pData = pOldDPObject->GetSaveData(); if (pData) @@ -1721,14 +1721,14 @@ void __EXPORT ScUndoDataPilot::Undo() } else { - // delete inserted object + // delete inserted object pDoc->GetDPCollection()->FreeTable(pDocObj); } } } else if ( pOldDPObject ) { - // re-insert deleted object + // re-insert deleted object ScDPObject* pDestObj = new ScDPObject( *pOldDPObject ); pDestObj->SetAlive(TRUE); @@ -1748,7 +1748,7 @@ void __EXPORT ScUndoDataPilot::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) { - //! set current sheet + //! set current sheet } if (pNewDPObject) @@ -1764,16 +1764,16 @@ void __EXPORT ScUndoDataPilot::Redo() { BeginRedo(); - //! copy output data instead of repeating the change, - //! in case external data have changed! + //! copy output data instead of repeating the change, + //! in case external data have changed! ScDocument* pDoc = pDocShell->GetDocument(); ScDPObject* pSourceObj = NULL; if ( pOldDPObject ) { - // find object to modify - //! find by name! + // find object to modify + //! find by name! ScRange aOldRange = pOldDPObject->GetOutRange(); pSourceObj = pDoc->GetDPAtCursor( @@ -1782,25 +1782,25 @@ void __EXPORT ScUndoDataPilot::Redo() } ScDBDocFunc aFunc( *pDocShell ); - aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, FALSE, FALSE, bAllowMove ); // no new undo action + aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, FALSE, FALSE, bAllowMove ); // no new undo action EndRedo(); } void __EXPORT ScUndoDataPilot::Repeat(SfxRepeatTarget& /* rTarget */) { - //! allow deletion + //! allow deletion } BOOL __EXPORT ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - //! allow deletion + //! allow deletion return FALSE; } // -// Konsolidieren +// Konsolidieren // ScUndoConsolidate::ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rArea, @@ -1843,22 +1843,22 @@ void __EXPORT ScUndoConsolidate::Undo() if (bInsRef) { - // Zeilen loeschen + // Zeilen loeschen pDoc->DeleteRow( 0,nTab, MAXCOL,nTab, aDestArea.nRowStart, nInsertCount ); - // Outlines + // Outlines pDoc->SetOutlineTable( nTab, pUndoTab ); - // Zeilenstatus + // Zeilenstatus pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, FALSE, pDoc ); - // Daten & Referenzen + // Daten & Referenzen pDoc->DeleteAreaTab( 0,aDestArea.nRowStart, MAXCOL,aDestArea.nRowEnd, nTab, IDF_ALL ); pUndoDoc->UndoToDocument( 0, aDestArea.nRowStart, nTab, MAXCOL, aDestArea.nRowEnd, nTab, IDF_ALL, FALSE, pDoc ); - // Original-Bereich + // Original-Bereich if (pUndoData) { pDoc->DeleteAreaTab(aOldRange, IDF_ALL); @@ -1876,7 +1876,7 @@ void __EXPORT ScUndoConsolidate::Undo() aDestArea.nColEnd, aDestArea.nRowEnd, nTab, IDF_ALL, FALSE, pDoc ); - // Original-Bereich + // Original-Bereich if (pUndoData) { pDoc->DeleteAreaTab(aOldRange, IDF_ALL); @@ -1896,10 +1896,10 @@ void __EXPORT ScUndoConsolidate::Undo() nEndX, nEndY, nTab, PAINT_GRID ); } - // DB-Bereich wieder anpassen + // DB-Bereich wieder anpassen if (pUndoData) { - ScDBCollection* pColl = pDoc->GetDBCollection(); + ScDBCollection* pColl = pDoc->GetDBCollection(); if (pColl) { USHORT nIndex; @@ -1955,7 +1955,7 @@ BOOL __EXPORT ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const // -// Quell-Daten von Chart aendern +// Quell-Daten von Chart aendern // void ScUndoChartData::Init() diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx index e1bfb468fb4e..11f98d1442e1 100644 --- a/sc/source/ui/undo/undodraw.cxx +++ b/sc/source/ui/undo/undodraw.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 @@ -185,7 +185,7 @@ __EXPORT ScUndoDraw::~ScUndoDraw() void ScUndoDraw::ForgetDrawUndo() { - pDrawUndo = NULL; // nicht loeschen (Draw-Undo muss dann von aussen gemerkt werden) + pDrawUndo = NULL; // nicht loeschen (Draw-Undo muss dann von aussen gemerkt werden) } String __EXPORT ScUndoDraw::GetComment() const diff --git a/sc/source/ui/undo/undoolk.cxx b/sc/source/ui/undo/undoolk.cxx index bfb1e0a27cc6..9873bcf40926 100644 --- a/sc/source/ui/undo/undoolk.cxx +++ b/sc/source/ui/undo/undoolk.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,7 +47,7 @@ SdrUndoAction* GetSdrUndoAction( ScDocument* pDoc ) { ScDrawLayer* pLayer = pDoc->GetDrawLayer(); if (pLayer) - return pLayer->GetCalcUndo(); // muss vorhanden sein + return pLayer->GetCalcUndo(); // muss vorhanden sein else return NULL; } diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 5d4af591a2bc..d9c1cfd4c84a 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.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 @@ TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo); // ----------------------------------------------------------------------- // -// modify style (cell or page style) +// modify style (cell or page style) // ScStyleSaveData::ScStyleSaveData() : @@ -99,7 +99,7 @@ void ScStyleSaveData::InitFromStyle( const SfxStyleSheetBase* pSource ) pItems = new SfxItemSet( ((SfxStyleSheetBase*)pSource)->GetItemSet() ); } else - *this = ScStyleSaveData(); // empty + *this = ScStyleSaveData(); // empty } // ----------------------------------------------------------------------- @@ -127,7 +127,7 @@ String ScUndoModifyStyle::GetComment() const void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, BOOL bRemoved ) { - //! move to document or docshell + //! move to document or docshell VirtualDevice aVDev; Point aLogic = aVDev.LogicToPixel( Point(1000,1000), MAP_TWIP ); @@ -148,8 +148,8 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName, ScDocument* pDoc = pDocSh->GetDocument(); ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool(); String aNewName = rData.GetName(); - BOOL bDelete = ( aNewName.Len() == 0 ); // no new name -> delete style - BOOL bNew = ( rName.Len() == 0 && !bDelete ); // creating new style + BOOL bDelete = ( aNewName.Len() == 0 ); // no new name -> delete style + BOOL bNew = ( rName.Len() == 0 && !bDelete ); // creating new style SfxStyleSheetBase* pStyle = NULL; if ( rName.Len() ) @@ -178,7 +178,7 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName, if ( bDelete ) { if ( eStyleFamily == SFX_STYLE_FAMILY_PARA ) - lcl_DocStyleChanged( pDoc, pStyle, TRUE ); // TRUE: remove usage of style + lcl_DocStyleChanged( pDoc, pStyle, TRUE ); // TRUE: remove usage of style else pDoc->RemovePageStyleInUse( rName ); @@ -201,7 +201,7 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName, if ( eStyleFamily == SFX_STYLE_FAMILY_PARA ) { - lcl_DocStyleChanged( pDoc, pStyle, FALSE ); // cell styles: row heights + lcl_DocStyleChanged( pDoc, pStyle, FALSE ); // cell styles: row heights } else { @@ -220,8 +220,8 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName, pDocSh->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID|PAINT_LEFT ); - //! undo/redo document modifications for deleted styles - //! undo/redo modifications of number formatter + //! undo/redo document modifications for deleted styles + //! undo/redo modifications of number formatter } void ScUndoModifyStyle::Undo() @@ -244,12 +244,12 @@ void ScUndoModifyStyle::Repeat(SfxRepeatTarget& /* rTarget */) BOOL ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - return FALSE; // no repeat possible + return FALSE; // no repeat possible } // ----------------------------------------------------------------------- // -// apply page style +// apply page style // ScUndoApplyPageStyle::ApplyStyleEntry::ApplyStyleEntry( SCTAB nTab, const String& rOldStyle ) : mnTab( nTab ), @@ -301,7 +301,7 @@ void ScUndoApplyPageStyle::Redo() void ScUndoApplyPageStyle::Repeat(SfxRepeatTarget& /* rTarget */) { - //! set same page style to current tab + //! set same page style to current tab } BOOL ScUndoApplyPageStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index c3fdfc156528..f32a33575aa1 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.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,7 +57,7 @@ #include "drwlayer.hxx" #include "scresid.hxx" -extern BOOL bDrawIsInUndo; //! irgendwo als Member !!! +extern BOOL bDrawIsInUndo; //! irgendwo als Member !!! using namespace com::sun::star; using ::com::sun::star::uno::Sequence; @@ -65,26 +65,26 @@ using ::std::auto_ptr; // STATIC DATA ----------------------------------------------------------- -TYPEINIT1(ScUndoInsertTab, SfxUndoAction); -TYPEINIT1(ScUndoInsertTables, SfxUndoAction); -TYPEINIT1(ScUndoDeleteTab, SfxUndoAction); -TYPEINIT1(ScUndoRenameTab, SfxUndoAction); -TYPEINIT1(ScUndoMoveTab, SfxUndoAction); -TYPEINIT1(ScUndoCopyTab, SfxUndoAction); -TYPEINIT1(ScUndoMakeScenario, SfxUndoAction); -TYPEINIT1(ScUndoImportTab, SfxUndoAction); -TYPEINIT1(ScUndoRemoveLink, SfxUndoAction); -TYPEINIT1(ScUndoShowHideTab, SfxUndoAction); -TYPEINIT1(ScUndoPrintRange, SfxUndoAction); -TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction); -TYPEINIT1(ScUndoRenameObject, SfxUndoAction); -TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction); +TYPEINIT1(ScUndoInsertTab, SfxUndoAction); +TYPEINIT1(ScUndoInsertTables, SfxUndoAction); +TYPEINIT1(ScUndoDeleteTab, SfxUndoAction); +TYPEINIT1(ScUndoRenameTab, SfxUndoAction); +TYPEINIT1(ScUndoMoveTab, SfxUndoAction); +TYPEINIT1(ScUndoCopyTab, SfxUndoAction); +TYPEINIT1(ScUndoMakeScenario, SfxUndoAction); +TYPEINIT1(ScUndoImportTab, SfxUndoAction); +TYPEINIT1(ScUndoRemoveLink, SfxUndoAction); +TYPEINIT1(ScUndoShowHideTab, SfxUndoAction); +TYPEINIT1(ScUndoPrintRange, SfxUndoAction); +TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction); +TYPEINIT1(ScUndoRenameObject, SfxUndoAction); +TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction); TYPEINIT1(ScUndoTabColor, SfxUndoAction); // ----------------------------------------------------------------------- // -// Tabelle einfuegen +// Tabelle einfuegen // ScUndoInsertTab::ScUndoInsertTab( ScDocShell* pNewDocShell, @@ -132,11 +132,11 @@ void ScUndoInsertTab::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); pViewShell->SetTabNo(nTab); - pDocShell->SetInUndo( TRUE ); //! BeginUndo + pDocShell->SetInUndo( TRUE ); //! BeginUndo bDrawIsInUndo = TRUE; pViewShell->DeleteTable( nTab, FALSE ); bDrawIsInUndo = FALSE; - pDocShell->SetInUndo( FALSE ); //! EndUndo + pDocShell->SetInUndo( FALSE ); //! EndUndo DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() ); @@ -144,7 +144,7 @@ void ScUndoInsertTab::Undo() if ( pChangeTrack ) pChangeTrack->Undo( nEndChangeAction, nEndChangeAction ); - // SetTabNo(...,TRUE) for all views to sync with drawing layer pages + // SetTabNo(...,TRUE) for all views to sync with drawing layer pages pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) ); } @@ -154,7 +154,7 @@ void ScUndoInsertTab::Redo() RedoSdrUndoAction( pDrawUndo ); // Draw Redo first - pDocShell->SetInUndo( TRUE ); //! BeginRedo + pDocShell->SetInUndo( TRUE ); //! BeginRedo bDrawIsInUndo = TRUE; if (bAppend) pViewShell->AppendTable( sNewName, FALSE ); @@ -164,7 +164,7 @@ void ScUndoInsertTab::Redo() pViewShell->InsertTable( sNewName, nTab, FALSE ); } bDrawIsInUndo = FALSE; - pDocShell->SetInUndo( FALSE ); //! EndRedo + pDocShell->SetInUndo( FALSE ); //! EndRedo SetChangeTrack(); } @@ -183,7 +183,7 @@ BOOL ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Tabellen einfuegen +// Tabellen einfuegen // ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell, @@ -194,7 +194,7 @@ ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell, nTab( nTabNum ), bAppend( bApp ) { - pNameList = pNewNameList; + pNameList = pNewNameList; pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() ); SetChangeTrack(); @@ -246,7 +246,7 @@ void ScUndoInsertTables::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); pViewShell->SetTabNo(nTab); - pDocShell->SetInUndo( TRUE ); //! BeginUndo + pDocShell->SetInUndo( TRUE ); //! BeginUndo bDrawIsInUndo = TRUE; SvShorts TheTabs; @@ -259,7 +259,7 @@ void ScUndoInsertTables::Undo() TheTabs.Remove(0,TheTabs.Count()); bDrawIsInUndo = FALSE; - pDocShell->SetInUndo( FALSE ); //! EndUndo + pDocShell->SetInUndo( FALSE ); //! EndUndo DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() ); @@ -267,7 +267,7 @@ void ScUndoInsertTables::Undo() if ( pChangeTrack ) pChangeTrack->Undo( nStartChangeAction, nEndChangeAction ); - // SetTabNo(...,TRUE) for all views to sync with drawing layer pages + // SetTabNo(...,TRUE) for all views to sync with drawing layer pages pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) ); } @@ -277,13 +277,13 @@ void ScUndoInsertTables::Redo() RedoSdrUndoAction( pDrawUndo ); // Draw Redo first - pDocShell->SetInUndo( TRUE ); //! BeginRedo + pDocShell->SetInUndo( TRUE ); //! BeginRedo bDrawIsInUndo = TRUE; pViewShell->SetTabNo(nTab); pViewShell->InsertTables( pNameList, nTab, static_cast<SCTAB>(pNameList->Count()),FALSE ); bDrawIsInUndo = FALSE; - pDocShell->SetInUndo( FALSE ); //! EndRedo + pDocShell->SetInUndo( FALSE ); //! EndRedo SetChangeTrack(); } @@ -303,7 +303,7 @@ BOOL ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const //---------------------------------------------------------------------------------- // -// Tabelle loeschen +// Tabelle loeschen // ScUndoDeleteTab::ScUndoDeleteTab( ScDocShell* pNewDocShell,const SvShorts &aTab, //SCTAB nNewTab, @@ -374,8 +374,8 @@ void ScUndoDeleteTab::Undo() bDrawIsInUndo = FALSE; if (bOk) { - // Ref-Undo passiert in EndUndo - // pUndoDoc->UndoToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc ); + // Ref-Undo passiert in EndUndo + // pUndoDoc->UndoToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc ); pRefUndoDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc ); String aOldName; @@ -407,16 +407,16 @@ void ScUndoDeleteTab::Undo() if ( pRefUndoDoc->IsTabProtected( nTab ) ) pDoc->SetTabProtection(nTab, pRefUndoDoc->GetTabProtection(nTab)); - // Drawing-Layer passiert beim MoveUndo::EndUndo - // pDoc->TransferDrawPage(pRefUndoDoc, nTab,nTab); + // Drawing-Layer passiert beim MoveUndo::EndUndo + // pDoc->TransferDrawPage(pRefUndoDoc, nTab,nTab); } } if (bLink) { - pDocShell->UpdateLinks(); // Link-Manager updaten + pDocShell->UpdateLinks(); // Link-Manager updaten } - EndUndo(); // Draw-Undo muss vor dem Broadcast kommen! + EndUndo(); // Draw-Undo muss vor dem Broadcast kommen! ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack(); if ( pChangeTrack ) @@ -431,14 +431,14 @@ void ScUndoDeleteTab::Undo() pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) ); pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); - pDocShell->PostPaint(0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_ALL ); // incl. Extras + pDocShell->PostPaint(0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_ALL ); // incl. Extras - // nicht ShowTable wegen SetTabNo(..., TRUE): + // nicht ShowTable wegen SetTabNo(..., TRUE): ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDoc, theTabs[0] ), TRUE ); -// EndUndo(); +// EndUndo(); } void ScUndoDeleteTab::Redo() @@ -448,15 +448,15 @@ void ScUndoDeleteTab::Redo() RedoSdrUndoAction( pDrawUndo ); // Draw Redo first - pDocShell->SetInUndo( TRUE ); //! BeginRedo + pDocShell->SetInUndo( TRUE ); //! BeginRedo bDrawIsInUndo = TRUE; pViewShell->DeleteTables( theTabs, FALSE ); bDrawIsInUndo = FALSE; - pDocShell->SetInUndo( TRUE ); //! EndRedo + pDocShell->SetInUndo( TRUE ); //! EndRedo SetChangeTrack(); - // SetTabNo(...,TRUE) for all views to sync with drawing layer pages + // SetTabNo(...,TRUE) for all views to sync with drawing layer pages pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) ); } @@ -477,7 +477,7 @@ BOOL ScUndoDeleteTab::CanRepeat(SfxRepeatTarget& rTarget) const //--------------------------------------------------------------------------------- // -// Tabelle umbenennen +// Tabelle umbenennen // ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell, @@ -485,7 +485,7 @@ ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell, const String& rOldName, const String& rNewName) : ScSimpleUndo( pNewDocShell ), - nTab ( nT ) + nTab ( nT ) { sOldName = rOldName; sNewName = rNewName; @@ -505,13 +505,13 @@ void ScUndoRenameTab::DoChange( SCTAB nTabP, const String& rName ) const ScDocument* pDoc = pDocShell->GetDocument(); pDoc->RenameTab( nTabP, rName ); - SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator pDocShell->PostPaintGridAll(); pDocShell->PostPaintExtras(); pDocShell->PostDataChanged(); - // Der Tabellenname koennte in einer Formel vorkommen... + // Der Tabellenname koennte in einer Formel vorkommen... ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) pViewShell->UpdateInputHandler(); @@ -529,7 +529,7 @@ void ScUndoRenameTab::Redo() void ScUndoRenameTab::Repeat(SfxRepeatTarget& /* rTarget */) { - // Repeat macht keinen Sinn + // Repeat macht keinen Sinn } BOOL ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const @@ -540,7 +540,7 @@ BOOL ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const //---------------------------------------------------------------------------------- // -// Tabelle verschieben +// Tabelle verschieben // ScUndoMoveTab::ScUndoMoveTab( ScDocShell* pNewDocShell, @@ -572,13 +572,13 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const ScDocument* pDoc = pDocShell->GetDocument(); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - if (bUndo) // UnDo + if (bUndo) // UnDo { for(int i=theNewTabs.Count()-1;i>=0;i--) { SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)]; - if (nDestTab > MAXTAB) // angehaengt ? + if (nDestTab > MAXTAB) // angehaengt ? nDestTab = pDoc->GetTableCount() - 1; pDoc->MoveTab( nDestTab, nOldTab ); @@ -593,7 +593,7 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; SCTAB nNewTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)]; - if (nDestTab > MAXTAB) // angehaengt ? + if (nDestTab > MAXTAB) // angehaengt ? nDestTab = pDoc->GetTableCount() - 1; pDoc->MoveTab( nOldTab, nNewTab ); @@ -602,7 +602,7 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const } } - SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator pDocShell->PostPaintGridAll(); pDocShell->PostPaintExtras(); @@ -632,7 +632,7 @@ BOOL ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const //---------------------------------------------------------------------------------- // -// Tabelle kopieren +// Tabelle kopieren // ScUndoCopyTab::ScUndoCopyTab( ScDocShell* pNewDocShell, @@ -668,7 +668,7 @@ void ScUndoCopyTab::DoChange() const if (pViewShell) pViewShell->SetTabNo(theOldTabs[0],TRUE); - SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator pDocShell->PostPaintGridAll(); pDocShell->PostPaintExtras(); @@ -685,7 +685,7 @@ void ScUndoCopyTab::Undo() for(i=theNewTabs.Count()-1;i>=0;i--) { SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; - if (nDestTab > MAXTAB) // append? + if (nDestTab > MAXTAB) // append? nDestTab = pDoc->GetTableCount() - 1; bDrawIsInUndo = TRUE; @@ -693,13 +693,13 @@ void ScUndoCopyTab::Undo() bDrawIsInUndo = FALSE; } - // ScTablesHint broadcasts after all sheets have been deleted, - // so sheets and draw pages are in sync! + // ScTablesHint broadcasts after all sheets have been deleted, + // so sheets and draw pages are in sync! for(i=theNewTabs.Count()-1;i>=0;i--) { SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; - if (nDestTab > MAXTAB) // append? + if (nDestTab > MAXTAB) // append? nDestTab = pDoc->GetTableCount() - 1; pDocShell->Broadcast( ScTablesHint( SC_TAB_DELETED, nDestTab ) ); @@ -719,7 +719,7 @@ void ScUndoCopyTab::Redo() nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; SCTAB nNewTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)]; - if (nDestTab > MAXTAB) // angehaengt ? + if (nDestTab > MAXTAB) // angehaengt ? nDestTab = pDoc->GetTableCount() - 1; bDrawIsInUndo = TRUE; @@ -730,7 +730,7 @@ void ScUndoCopyTab::Redo() SCTAB nAdjSource = nOldTab; if ( nNewTab <= nOldTab ) - ++nAdjSource; // new position of source table after CopyTab + ++nAdjSource; // new position of source table after CopyTab if ( pDoc->IsScenario(nAdjSource) ) { @@ -752,7 +752,7 @@ void ScUndoCopyTab::Redo() RedoSdrUndoAction( pDrawUndo ); // after the sheets are inserted - pViewShell->SetTabNo( nDestTab, TRUE ); // after draw-undo + pViewShell->SetTabNo( nDestTab, TRUE ); // after draw-undo DoChange(); @@ -773,7 +773,7 @@ BOOL ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const // Tab Bg Color // -ScUndoTabColor::ScUndoTabColor( +ScUndoTabColor::ScUndoTabColor( ScDocShell* pNewDocShell, SCTAB nT, const Color& aOTabBgColor, const Color& aNTabBgColor) : ScSimpleUndo( pNewDocShell ) { @@ -843,7 +843,7 @@ BOOL ScUndoTabColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const // ----------------------------------------------------------------------- // -// Szenario anlegen +// Szenario anlegen // ScUndoMakeScenario::ScUndoMakeScenario( ScDocShell* pNewDocShell, @@ -937,7 +937,7 @@ BOOL ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Tabelle einfuegen +// Tabelle einfuegen // ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell, @@ -980,14 +980,14 @@ void ScUndoImportTab::DoChange() const } } - SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS ); } void ScUndoImportTab::Undo() { - //! eingefuegte Bereichsnamen etc. + //! eingefuegte Bereichsnamen etc. SCTAB i; ScDocument* pDoc = pDocShell->GetDocument(); @@ -1047,7 +1047,7 @@ void ScUndoImportTab::Redo() ScDocument* pDoc = pDocShell->GetDocument(); String aName; SCTAB i; - for (i=0; i<nCount; i++) // first insert all sheets (#63304#) + for (i=0; i<nCount; i++) // first insert all sheets (#63304#) { SCTAB nTabPos=nTab+i; pRedoDoc->GetName(nTabPos,aName); @@ -1055,7 +1055,7 @@ void ScUndoImportTab::Redo() pDoc->InsertTab(nTabPos,aName); bDrawIsInUndo = FALSE; } - for (i=0; i<nCount; i++) // then copy into inserted sheets + for (i=0; i<nCount; i++) // then copy into inserted sheets { SCTAB nTabPos=nTab+i; pRedoDoc->CopyToDocument(0,0,nTabPos, MAXCOL,MAXROW,nTabPos, IDF_ALL,FALSE, pDoc ); @@ -1098,7 +1098,7 @@ BOOL ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const // ----------------------------------------------------------------------- // -// Tabellen-Verknuepfung aufheben +// Tabellen-Verknuepfung aufheben // ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) : @@ -1108,8 +1108,8 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) : { ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); - pTabs = new SCTAB[nTabCount]; - pModes = new BYTE[nTabCount]; + pTabs = new SCTAB[nTabCount]; + pModes = new BYTE[nTabCount]; pTabNames = new String[nTabCount]; for (SCTAB i=0; i<nTabCount; i++) @@ -1155,9 +1155,9 @@ void ScUndoRemoveLink::DoChange( BOOL bLink ) const ScDocument* pDoc = pDocShell->GetDocument(); String aEmpty; for (USHORT i=0; i<nCount; i++) - if (bLink) // establish link + if (bLink) // establish link pDoc->SetLink( pTabs[i], pModes[i], aDocName, aFltName, aOptions, pTabNames[i], nRefreshDelay ); - else // remove link + else // remove link pDoc->SetLink( pTabs[i], SC_LINK_NONE, aEmpty, aEmpty, aEmpty, aEmpty, 0 ); pDocShell->UpdateLinks(); } @@ -1174,7 +1174,7 @@ void ScUndoRemoveLink::Redo() void ScUndoRemoveLink::Repeat(SfxRepeatTarget& /* rTarget */) { - // gippsnich + // gippsnich } BOOL ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const @@ -1185,7 +1185,7 @@ BOOL ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const // ----------------------------------------------------------------------- // -// Tabellen ein-/ausblenden +// Tabellen ein-/ausblenden // ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewShow ) : @@ -1382,7 +1382,7 @@ String ScUndoTabProtect::GetComment() const // ----------------------------------------------------------------------- // -// Druck-/Wiederholungsbereiche aendern +// Druck-/Wiederholungsbereiche aendern // ScUndoPrintRange::ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab, @@ -1433,12 +1433,12 @@ void ScUndoPrintRange::Redo() void ScUndoPrintRange::Repeat(SfxRepeatTarget& /* rTarget */) { - // gippsnich + // gippsnich } BOOL ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const { - return FALSE; // gippsnich + return FALSE; // gippsnich } String ScUndoPrintRange::GetComment() const @@ -1451,22 +1451,22 @@ String ScUndoPrintRange::GetComment() const //--------------------------------------------------------------------------------- // -// Szenario-Flags +// Szenario-Flags // ScUndoScenarioFlags::ScUndoScenarioFlags( ScDocShell* pNewDocShell, SCTAB nT, const String& rON, const String& rNN, const String& rOC, const String& rNC, const Color& rOCol, const Color& rNCol, USHORT nOF, USHORT nNF ) : ScSimpleUndo( pNewDocShell ), - nTab ( nT ), - aOldName ( rON ), - aNewName ( rNN ), - aOldComment ( rOC ), - aNewComment ( rNC ), - aOldColor ( rOCol ), - aNewColor ( rNCol ), - nOldFlags ( nOF ), - nNewFlags ( nNF ) + nTab ( nT ), + aOldName ( rON ), + aNewName ( rNN ), + aOldComment ( rOC ), + aNewComment ( rNC ), + aOldColor ( rOCol ), + aNewColor ( rNCol ), + nOldFlags ( nOF ), + nNewFlags ( nNF ) { } @@ -1487,7 +1487,7 @@ void ScUndoScenarioFlags::Undo() pDoc->SetScenarioData( nTab, aOldComment, aOldColor, nOldFlags ); pDocShell->PostPaintGridAll(); - // Der Tabellenname koennte in einer Formel vorkommen... + // Der Tabellenname koennte in einer Formel vorkommen... ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) pViewShell->UpdateInputHandler(); @@ -1504,7 +1504,7 @@ void ScUndoScenarioFlags::Redo() pDoc->SetScenarioData( nTab, aNewComment, aNewColor, nNewFlags ); pDocShell->PostPaintGridAll(); - // Der Tabellenname koennte in einer Formel vorkommen... + // Der Tabellenname koennte in einer Formel vorkommen... ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) pViewShell->UpdateInputHandler(); @@ -1515,7 +1515,7 @@ void ScUndoScenarioFlags::Redo() void ScUndoScenarioFlags::Repeat(SfxRepeatTarget& /* rTarget */) { - // Repeat macht keinen Sinn + // Repeat macht keinen Sinn } BOOL ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const @@ -1526,16 +1526,16 @@ BOOL ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const //--------------------------------------------------------------------------------- // -// rename object -// (move to different file?) +// rename object +// (move to different file?) // ScUndoRenameObject::ScUndoRenameObject( ScDocShell* pNewDocShell, const String& rPN, const String& rON, const String& rNN ) : ScSimpleUndo( pNewDocShell ), aPersistName( rPN ), - aOldName ( rON ), - aNewName ( rNN ) + aOldName ( rON ), + aNewName ( rNN ) { } @@ -1545,7 +1545,7 @@ ScUndoRenameObject::~ScUndoRenameObject() String ScUndoRenameObject::GetComment() const { - // string resource shared with title for dialog + // string resource shared with title for dialog return String( ScResId(SCSTR_RENAMEOBJECT) ); } @@ -1608,7 +1608,7 @@ BOOL ScUndoRenameObject::CanRepeat(SfxRepeatTarget& /* rTarget */) const // ----------------------------------------------------------------------- // -// Switch sheet between left-to-right and right-to-left +// Switch sheet between left-to-right and right-to-left // ScUndoLayoutRTL::ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRTL ) : diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 0be0a7f4f363..6c8066dd0c38 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.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/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: diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 7eff6768aa96..bdab4fd28ddb 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.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 @@ -39,12 +39,12 @@ class ScCellRangesBase; -namespace ooo +namespace ooo { - namespace vba + namespace vba { namespace excel - { + { // nTabs empty means apply zoom to all sheets void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs ); void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel ); diff --git a/sc/source/ui/vba/helperdecl.hxx b/sc/source/ui/vba/helperdecl.hxx index 27930279bcf6..4a0d0d3c01c6 100644 --- a/sc/source/ui/vba/helperdecl.hxx +++ b/sc/source/ui/vba/helperdecl.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 @@ -40,7 +40,7 @@ struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<Impl vba_service_class_() : baseT() {} template <typename PostProcessFuncT> /** Ctor to pass a post processing function/functor. - + @tpl PostProcessDefaultT let your compiler deduce this @param postProcessFunc function/functor that gets the yet unacquired ImplT_ pointer returning a diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index e0ed82fbc0fd..875424fc54ea 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.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 @@ namespace worksheet { extern sdecl::ServiceDecl const serviceDecl; } -namespace window +namespace window { extern sdecl::ServiceDecl const serviceDecl; } @@ -59,11 +59,11 @@ namespace globals { extern sdecl::ServiceDecl const serviceDecl; } -namespace hyperlink +namespace hyperlink { extern sdecl::ServiceDecl const serviceDecl; } -namespace application +namespace application { extern sdecl::ServiceDecl const serviceDecl; } @@ -71,27 +71,27 @@ namespace vbaeventshelper { extern sdecl::ServiceDecl const serviceDecl; } -namespace textframe +namespace textframe { extern sdecl::ServiceDecl const serviceDecl; } extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { OSL_TRACE("In component_getImplementationEnv"); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { OSL_TRACE("In component_writeInfo"); #if 0 // Component registration - if ( component_writeInfoHelper( pServiceManager, pRegistryKey, + if ( component_writeInfoHelper( pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) ) { // Singleton registration @@ -102,7 +102,7 @@ extern "C" Reference< registry::XRegistryKey >xKey = pKey->createKey( rtl::OUString::createFromAscii( ("ooo.vba.Globals/UNO/SINGLETONS/ooo.vba.theGlobals") ) ); - xKey->setStringValue( ::rtl::OUString::createFromAscii( + xKey->setStringValue( ::rtl::OUString::createFromAscii( ("ooo.vba.Globals") ) ); return sal_True; } @@ -114,13 +114,13 @@ extern "C" return sal_False; #else // Component registration - return component_writeInfoHelper( pServiceManager, pRegistryKey, + return component_writeInfoHelper( pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl, textframe::serviceDecl ); #endif - + } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/sc/source/ui/vba/testvba/launchTest.pl b/sc/source/ui/vba/testvba/launchTest.pl index 243798616052..5b64f7522c09 100644 --- a/sc/source/ui/vba/testvba/launchTest.pl +++ b/sc/source/ui/vba/testvba/launchTest.pl @@ -1,7 +1,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 @@ -31,14 +31,14 @@ my $test_class = shift || die 'must provide a ext name'; my $TESTDOCUMENT = shift || die 'must provide a path to testdocument dirs'; my $OUTPUTDIR = shift || die 'must provide an output path to deposit logs in'; -die "can't access TestClass $test_class/TestVBA.class" unless -f "$test_class/TestVBA.class"; -die "can't access officepath env variable \$OFFICEPATH" unless -d $ENV{OFFICEPATH}; -die "can't access testdocuments" unless -d $TESTDOCUMENT; -die "testdocument not of the correct structure $TESTDOCUMENT/logs/excel" unless -d "$TESTDOCUMENT/logs/excel"; -die "can't access output dir" unless -d $OUTPUTDIR; +die "can't access TestClass $test_class/TestVBA.class" unless -f "$test_class/TestVBA.class"; +die "can't access officepath env variable \$OFFICEPATH" unless -d $ENV{OFFICEPATH}; +die "can't access testdocuments" unless -d $TESTDOCUMENT; +die "testdocument not of the correct structure $TESTDOCUMENT/logs/excel" unless -d "$TESTDOCUMENT/logs/excel"; +die "can't access output dir" unless -d $OUTPUTDIR; -my $officeclasspath = "$ENV{OFFICEPATH}/program/classes/"; +my $officeclasspath = "$ENV{OFFICEPATH}/program/classes/"; my $classpath = "$officeclasspath/jurt.jar:$officeclasspath/unoil.jar:$officeclasspath/juh.jar:$officeclasspath/java_uno.jar:$officeclasspath/ridl.jar:$test_class:$ENV{CLASSPATH}"; $ENV{CLASSPATH}=$classpath; print "classpath $ENV{CLASSPATH}\n"; diff --git a/sc/source/ui/vba/testvba/runTests.pl b/sc/source/ui/vba/testvba/runTests.pl index e686a1d4cb89..70f80329cfeb 100755 --- a/sc/source/ui/vba/testvba/runTests.pl +++ b/sc/source/ui/vba/testvba/runTests.pl @@ -51,7 +51,7 @@ $failed = ( $exit_value || $signal_num || $dumped_core ); print "$failed = ( $exit_value || $signal_num || $dumped_core )\n"; if ( !$failed && open(UNAME, "uname -a|") ) { - $theResult = <UNAME>; + $theResult = <UNAME>; close(UNAME); if ( $theResult =~ /^CYGWIN/ ) { # windows under cygwin @@ -62,7 +62,7 @@ if ( !$failed && open(UNAME, "uname -a|") ) { uri_escape($testDocDir); # hacky windows url construction $testDocDir="file:///$testDocDir"; - + chomp($testDocDir); #print "*** doc dir is $testDocDir\n"; $testLogDir = `cygpath -m "$testLogDir"`; diff --git a/sc/source/ui/vba/testvba/testResult.pl b/sc/source/ui/vba/testvba/testResult.pl index 5f065924d5c4..171be2597ddb 100644 --- a/sc/source/ui/vba/testvba/testResult.pl +++ b/sc/source/ui/vba/testvba/testResult.pl @@ -11,13 +11,13 @@ my $timestampclean= "perl $binDir/timestampsClean.pl"; sub testLog { # 2 No Log to compare against - # 1 Log passed + # 1 Log passed # 0 Log failed my $result = 0; my $testfile = shift; my $dirtocheck = shift; my $filename = basename($testfile); - $filename = "$logdir/$filename"; + $filename = "$logdir/$filename"; print "processing $testfile $filename\n"; if ( -f $filename ) { my $tmpFile; @@ -29,9 +29,9 @@ sub testLog my $info = stat($tmpFile) or die "no $tmpFile: $!"; if ( ($status >>=8) == 0 && ( $info->size == 0) ) { #print "diff worked size is 0\n"; - $result = 1; + $result = 1; } - elsif ( ($status >>=8) == 0 && ( $info->size > 0) ) + elsif ( ($status >>=8) == 0 && ( $info->size > 0) ) { #print "diff worked size > 0\n"; $result = 0; @@ -106,9 +106,9 @@ sub slurp_dir($) while ($fname = readdir ($dirhandle)) { $fname = filter_crud($fname); defined $fname || next; -# if (-d "$dir/$fname") { -# push @files, slurp_dir("$dir/$fname"); -# } else +# if (-d "$dir/$fname") { +# push @files, slurp_dir("$dir/$fname"); +# } else { push @files, "$dir/$fname"; } @@ -136,9 +136,9 @@ print "$testfilepath\n"; for $a (@files) { $filename = $a; if ( "$testfilepath" eq "$filename" ) - { + { $processed++; - my $testcase = $a; + my $testcase = $a; $testcase =~ s/\.log/\.xls/; my $result = testLog( $a, $logdir ); if ( $result == 0 ) { @@ -148,13 +148,13 @@ for $a (@files) { elsif ( $result == 2 ) { #print "skipped $a\n"; push @skippedTests, $testcase; - } + } else { $passed++; push @passedTests, $testcase; - #print "Test document for $a \t \t passed. \n"; - } + #print "Test document for $a \t \t passed. \n"; } + } } my $compared=@passedTests+@failedTests; my $skip = @skippedTests; @@ -163,7 +163,7 @@ print "compared $compared test-case documents\n"; print "\t \t $passed tests $@passedTests\n"; if ( @failedTests > 0 ) { print "the following test-case documents failed, please examine the logs manually\n"; - + for $a (@failedTests) { print "\t$a\n"; } diff --git a/sc/source/ui/vba/testvba/testResults.pl b/sc/source/ui/vba/testvba/testResults.pl index 39ec26ba38be..6f731327e76b 100755 --- a/sc/source/ui/vba/testvba/testResults.pl +++ b/sc/source/ui/vba/testvba/testResults.pl @@ -11,13 +11,13 @@ my $timestampclean= "perl $binDir/timestampsClean.pl"; sub testLog { # 2 No Log to compare against - # 1 Log passed + # 1 Log passed # 0 Log failed my $result = 0; my $testfile = shift; my $dirtocheck = shift; my $filename = basename($testfile); - $filename = "$logdir/$filename"; + $filename = "$logdir/$filename"; print "processing $testfile $filename\n"; if ( -f $filename ) { my $tmpFile; @@ -29,9 +29,9 @@ sub testLog my $info = stat($tmpFile) or die "no $tmpFile: $!"; if ( ($status >>=8) == 0 && ( $info->size == 0) ) { #print "diff worked size is 0\n"; - $result = 1; + $result = 1; } - elsif ( ($status >>=8) == 0 && ( $info->size > 0) ) + elsif ( ($status >>=8) == 0 && ( $info->size > 0) ) { #print "diff worked size > 0\n"; $result = 0; @@ -106,9 +106,9 @@ sub slurp_dir($) while ($fname = readdir ($dirhandle)) { $fname = filter_crud($fname); defined $fname || next; -# if (-d "$dir/$fname") { -# push @files, slurp_dir("$dir/$fname"); -# } else +# if (-d "$dir/$fname") { +# push @files, slurp_dir("$dir/$fname"); +# } else { push @files, "$dir/$fname"; } @@ -131,7 +131,7 @@ my @failedTests=(); my $failureCmd=""; for $a (@files) { $processed++; - my $testcase = $a; + my $testcase = $a; $testcase =~ s/\.log/\.xls/; my $result = testLog( $a, $logdir ); if ( $result == 0 ) { @@ -141,12 +141,12 @@ for $a (@files) { elsif ( $result == 2 ) { #print "skipped $a\n"; push @skippedTests, $testcase; - } + } else { $passed++; push @passedTests, $testcase; - #print "Test document for $a \t \t passed. \n"; - } + #print "Test document for $a \t \t passed. \n"; + } } my $compared=@passedTests+@failedTests; my $skip = @skippedTests; @@ -155,7 +155,7 @@ print "compared $compared test-case documents\n"; print "\t \t $passed tests $@passedTests\n"; if ( @failedTests > 0 ) { print "the following test-case documents failed, please examine the logs manually\n"; - + for $a (@failedTests) { print "\t$a\n"; } diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx index cf04d45250db..f240c523edc6 100644 --- a/sc/source/ui/vba/testvba/testvba.cxx +++ b/sc/source/ui/vba/testvba/testvba.cxx @@ -45,7 +45,7 @@ using ::rtl::OUString; using ::std::auto_ptr; -const OUString EXTN = rtl::OUString::createFromAscii(".xls"); +const OUString EXTN = rtl::OUString::createFromAscii(".xls"); OUString convertToURL( const OUString& rPath ) { @@ -92,16 +92,16 @@ private: rtl::OUString msOutDirPath; protected: public: - TestVBA( const Reference< XComponentContext >& _xContext, - const Reference< XMultiComponentFactory >& _xMCF, - const Reference< XComponentLoader >& _xCompLoader, - const rtl::OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ), -mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) + TestVBA( const Reference< XComponentContext >& _xContext, + const Reference< XMultiComponentFactory >& _xMCF, + const Reference< XComponentLoader >& _xCompLoader, + const rtl::OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ), +mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) { mxSFA.set( mxMCF->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), mxContext), uno::UNO_QUERY_THROW ); - } + } - rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) + rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { rtl::OUString sLogLocation; Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); @@ -109,7 +109,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) sLogLocation = sLogLocation.concat( rtl::OUString::createFromAscii( "/" ) ).concat( rtl::OUString::createFromAscii( "HelperAPI-test.log" ) ); return sLogLocation; } - rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) + rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { printf("%s\n", getenv("HOME") ); printf("file name %s\n", rtl::OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -121,17 +121,17 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) return sLogLocation; } - void init() + void init() { // blow away previous logs? } - void proccessDocument( const rtl::OUString& sUrl ) + void proccessDocument( const rtl::OUString& sUrl ) { - if ( !mxSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".xls", 4 ) ) - + if ( !mxSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".xls", 4 ) ) + { - try + try { OSL_TRACE( "processing %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); printf( "processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -142,17 +142,17 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) rtl::OUString sfileUrl = convertToURL( sUrl ); printf( "try to get xDoc %s\n", rtl::OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); - Reference< uno::XInterface > xDoc = + Reference< uno::XInterface > xDoc = mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString::createFromAscii( "_blank" ), 0, propertyValues); printf( "got xDoc\n" ); OUString logFileURL = convertToURL( getLogLocation() ); try { - Reference< script::provider::XScriptProviderSupplier > xSupplier( xDoc, uno::UNO_QUERY_THROW ) ; - if ( mxSFA->exists( logFileURL ) ) + Reference< script::provider::XScriptProviderSupplier > xSupplier( xDoc, uno::UNO_QUERY_THROW ) ; + if ( mxSFA->exists( logFileURL ) ) mxSFA->kill( logFileURL ); - + printf("try to get the ScriptProvider\n"); Reference< script::provider::XScriptProvider > xProv = xSupplier->getScriptProvider(); printf("get the ScriptProvider\n"); @@ -176,9 +176,9 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) Sequence< uno::Any > aArgs; Sequence< sal_Int16 > aOutArgsIndex; Sequence< uno::Any > aOutArgs; - - xScript->invoke(aArgs, aOutArgsIndex, aOutArgs); - + + xScript->invoke(aArgs, aOutArgsIndex, aOutArgs); + OUString fileName = sUrl.copy ( sUrl.lastIndexOf( '/' ) ); OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString::createFromAscii( ".log" ); try @@ -196,7 +196,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) OSL_TRACE("new logfile location is %s ", rtl::OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("moved to new location\n"); } - + } catch ( uno::Exception& e ) { @@ -205,8 +205,8 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) // interface is supported, otherwise use XComponent.dispose Reference< util::XCloseable > xCloseable ( xDoc, uno::UNO_QUERY ); - - if ( xCloseable.is() ) + + if ( xCloseable.is() ) { printf("try to close\n"); // will close application. and only run a test case for 3.0 @@ -216,8 +216,8 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) // so, for run all test cases, it should not close the document at this moment. xCloseable->close(sal_False); printf("closed\n"); - } - else + } + else { printf("try to dispose\n"); Reference< XComponent > xComp( xDoc, uno::UNO_QUERY_THROW ); @@ -226,32 +226,32 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) printf("disposed\n"); } } - catch( uno::Exception& e ) + catch( uno::Exception& e ) { std::cerr << "Caught exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; } - + } printf("complete processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); } - void traverse( const rtl::OUString& sFileDirectory ) + void traverse( const rtl::OUString& sFileDirectory ) { - rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory ); - if ( !mxSFA->isFolder( sFileDirectoryURL) ) + rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory ); + if ( !mxSFA->isFolder( sFileDirectoryURL) ) { throw lang::IllegalArgumentException( rtl::OUString::createFromAscii( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 ); - } + } // Getting all files and directories in the current directory Sequence<OUString> entries = mxSFA->getFolderContents( sFileDirectoryURL, sal_False ); - + // Iterating for each file and directory printf( "Entries %d\n", (int)entries.getLength() ); - for ( sal_Int32 i = 0; i < entries.getLength(); ++i ) + for ( sal_Int32 i = 0; i < entries.getLength(); ++i ) { proccessDocument( entries[ i ] ); } - } + } }; void tryDispose( Reference< uno::XInterface > xIF, const char* sComp ) @@ -262,7 +262,7 @@ void tryDispose( Reference< uno::XInterface > xIF, const char* sComp ) try { xComponent->dispose(); - } + } catch( uno::Exception& e ) { std::cerr << "tryDispose caught exception " <<rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << " while disposing " << sComp << std::endl; @@ -298,8 +298,8 @@ int main( int argv, char** argc ) dTest->traverse( ascii( argc[ 1 ] ) ); } delete dTest; -// tryDispose( xLoader, "desktop" ); -// tryDispose( xCC, "remote context" ); +// tryDispose( xLoader, "desktop" ); +// tryDispose( xCC, "remote context" ); } catch( uno::Exception& e ) diff --git a/sc/source/ui/vba/testvba/timestampsClean.pl b/sc/source/ui/vba/testvba/timestampsClean.pl index dade65c7200f..2c947d0cc6d5 100755 --- a/sc/source/ui/vba/testvba/timestampsClean.pl +++ b/sc/source/ui/vba/testvba/timestampsClean.pl @@ -65,7 +65,7 @@ while (<>) { output_lines(\@lines); # $detectedSomeGuff contains the skipped hunks that contain acceptable diff -# e.g. a timestamp or an OK assertion that contains different content +# e.g. a timestamp or an OK assertion that contains different content # like perhaps a path #print "frag_count = $frag_count fragstocount = $fragstocount detectedSomeGuff = $detectedSomeGuff \n"; if ($frag_count > $detectedSomeGuff) { diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 7ed96e7f900e..8c9581a66d23 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1706,31 +1706,31 @@ ConvertCountryCode(const OUString& language) if( language == OUString::createFromAscii("ar") ) nCode = 966; // Arabic else if ( language == OUString::createFromAscii("cs") ) nCode = 42; // Czech - else if ( language == OUString::createFromAscii("da") ) nCode = 45; // Danish - else if ( language == OUString::createFromAscii("de") ) nCode = 49; // German - else if ( language == OUString::createFromAscii("en") ) nCode = 1; // English - else if ( language == OUString::createFromAscii("es") ) nCode = 34; // Spanish - else if ( language == OUString::createFromAscii("el") ) nCode = 30; // Greek - else if ( language == OUString::createFromAscii("fa") ) nCode = 98; // Persian = Farsi + else if ( language == OUString::createFromAscii("da") ) nCode = 45; // Danish + else if ( language == OUString::createFromAscii("de") ) nCode = 49; // German + else if ( language == OUString::createFromAscii("en") ) nCode = 1; // English + else if ( language == OUString::createFromAscii("es") ) nCode = 34; // Spanish + else if ( language == OUString::createFromAscii("el") ) nCode = 30; // Greek + else if ( language == OUString::createFromAscii("fa") ) nCode = 98; // Persian = Farsi else if ( language == OUString::createFromAscii("fi") ) nCode = 358; // Finnish - else if ( language == OUString::createFromAscii("fr") ) nCode = 33; // French - else if ( language == OUString::createFromAscii("he") ) nCode = 972; // Hebrew - else if ( language == OUString::createFromAscii("hi") ) nCode = 91; // Indian = Hindi - else if ( language == OUString::createFromAscii("hu") ) nCode = 36; // Hungarian - else if ( language == OUString::createFromAscii("it") ) nCode = 39; // Italian - else if ( language == OUString::createFromAscii("ja") ) nCode = 81; // Japanese - else if ( language == OUString::createFromAscii("ko") ) nCode = 82; // Korean - else if ( language == OUString::createFromAscii("nl") ) nCode = 31; // Dutch - else if ( language == OUString::createFromAscii("no") ) nCode = 47; // Norwegian - else if ( language == OUString::createFromAscii("pl") ) nCode = 48; // Polish - else if ( language == OUString::createFromAscii("pt") ) nCode = 351; // Portuguese - else if ( language == OUString::createFromAscii("ru") ) nCode = 7; // Russian + else if ( language == OUString::createFromAscii("fr") ) nCode = 33; // French + else if ( language == OUString::createFromAscii("he") ) nCode = 972; // Hebrew + else if ( language == OUString::createFromAscii("hi") ) nCode = 91; // Indian = Hindi + else if ( language == OUString::createFromAscii("hu") ) nCode = 36; // Hungarian + else if ( language == OUString::createFromAscii("it") ) nCode = 39; // Italian + else if ( language == OUString::createFromAscii("ja") ) nCode = 81; // Japanese + else if ( language == OUString::createFromAscii("ko") ) nCode = 82; // Korean + else if ( language == OUString::createFromAscii("nl") ) nCode = 31; // Dutch + else if ( language == OUString::createFromAscii("no") ) nCode = 47; // Norwegian + else if ( language == OUString::createFromAscii("pl") ) nCode = 48; // Polish + else if ( language == OUString::createFromAscii("pt") ) nCode = 351; // Portuguese + else if ( language == OUString::createFromAscii("ru") ) nCode = 7; // Russian else if ( language == OUString::createFromAscii("sv") ) nCode = 46; // Swedish - else if ( language == OUString::createFromAscii("th") ) nCode = 66; // Thai - else if ( language == OUString::createFromAscii("tk") ) nCode = 90; // Turkish - else if ( language == OUString::createFromAscii("ur") ) nCode = 92; // Urdu - else if ( language == OUString::createFromAscii("vi") ) nCode = 84; // Vietnamese - else if ( language == OUString::createFromAscii("zh") ) nCode = 86; // Simplified Chinese + else if ( language == OUString::createFromAscii("th") ) nCode = 66; // Thai + else if ( language == OUString::createFromAscii("tk") ) nCode = 90; // Turkish + else if ( language == OUString::createFromAscii("ur") ) nCode = 92; // Urdu + else if ( language == OUString::createFromAscii("vi") ) nCode = 84; // Vietnamese + else if ( language == OUString::createFromAscii("zh") ) nCode = 86; // Simplified Chinese return nCode; } diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 714bb783f3cb..43ab4589809c 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.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,51 +76,51 @@ void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn ) throw (uno::RuntimeException } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaAssistant::getTop() throw (css::uno::RuntimeException) { return m_nPointsTop; } -void SAL_CALL +void SAL_CALL ScVbaAssistant::setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException) { m_nPointsTop = _top; } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaAssistant::getLeft() throw (css::uno::RuntimeException) { return m_nPointsLeft; } -void SAL_CALL +void SAL_CALL ScVbaAssistant::setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException) { m_nPointsLeft = _left; } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaAssistant::getAnimation() throw (css::uno::RuntimeException) { return m_nAnimation; } -void SAL_CALL +void SAL_CALL ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException) { m_nAnimation = _animation; } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return m_sName; } -rtl::OUString& +rtl::OUString& ScVbaAssistant::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaAssistant::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index 8490927c3240..7c8f93186e8c 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.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 @@ -50,7 +50,7 @@ private: public: ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~ScVbaAssistant(); - // XAssistant + // XAssistant virtual sal_Bool SAL_CALL getOn() throw (css::uno::RuntimeException); virtual void SAL_CALL setOn( sal_Bool _on ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index eac7083a797c..e528b949ff2c 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.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 @@ -42,7 +42,7 @@ using namespace ::ooo::vba::excel::XlAxisGroup; // each 'Item' in the Axes collection is indexed via 2 indexes, group and type. // We need to 'flatten' this into a single index in order to be able to wrap // iteration over the set of Axis(s) in a XIndexAccess implementation -// +// typedef ::std::pair<sal_Int32, sal_Int32 > AxesCoordinate; // type and group combination typedef ::std::vector< AxesCoordinate > vecAxesIndices; @@ -71,7 +71,7 @@ public: uno::Reference< excel::XAxis > ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException ) { - ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); + ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) throw uno::RuntimeException( rtl::OUString::createFromAscii( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); @@ -90,18 +90,18 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: class AxisIndexWrapper : public AxisIndexWrapper_BASE { - // if necessary for better performance we could change this into a map and cache the + // if necessary for better performance we could change this into a map and cache the // indices -> Axis, currently we create a new Axis object // on each getByIndex uno::Reference< uno::XComponentContext > mxContext; vecAxesIndices mCoordinates; uno::Reference< excel::XChart > mxChart; -public: +public: AxisIndexWrapper( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XChart >& xChart ) : mxContext( xContext ), mxChart( xChart ) { if ( mxChart.is() ) { - ScVbaChart* pChart = static_cast< ScVbaChart* >( mxChart.get() ); + ScVbaChart* pChart = static_cast< ScVbaChart* >( mxChart.get() ); // primary sal_Bool bBool = false; uno::Reference< beans::XPropertySet > xDiagramPropertySet( pChart->xDiagramPropertySet() ); @@ -109,7 +109,7 @@ public: mCoordinates.push_back( AxesCoordinate( xlPrimary, xlCategory ) ); if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" ) ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlSeriesAxis ) ); - + if ( pChart->is3D() ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlValue ) ); @@ -119,7 +119,7 @@ public: if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" ) ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlSeriesAxis ) ); } - + } virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException) { return mCoordinates.size(); } virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException) @@ -148,19 +148,19 @@ ScVbaAxes::ScVbaAxes( const uno::Reference< XHelperInterface >& xParent,const un { } -uno::Type SAL_CALL +uno::Type SAL_CALL ScVbaAxes::getElementType() throw (css::uno::RuntimeException) { - return excel::XAxes::static_type(0); + return excel::XAxes::static_type(0); } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL ScVbaAxes::createEnumeration() throw (css::uno::RuntimeException) { return new EnumWrapper( m_xIndexAccess ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) throw (css::uno::RuntimeException) { // #TODO map the possible index combinations to a container::XIndexAccess wrapper impl @@ -177,20 +177,20 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) return uno::makeAny( createAxis( moChartParent, mxContext, nType, nAxisGroup ) ); } -uno::Any +uno::Any ScVbaAxes::createCollectionObject(const css::uno::Any& aSource) { return aSource; // pass through ( it's already an XAxis object } -rtl::OUString& +rtl::OUString& ScVbaAxes::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaAxes::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index f135f8e65c71..a9ebf1a76138 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.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 @@ -40,7 +40,7 @@ public: ScVbaAxes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< ov::excel::XChart >& xChart ); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index d51534264e38..9e17b30135a4 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.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 @@ -42,7 +42,7 @@ const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") ); const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("Max") ); const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("Min") ); -ScVbaChart* +ScVbaChart* ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() ); @@ -51,7 +51,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) return pChart; } -sal_Bool +sal_Bool ScVbaAxis::isValueAxis() throw( script::BasicErrorException ) { if ( getType() == xlCategory ) @@ -61,29 +61,29 @@ ScVbaAxis::isValueAxis() throw( script::BasicErrorException ) return sal_True; } -ScVbaAxis::ScVbaAxis( const uno::Reference< XHelperInterface >& xParent,const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ) : ScVbaAxis_BASE( xParent, xContext ), mxPropertySet( _xPropertySet ), mnType( _nType ), mnGroup( _nGroup ), bCrossesAreCustomized( sal_False ) +ScVbaAxis::ScVbaAxis( const uno::Reference< XHelperInterface >& xParent,const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ) : ScVbaAxis_BASE( xParent, xContext ), mxPropertySet( _xPropertySet ), mnType( _nType ), mnGroup( _nGroup ), bCrossesAreCustomized( sal_False ) { oShapeHelper.reset( new ShapeHelper( uno::Reference< drawing::XShape >( mxPropertySet, uno::UNO_QUERY ) ) ); moChartParent.set( xParent, uno::UNO_QUERY_THROW ); setType(_nType); - setCrosses(xlAxisCrossesAutomatic); + setCrosses(xlAxisCrossesAutomatic); } -void SAL_CALL +void SAL_CALL ScVbaAxis::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< lang::XComponent > xComponent( mxPropertySet, uno::UNO_QUERY_THROW ); xComponent->dispose(); } - uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL + uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< excel::XAxisTitle > xAxisTitle; try { ScVbaChart* pChart = getChartPtr(); - + if (getHasTitle() ) { int nType = getType(); @@ -98,7 +98,7 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce default: // xlValue: xAxisTitle = new ScVbaAxisTitle(this, mxContext, pChart->xAxisYSupplier->getYAxisTitle()); break; - } + } } } catch (uno::Exception& e) @@ -109,20 +109,20 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce } -void SAL_CALL +void SAL_CALL ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) throw (script::BasicErrorException, uno::RuntimeException) { DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaAxis::getDisplayUnit( ) throw (script::BasicErrorException, uno::RuntimeException) { DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); return -1; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -130,16 +130,16 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio double fNum = 0.0; switch (_nCrosses) { - case xlAxisCrossesAutomatic: //Microsoft Excel sets the axis crossing point. + case xlAxisCrossesAutomatic: //Microsoft Excel sets the axis crossing point. mxPropertySet->setPropertyValue(AUTOORIGIN, uno::makeAny( sal_True ) ); bCrossesAreCustomized = sal_False; return; - case xlAxisCrossesMinimum: // The axis crosses at the minimum value. + case xlAxisCrossesMinimum: // The axis crosses at the minimum value. mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum; setCrossesAt( fNum ); bCrossesAreCustomized = sal_False; break; - case xlAxisCrossesMaximum: // The axis crosses at the maximum value. + case xlAxisCrossesMaximum: // The axis crosses at the maximum value. mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum; setCrossesAt(fNum); bCrossesAreCustomized = sal_False; @@ -148,14 +148,14 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio bCrossesAreCustomized = sal_True; break; } - mxPropertySet->setPropertyValue(AUTOORIGIN, uno::makeAny(sal_False) ); + mxPropertySet->setPropertyValue(AUTOORIGIN, uno::makeAny(sal_False) ); } catch (uno::Exception& ) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); } } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeException) { sal_Int32 nCrosses = xlAxisCrossesCustom; @@ -168,7 +168,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept else { if (bCrossesAreCustomized) - nCrosses = xlAxisCrossesCustom; + nCrosses = xlAxisCrossesCustom; else { double forigin = 0.0; @@ -190,7 +190,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept return nCrosses; } - void SAL_CALL + void SAL_CALL ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -207,7 +207,7 @@ ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException } } - double SAL_CALL + double SAL_CALL ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeException) { double fCrosses = 0.0; @@ -222,19 +222,19 @@ ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeExce return fCrosses; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setType( ::sal_Int32 _nType ) throw (script::BasicErrorException, uno::RuntimeException) { mnType = _nType; } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaAxis::getType( ) throw (script::BasicErrorException, uno::RuntimeException) { return mnType; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -251,16 +251,16 @@ ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorExcepti break; default: // xlValue: pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")), uno::makeAny(_bHasTitle)); - } + } } catch (uno::Exception& e) { DebugHelper::exception(e); - } + } } - ::sal_Bool SAL_CALL + ::sal_Bool SAL_CALL ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeException) { sal_Bool bHasTitle = sal_False; @@ -278,7 +278,7 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep break; default: // xlValue: pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")) ) >>= bHasTitle; - } + } } catch (uno::Exception& e) { @@ -287,13 +287,13 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep return bHasTitle; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException, uno::RuntimeException) { try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp") ), uno::makeAny(_fMinorUnit)); + mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp") ), uno::makeAny(_fMinorUnit)); } catch (uno::Exception& ) { @@ -301,7 +301,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException } } -double SAL_CALL +double SAL_CALL ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeException) { double fMinor = 1.0; @@ -317,7 +317,7 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce return fMinor; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -331,7 +331,7 @@ ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::Bas } } - ::sal_Bool SAL_CALL + ::sal_Bool SAL_CALL ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException) { sal_Bool bIsAuto = sal_False; @@ -349,27 +349,27 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti return bIsAuto; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setReversePlotOrder( ::sal_Bool /*ReversePlotOrder*/ ) throw (script::BasicErrorException, uno::RuntimeException) { DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaAxis::getReversePlotOrder( ) throw (script::BasicErrorException, uno::RuntimeException) { DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); return sal_False; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException, uno::RuntimeException) { try { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain")), uno::makeAny(_fMajorUnit)); + mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain")), uno::makeAny(_fMajorUnit)); } } catch (uno::Exception& ) @@ -378,7 +378,7 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException } } -double SAL_CALL +double SAL_CALL ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeException) { double fMax = 1.0; @@ -394,7 +394,7 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce return fMax; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -410,7 +410,7 @@ ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::Bas } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException) { sal_Bool bIsAuto = sal_False; @@ -428,14 +428,14 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti return bIsAuto; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorException, uno::RuntimeException) { try { if ( isValueAxis() ) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ) ), uno::makeAny(_fMaximumScale)); + mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ) ), uno::makeAny(_fMaximumScale)); } } catch ( uno::Exception& ) @@ -444,7 +444,7 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc } } -double SAL_CALL +double SAL_CALL ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeException) { double fMax = 1.0; @@ -452,7 +452,7 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ))) >>= fMax; + mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ))) >>= fMax; } } catch (uno::Exception& ) @@ -463,23 +463,23 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE } -void SAL_CALL +void SAL_CALL ScVbaAxis::setMaximumScaleIsAuto( ::sal_Bool _bMaximumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException) { try { if ( isValueAxis() ) mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoMax" ) ), uno::makeAny( _bMaximumScaleIsAuto )); - + } catch ( uno::Exception& ) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); - } + } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException) { sal_Bool bIsAuto = sal_False; @@ -495,7 +495,7 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru return bIsAuto; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -509,7 +509,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc } } -double SAL_CALL +double SAL_CALL ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeException) { double fMin = 0.0; @@ -525,7 +525,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE return fMin; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -541,7 +541,7 @@ ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (scrip } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException) { sal_Bool bIsAuto = sal_False; @@ -549,7 +549,7 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin")) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin")) ) >>= bIsAuto; } } catch (uno::Exception& ) @@ -559,13 +559,13 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru return bIsAuto; } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaAxis::getAxisGroup( ) throw (uno::RuntimeException) { return mnGroup; } -void SAL_CALL +void SAL_CALL ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -592,10 +592,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce } } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeException) { - sal_Int32 nScaleType = xlScaleLinear; + sal_Int32 nScaleType = xlScaleLinear; try { if (isValueAxis()) @@ -605,7 +605,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce if (bisLogarithmic) nScaleType = xlScaleLogarithmic; else - nScaleType = xlScaleLinear; + nScaleType = xlScaleLinear; } } catch (uno::Exception& ) @@ -615,7 +615,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce return nScaleType; } -double SAL_CALL +double SAL_CALL ScVbaAxis::getHeight( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return oShapeHelper->getHeight(); @@ -650,14 +650,14 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx oShapeHelper->setLeft( left ); } -rtl::OUString& +rtl::OUString& ScVbaAxis::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaAxis::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index f5b22047d1b3..aa42ded186e3 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.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 @@ -41,11 +41,11 @@ class ScVbaAxis : public ScVbaAxis_BASE sal_Int32 mnType; sal_Int32 mnGroup; sal_Int32 mnCrosses; - sal_Bool bCrossesAreCustomized; + sal_Bool bCrossesAreCustomized; ScVbaChart* getChartPtr() throw( css::uno::RuntimeException ); sal_Bool isValueAxis() throw( css::script::BasicErrorException ); std::auto_ptr<ov::ShapeHelper> oShapeHelper; - + public: ScVbaAxis( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ); // Methods diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index cc5b0d791b13..2499fa756891 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.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,7 +41,7 @@ ScVbaAxisTitle::getServiceImplName() return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaAxisTitle::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx index 0360e40be4aa..4ab2c5e06c90 100644 --- a/sc/source/ui/vba/vbaaxistitle.hxx +++ b/sc/source/ui/vba/vbaaxistitle.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/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 7fbe157e2bdf..0cb28dbc6556 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.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,7 +62,7 @@ class ScVbaBorder : public ScVbaBorder_Base { private: uno::Reference< beans::XPropertySet > m_xProps; - sal_Int32 m_LineType; + sal_Int32 m_LineType; ScVbaPalette m_Palette; bool setBorderLine( table::BorderLine& rBorderLine ) { @@ -79,7 +79,7 @@ private: aTableBorder.IsTopLineValid = sal_True; aTableBorder.TopLine = rBorderLine; break; - + case XlBordersIndex::xlEdgeBottom: aTableBorder.IsBottomLineValid = sal_True; aTableBorder.BottomLine = rBorderLine; @@ -100,13 +100,13 @@ private: case XlBordersIndex::xlDiagonalUp: // #TODO have to ignore at the momement, would be // nice to investigate what we can do here - break; + break; default: return false; } m_xProps->setPropertyValue( sTableBorder, uno::makeAny(aTableBorder) ); return true; - } + } bool getBorderLine( table::BorderLine& rBorderLine ) { @@ -122,7 +122,7 @@ private: if ( aTableBorder.IsTopLineValid ) rBorderLine = aTableBorder.TopLine; break; - + case XlBordersIndex::xlEdgeBottom: if ( aTableBorder.IsBottomLineValid ) rBorderLine = aTableBorder.BottomLine; @@ -144,18 +144,18 @@ private: case XlBordersIndex::xlDiagonalUp: // #TODO have to ignore at the momement, would be // nice to investigate what we can do here - break; + break; default: return false; } return true; - } + } ScVbaBorder(); // no impl -protected: +protected: virtual rtl::OUString& getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder") ); - return sImplName; + return sImplName; } virtual css::uno::Sequence<rtl::OUString> getServiceNames() { @@ -165,17 +165,17 @@ protected: aServiceNames.realloc( 1 ); aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Border" ) ); } - return aServiceNames; + return aServiceNames; } public: - ScVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, ScVbaPalette& rPalette) : ScVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} + ScVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, ScVbaPalette& rPalette) : ScVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} // XBorder uno::Any SAL_CALL getColor() throw (uno::RuntimeException) { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) - return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); + return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException) @@ -186,7 +186,7 @@ public: if ( getBorderLine( aBorderLine ) ) { aBorderLine.Color = XLRGBToOORGB( nColor ); - setBorderLine( aBorderLine ); + setBorderLine( aBorderLine ); } else throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() ); @@ -204,7 +204,7 @@ public: sal_Int32 nPaletteColor = 0; xIndex->getByIndex( count ) >>= nPaletteColor; if ( nPaletteColor == nColor ) - { + { nIndex = count + 1; break; } @@ -227,16 +227,16 @@ public: { switch ( aBorderLine.OuterLineWidth ) { - case 0: // Thin = default OO thickness - case OOLineThin: + case 0: // Thin = default OO thickness + case OOLineThin: return uno::makeAny( XlBorderWeight::xlThin ); - case OOLineMedium: + case OOLineMedium: return uno::makeAny( XlBorderWeight::xlMedium ); - case OOLineThick: + case OOLineThick: return uno::makeAny( XlBorderWeight::xlThick ); - case OOLineHairline: + case OOLineHairline: return uno::makeAny( XlBorderWeight::xlHairline ); - default: + default: break; } } @@ -251,7 +251,7 @@ public: { switch ( nWeight ) { - case XlBorderWeight::xlThin: + case XlBorderWeight::xlThin: aBorderLine.OuterLineWidth = OOLineThin; break; case XlBorderWeight::xlMedium: @@ -263,7 +263,7 @@ public: case XlBorderWeight::xlHairline: aBorderLine.OuterLineWidth = OOLineHairline; break; - default: + default: throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); @@ -277,7 +277,7 @@ public: // always return xlContinuous; return uno::makeAny( XlLineStyle::xlContinuous ); } - void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException) + void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException) { // Urk no choice but to silently ignore we don't support this attribute // #TODO would be nice to support the excel line styles @@ -330,14 +330,14 @@ public: RangeBorders( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< uno::XComponentContext > & xContext, ScVbaPalette& rPalette ) : m_xRange( xRange ), m_xContext( xContext ), m_Palette( rPalette ) { } - // XIndexAccess + // XIndexAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) { return SAL_N_ELEMENTS( supportedIndexTable ); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - + sal_Int32 nIndex = getTableIndex( Index ); if ( nIndex >= 0 && nIndex < getCount() ) { @@ -356,7 +356,7 @@ public: } }; -uno::Reference< container::XIndexAccess > +uno::Reference< container::XIndexAccess > rangeToBorderIndexAccess( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< uno::XComponentContext > & xContext, ScVbaPalette& rPalette ) { return new RangeBorders( xRange, xContext, rPalette ); @@ -381,11 +381,11 @@ public: } }; -ScVbaBorders::ScVbaBorders( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< table::XCellRange >& xRange, ScVbaPalette& rPalette ): ScVbaBorders_BASE( xParent, xContext, rangeToBorderIndexAccess( xRange ,xContext, rPalette ) ), bRangeIsSingleCell( false ) +ScVbaBorders::ScVbaBorders( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< table::XCellRange >& xRange, ScVbaPalette& rPalette ): ScVbaBorders_BASE( xParent, xContext, rangeToBorderIndexAccess( xRange ,xContext, rPalette ) ), bRangeIsSingleCell( false ) { uno::Reference< table::XColumnRowRange > xColumnRowRange(xRange, uno::UNO_QUERY_THROW ); - if ( xColumnRowRange->getRows()->getCount() == 1 && xColumnRowRange->getColumns()->getCount() == 1 ) - bRangeIsSingleCell = true; + if ( xColumnRowRange->getRows()->getCount() == 1 && xColumnRowRange->getColumns()->getCount() == 1 ) + bRangeIsSingleCell = true; m_xProps.set( xRange, uno::UNO_QUERY_THROW ); } @@ -401,7 +401,7 @@ ScVbaBorders::createCollectionObject( const css::uno::Any& aSource ) return aSource; // its already a Border object } -uno::Type +uno::Type ScVbaBorders::getElementType() throw (uno::RuntimeException) { return excel::XBorders::static_type(0); @@ -476,20 +476,20 @@ void SAL_CALL ScVbaBorders::setColorIndex( const uno::Any& _colorindex ) throw ( bool lcl_areAllLineWidthsSame( const table::TableBorder& maTableBorder, bool bIsCell ) { - + bool bRes = false; - if (bIsCell) + if (bIsCell) { - bRes = ((maTableBorder.TopLine.OuterLineWidth == maTableBorder.BottomLine.OuterLineWidth) && + bRes = ((maTableBorder.TopLine.OuterLineWidth == maTableBorder.BottomLine.OuterLineWidth) && (maTableBorder.TopLine.OuterLineWidth == maTableBorder.LeftLine.OuterLineWidth) && (maTableBorder.TopLine.OuterLineWidth == maTableBorder.RightLine.OuterLineWidth)); } else { - bRes = ((maTableBorder.TopLine.OuterLineWidth == maTableBorder.BottomLine.OuterLineWidth) && -(maTableBorder.TopLine.OuterLineWidth == maTableBorder.LeftLine.OuterLineWidth) && -(maTableBorder.TopLine.OuterLineWidth == maTableBorder.HorizontalLine.OuterLineWidth) && -(maTableBorder.TopLine.OuterLineWidth == maTableBorder.VerticalLine.OuterLineWidth) && + bRes = ((maTableBorder.TopLine.OuterLineWidth == maTableBorder.BottomLine.OuterLineWidth) && +(maTableBorder.TopLine.OuterLineWidth == maTableBorder.LeftLine.OuterLineWidth) && +(maTableBorder.TopLine.OuterLineWidth == maTableBorder.HorizontalLine.OuterLineWidth) && +(maTableBorder.TopLine.OuterLineWidth == maTableBorder.VerticalLine.OuterLineWidth) && (maTableBorder.TopLine.OuterLineWidth == maTableBorder.RightLine.OuterLineWidth)); } return bRes; @@ -504,14 +504,14 @@ uno::Any SAL_CALL ScVbaBorders::getLineStyle() throw (uno::RuntimeException) if ( lcl_areAllLineWidthsSame( maTableBorder, bRangeIsSingleCell )) { - if (maTableBorder.TopLine.LineDistance != 0) + if (maTableBorder.TopLine.LineDistance != 0) { aLinestyle = XlLineStyle::xlDouble; - } + } else if ( maTableBorder.TopLine.OuterLineWidth != 0 ) { aLinestyle = XlLineStyle::xlContinuous; - } + } } return uno::makeAny( aLinestyle ); } @@ -544,7 +544,7 @@ uno::Any SAL_CALL ScVbaBorders::getWeight() throw (uno::RuntimeException) } return weight; } -void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::RuntimeException) +void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::RuntimeException) { sal_Int32 count = getCount(); for( sal_Int32 i = 0; i < count ; i++ ) @@ -555,14 +555,14 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run } -rtl::OUString& +rtl::OUString& ScVbaBorders::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaBorders::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index 0164328a9e83..d6784691c488 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.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 @@ -35,7 +35,7 @@ #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/beans/XPropertySet.hpp> - + #include <vbahelper/vbacollectionimpl.hxx> typedef CollTestImplHelper< ov::excel::XBorders > ScVbaBorders_BASE; @@ -57,9 +57,9 @@ public: // XBorders - // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - + // ScVbaCollectionBaseImpl + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException); virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException); @@ -68,7 +68,7 @@ public: virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException); - // xxxxBASE + // xxxxBASE virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 011b0a4a72e1..5d12facad12b 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.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 @@ -40,7 +40,7 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar if ( nStart < 1 ) nStart = 1; // silently correct user error ( as ms ) nStart--; // OOo is 0 based - Length >>=nLength; + Length >>=nLength; uno::Reference< text::XTextCursor > xTextCursor( m_xSimpleText->createTextCursor(), uno::UNO_QUERY_THROW ); xTextCursor->collapseToStart(); if ( nStart ) @@ -58,41 +58,41 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaCharacters::getCaption() throw (css::uno::RuntimeException) { return m_xTextRange->getString(); } -void SAL_CALL +void SAL_CALL ScVbaCharacters::setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException) { m_xTextRange->setString( _caption ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaCharacters::getCount() throw (css::uno::RuntimeException) { - return getCaption().getLength(); + return getCaption().getLength(); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaCharacters::getText() throw (css::uno::RuntimeException) { return getCaption(); } -void SAL_CALL +void SAL_CALL ScVbaCharacters::setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException) { setCaption( _text ); } -uno::Reference< excel::XFont > SAL_CALL -ScVbaCharacters::getFont() throw (css::uno::RuntimeException) +uno::Reference< excel::XFont > SAL_CALL +ScVbaCharacters::getFont() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xTextRange, uno::UNO_QUERY_THROW ); return uno::Reference< excel::XFont >( new ScVbaFont( this, mxContext, m_aPalette, xProps ) ); } -void SAL_CALL +void SAL_CALL ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException) { // #TODO #FIXME needs implementation, or can't be done? @@ -101,29 +101,29 @@ ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) thro // Methods -void SAL_CALL +void SAL_CALL ScVbaCharacters::Insert( const ::rtl::OUString& String ) throw (css::uno::RuntimeException) { m_xSimpleText->insertString( m_xTextRange, String, bReplace ); } -void SAL_CALL +void SAL_CALL ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException) { - // #FIXME #TODO is this a bit suspect?, I wonder should the contents + // #FIXME #TODO is this a bit suspect?, I wonder should the contents // of the cell be deleted from the parent ( range ) - m_xSimpleText->setString(rtl::OUString()); + m_xSimpleText->setString(rtl::OUString()); } -rtl::OUString& +rtl::OUString& ScVbaCharacters::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaCharacters::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index df2fcf348619..a0a6c350282c 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.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/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 705f79ed42f9..fb02586e62f5 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.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,7 +87,7 @@ ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xPar mxChartPropertySet.set( _xChartComponent, uno::UNO_QUERY_THROW ) ; } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaChart::getName() throw (css::uno::RuntimeException) { rtl::OUString sName; @@ -108,7 +108,7 @@ ScVbaChart::SeriesCollection(const uno::Any&) throw (uno::RuntimeException) return uno::Any(); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorException) { sal_Int32 nChartType = -1; @@ -136,7 +136,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce else if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.BarDiagram")))) { sal_Int32 nSolidType = chart::ChartSolidType::RECTANGULAR_SOLID; - if (mxDiagramPropertySet->getPropertySetInfo()->hasPropertyByName(SOLIDTYPE)) + if (mxDiagramPropertySet->getPropertySetInfo()->hasPropertyByName(SOLIDTYPE)) { //in 2D diagrams 'SolidType' may not be set if (is3D()) mxDiagramPropertySet->getPropertyValue(SOLIDTYPE) >>= nSolidType; @@ -227,7 +227,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce return nChartType; } -void SAL_CALL +void SAL_CALL ScVbaChart::setChartType( ::sal_Int32 _nChartType ) throw ( uno::RuntimeException, script::BasicErrorException) { try @@ -303,7 +303,7 @@ try mxDiagramPropertySet->setPropertyValue( UPDOWN, uno::makeAny(sal_Bool((_nChartType == xlStockOHLC) || (_nChartType == xlStockVOHLC)))); mxDiagramPropertySet->setPropertyValue(VOLUME, uno::makeAny(sal_Bool((_nChartType == xlStockVHLC) || (_nChartType == xlStockVOHLC)))); break; - + case xlPieOfPie: // not possible case xlPieExploded: // SegmentOffset an ChartDataPointProperties ->am XDiagram abholen //wie macht Excel das? case xl3DPieExploded: @@ -312,7 +312,7 @@ try case xlBarOfPie: // not possible (Zoom pie) setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.PieDiagram"))); break; - + case xlRadar: case xlRadarMarkers: case xlRadarFilled: @@ -348,8 +348,8 @@ try default: throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_CONVERSION, rtl::OUString() ); } - - switch (_nChartType) + + switch (_nChartType) { case xlLineMarkers: case xlLineMarkersStacked: @@ -459,7 +459,7 @@ try } break; } - + switch (_nChartType) { case xlColumnStacked: @@ -501,7 +501,7 @@ try mxDiagramPropertySet->setPropertyValue(STACKED, uno::makeAny( sal_False)); break; } - switch (_nChartType) + switch (_nChartType) { case xl3DArea: case xl3DAreaStacked: @@ -568,7 +568,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no ChartObject as parent" ) ) ); } -void SAL_CALL +void SAL_CALL ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& _xCalcRange, const css::uno::Any& _aPlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { try @@ -636,7 +636,7 @@ ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange } } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount ) { uno::Sequence< rtl::OUString > sDescriptions ( _nCount ); @@ -676,10 +676,10 @@ ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorExce catch (uno::Exception& ) { throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); - } + } } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -698,7 +698,7 @@ ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeExcept catch (uno::Exception& ) { throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); - } + } } void @@ -719,23 +719,23 @@ ScVbaChart::setDiagram( const rtl::OUString& _sDiagramType ) throw( script::Basi // #TODO find out why we have Location/getLocation ? there is afaiks no // Location property, just a Location function for the Chart object -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaChart::Location() throw (css::script::BasicErrorException, css::uno::RuntimeException) { - return getLocation(); + return getLocation(); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaChart::getLocation() throw (css::script::BasicErrorException, css::uno::RuntimeException) { return -1; } -void SAL_CALL +void SAL_CALL ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // Helper api just stubs out the code <shrug> - // #TODO come back and make sense out of this + // #TODO come back and make sense out of this // String sheetName = null; // // if ((name != null) && name instanceof String) { @@ -819,7 +819,7 @@ ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeException) { sal_Bool bHasTitle = sal_False; @@ -834,7 +834,7 @@ ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExce return bHasTitle; } -void SAL_CALL +void SAL_CALL ScVbaChart::setHasTitle( ::sal_Bool bTitle ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -845,10 +845,10 @@ ScVbaChart::setHasTitle( ::sal_Bool bTitle ) throw (script::BasicErrorException, { throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } - + } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeException) { sal_Bool bHasLegend = sal_False; @@ -863,7 +863,7 @@ ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeExc return bHasLegend; } -void SAL_CALL +void SAL_CALL ScVbaChart::setHasLegend( ::sal_Bool bLegend ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -876,15 +876,15 @@ ScVbaChart::setHasLegend( ::sal_Bool bLegend ) throw (script::BasicErrorExceptio } } -uno::Reference< excel::XChartTitle > SAL_CALL +uno::Reference< excel::XChartTitle > SAL_CALL ScVbaChart::getChartTitle( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< drawing::XShape > xTitleShape = mxChartDocument->getTitle(); // #TODO check parent - return new ScVbaChartTitle(this, mxContext, xTitleShape); + return new ScVbaChartTitle(this, mxContext, xTitleShape); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) throw (script::BasicErrorException, uno::RuntimeException) { // mmm chart probably is the parent, #TODO check parent @@ -900,7 +900,7 @@ ScVbaChart::is3D() throw ( uno::RuntimeException ) sal_Bool is3d = sal_False; mxDiagramPropertySet->getPropertyValue(DIM3D) >>= is3d; return is3d; -} +} sal_Int32 ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( uno::RuntimeException ) @@ -935,7 +935,7 @@ ScVbaChart::is100PercentStacked() throw ( uno::RuntimeException ) return b100Percent; } -sal_Int32 +sal_Int32 ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( script::BasicErrorException ) { sal_Bool bIsVertical = true; @@ -968,7 +968,7 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _ } -sal_Int32 +sal_Int32 ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (script::BasicErrorException) { sal_Bool bUpDown = sal_False; @@ -987,12 +987,12 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw catch (uno::Exception& ) { rtl::OUString aTemp; // temporary needed for g++ 3.3.5 - script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } return _nNotUpDown; } -bool +bool ScVbaChart::hasMarkers() throw ( script::BasicErrorException ) { bool bHasMarkers = false; @@ -1005,12 +1005,12 @@ ScVbaChart::hasMarkers() throw ( script::BasicErrorException ) catch ( uno::Exception& ) { rtl::OUString aTemp; // temporary needed for g++ 3.3.5 - script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } return bHasMarkers; } -sal_Int32 +sal_Int32 ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( script::BasicErrorException ) { if (hasMarkers()) @@ -1018,7 +1018,7 @@ ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) t return _nWithoutMarkers; } -void +void ScVbaChart::assignDiagramAttributes() { xAxisXSupplier.set( mxDiagramPropertySet, uno::UNO_QUERY_THROW ); @@ -1050,8 +1050,8 @@ ScVbaChart::isSeriesIndexValid(sal_Int32 _seriesindex) throw( script::BasicError bret = true; } } - } - catch (uno::Exception& ) + } + catch (uno::Exception& ) { throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } @@ -1094,9 +1094,9 @@ ScVbaChart::setSeriesName(sal_Int32 _index, rtl::OUString _sname) throw ( script } } -sal_Int32 +sal_Int32 ScVbaChart::getSeriesCount() throw ( script::BasicErrorException ) -{ +{ uno::Reference< chart::XChartDataArray > xChartDataArray( mxChartDocument->getData(), uno::UNO_QUERY_THROW ); if (getPlotBy() == xlRows) @@ -1119,10 +1119,10 @@ ScVbaChart::getSeriesName(sal_Int32 _index) throw ( script::BasicErrorException sDescriptions = xChartDataArray->getColumnDescriptions(); sName = sDescriptions[_index]; } - return sName; + return sName; } -double +double ScVbaChart::getValue(sal_Int32 _seriesindex, sal_Int32 _valindex) throw ( script::BasicErrorException ) { double result = -1.0; @@ -1136,7 +1136,7 @@ ScVbaChart::getValue(sal_Int32 _seriesindex, sal_Int32 _valindex) throw ( script return result; } -sal_Int32 +sal_Int32 ScVbaChart::getValuesCount(sal_Int32 _seriesIndex) throw ( script::BasicErrorException ) { sal_Int32 nCount = 0; @@ -1149,11 +1149,11 @@ ScVbaChart::getValuesCount(sal_Int32 _seriesIndex) throw ( script::BasicErrorExc else nCount = dblValues.getLength(); } - return nCount; + return nCount; } -uno::Reference< excel::XDataLabels > +uno::Reference< excel::XDataLabels > ScVbaChart::DataLabels( const uno::Reference< ov::excel::XSeries > /*_oSeries*/ ) throw ( css::script::BasicErrorException ) { if ( true ) @@ -1162,7 +1162,7 @@ ScVbaChart::DataLabels( const uno::Reference< ov::excel::XSeries > /*_oSeries*/ return uno::Reference< excel::XDataLabels > (); } -bool +bool ScVbaChart::getHasDataCaption( const uno::Reference< css::beans::XPropertySet >& _xPropertySet )throw ( script::BasicErrorException ) { bool bResult = false; @@ -1171,15 +1171,15 @@ ScVbaChart::getHasDataCaption( const uno::Reference< css::beans::XPropertySet >& sal_Int32 nChartDataCaption = 0; _xPropertySet->getPropertyValue(DATACAPTION) >>= nChartDataCaption; bResult = (nChartDataCaption != chart::ChartDataCaption::NONE); - } - catch (uno::Exception& ) + } + catch (uno::Exception& ) { throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } return bResult; } -void +void ScVbaChart::setHasDataCaption( const uno::Reference< beans::XPropertySet >& _xPropertySet, bool _bHasDataLabels )throw ( script::BasicErrorException ) { try @@ -1188,14 +1188,14 @@ ScVbaChart::setHasDataCaption( const uno::Reference< beans::XPropertySet >& _xPr _xPropertySet->setPropertyValue(DATACAPTION, uno::makeAny ( chart::ChartDataCaption::VALUE) ); else _xPropertySet->setPropertyValue(DATACAPTION, uno::makeAny ( chart::ChartDataCaption::NONE) ); - } - catch (uno::Exception& ) + } + catch (uno::Exception& ) { throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } } -uno::Reference< beans::XPropertySet > +uno::Reference< beans::XPropertySet > ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException ) { assignDiagramAttributes(); @@ -1227,7 +1227,7 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro xAxisProps = xTwoAxisYSupplier->getSecondaryYAxis(); break; default: - return xAxisProps; + return xAxisProps; } return xAxisProps; } @@ -1240,7 +1240,7 @@ ScVbaChart::getServiceImplName() return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaChart::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index a0cee5d04a29..3602baafaa64 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.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 @@ -44,7 +44,7 @@ typedef InheritedHelperInterfaceImpl1<ov::excel::XChart > ChartImpl_BASE; class ScVbaChart : public ChartImpl_BASE -{ +{ friend class ScVbaAxis; css::uno::Reference< css::chart::XChartDocument > mxChartDocument; @@ -67,7 +67,7 @@ friend class ScVbaAxis; sal_Int32 getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( css::script::BasicErrorException ); sal_Int32 getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (css::script::BasicErrorException); bool hasMarkers() throw ( css::script::BasicErrorException ); - sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( css::script::BasicErrorException ); + sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( css::script::BasicErrorException ); void assignDiagramAttributes(); void setDefaultSeriesDescriptionLabels(){} public: @@ -93,7 +93,7 @@ public: virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException); virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException); - virtual void SAL_CALL Activate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL Activate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL Location( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getLocation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index eaa42d1cc309..839b7cf27cc0 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.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 @@ -42,7 +42,7 @@ const rtl::OUString PERSIST_NAME( RTL_CONSTASCII_USTRINGPARAM("PersistName") ); ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE( _xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier( _xDrawPageSupplier ) { - xDrawPage = xDrawPageSupplier->getDrawPage(); + xDrawPage = xDrawPageSupplier->getDrawPage(); xEmbeddedObjectSupplier.set( xTableChart, uno::UNO_QUERY_THROW ); xNamed.set( xTableChart, uno::UNO_QUERY_THROW ); sPersistName = getPersistName(); @@ -58,7 +58,7 @@ rtl::OUString ScVbaChartObject::getPersistName() return sPersistName; } -uno::Reference< drawing::XShape > +uno::Reference< drawing::XShape > ScVbaChartObject::setShape() throw ( script::BasicErrorException ) { try @@ -87,14 +87,14 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException ) return NULL; } -void SAL_CALL +void SAL_CALL ScVbaChartObject::setName( const rtl::OUString& sName ) throw (css::uno::RuntimeException) { xNamedShape->setName(sName); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaChartObject::getName() throw (css::uno::RuntimeException) { return xNamedShape->getName(); @@ -107,19 +107,19 @@ ScVbaChartObject::Delete() throw ( css::script::BasicErrorException ) uno::Reference< excel::XWorksheet > xParent( getParent(), uno::UNO_QUERY_THROW ); uno::Reference< excel::XChartObjects > xColl( xParent->ChartObjects( uno::Any() ), uno::UNO_QUERY_THROW ); ScVbaChartObjects* pChartObjectsImpl = static_cast< ScVbaChartObjects* >( xColl.get() ); - if (pChartObjectsImpl) + if (pChartObjectsImpl) pChartObjectsImpl->removeByName( getPersistName() ); - else + else throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Parent is not ChartObjects" ) ) ); } - -void + +void ScVbaChartObject::Activate() throw ( script::BasicErrorException ) { try { // #TODO #FIXME should be ThisWorkbook or equivelant, or in - // fact probably the chart object should be created with + // fact probably the chart object should be created with // the XModel owner //uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getXModel().getCurrentController()); uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getCurrentExcelDoc(mxContext)->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -131,20 +131,20 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException ) } } -uno::Reference< excel::XChart > SAL_CALL +uno::Reference< excel::XChart > SAL_CALL ScVbaChartObject::getChart() throw (css::uno::RuntimeException) { return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart ); } -rtl::OUString& +rtl::OUString& ScVbaChartObject::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaChartObject::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -156,56 +156,56 @@ ScVbaChartObject::getServiceNames() return aServiceNames; } -double +double ScVbaChartObject::getHeight() { return oShapeHelper->getHeight(); } -void +void ScVbaChartObject::setHeight(double _fheight) throw ( script::BasicErrorException ) { oShapeHelper->setHeight(_fheight); } - -double + +double ScVbaChartObject::getWidth() { return oShapeHelper->getWidth(); } -void +void ScVbaChartObject::setWidth(double _fWidth) throw ( script::BasicErrorException ) { oShapeHelper->setWidth(_fWidth); } - -double + +double ScVbaChartObject::getLeft() { return oShapeHelper->getLeft(); } -void +void ScVbaChartObject::setLeft(double _fLeft) { oShapeHelper->setLeft(_fLeft); } - -double + +double ScVbaChartObject::getTop() { return oShapeHelper->getTop(); -} +} -void +void ScVbaChartObject::setTop(double _fTop) { oShapeHelper->setTop(_fTop); } -uno::Reference< uno::XInterface > -ScVbaChartObject::getUnoObject() throw (script::BasicErrorException) +uno::Reference< uno::XInterface > +ScVbaChartObject::getUnoObject() throw (script::BasicErrorException) { return uno::Reference< uno::XInterface >( xShape, uno::UNO_QUERY ); } diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index 73aa3d1fe119..4e995d98a9fa 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.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 @@ -40,7 +40,7 @@ typedef InheritedHelperInterfaceImpl1<ov::excel::XChartObject > ChartObjectImpl_BASE; class ScVbaChartObject : public ChartObjectImpl_BASE -{ +{ css::uno::Reference< css::table::XTableChart > xTableChart; css::uno::Reference< css::document::XEmbeddedObjectSupplier > xEmbeddedObjectSupplier; @@ -59,8 +59,8 @@ public: virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual void SAL_CALL setName( const ::rtl::OUString& sName ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException); - virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException ); - virtual void Activate() throw ( css::script::BasicErrorException ); + virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException ); + virtual void Activate() throw ( css::script::BasicErrorException ); // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index b8706b233462..ff97462b1b56 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.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 @@ -48,12 +48,12 @@ using namespace ::ooo::vba; class ChartObjectEnumerationImpl : public EnumerationHelperImpl { uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier; - + public: ChartObjectEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier, const uno::Reference< XHelperInterface >& _xParent ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier( _xDrawPageSupplier ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { uno::Reference< table::XTableChart > xTableChart( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); // parent Object is sheet return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( m_xParent, m_xContext, xTableChart, xDrawPageSupplier ) ) ); @@ -84,10 +84,10 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ScDocShell* pDocShell = NULL; if ( !pUno ) throw uno::RuntimeException( rtl::OUString::createFromAscii("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); - pDocShell = pUno->GetDocShell(); + pDocShell = pUno->GetDocShell(); if ( !pDocShell ) throw uno::RuntimeException( rtl::OUString::createFromAscii("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); - + uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets(); std::vector< rtl::OUString > aChartNamesVector; @@ -107,8 +107,8 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException std::vector< rtl::OUString > ::const_iterator it_end = aChartNamesVector.end(); for ( sal_Int32 index = 0 ; it != it_end; ++it, ++index ) sChartNames[index] = *it; - } - catch (uno::Exception& ) + } + catch (uno::Exception& ) { throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } @@ -116,25 +116,25 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException } // XChartObjects -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight ) throw (script::BasicErrorException) { - try + try { uno::Sequence< table::CellRangeAddress > aCellRangeAddress( 1 ); awt::Rectangle aRectangle; aRectangle.X = Millimeter::getInHundredthsOfOneMillimeter(_nX); aRectangle.Y = Millimeter::getInHundredthsOfOneMillimeter(_nY); aRectangle.Width = Millimeter::getInHundredthsOfOneMillimeter(_nWidth); - aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight); + aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight); // Note the space at the end of the stem ("Chart "). In ChartSheets only "Chart" is the stem rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Chart " ) ) , rtl::OUString(), 1); xTableCharts->addNewByName(sPersistChartName, aRectangle, aCellRangeAddress, true, false ); - uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW ); + uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW ); xChartObject->getChart()->setChartType(excel::XlChartType::xlColumnClustered); return uno::makeAny( xChartObject ); - } - catch ( uno::Exception& ex) + } + catch ( uno::Exception& ex) { OSL_TRACE("AddItem caught exception ->%s", rtl::OUStringToOString( ex.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -159,7 +159,7 @@ ScVbaChartObjects::createEnumeration() throw (uno::RuntimeException) // XElementAccess -uno::Type +uno::Type ScVbaChartObjects::getElementType() throw (uno::RuntimeException) { return excel::XChartObject::static_type(0); @@ -168,20 +168,20 @@ ScVbaChartObjects::getElementType() throw (uno::RuntimeException) // ScVbaCollectionBaseImpl uno::Any ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource ) -{ +{ uno::Reference< table::XTableChart > xTableChart( aSource, uno::UNO_QUERY_THROW ); // correct parent object is sheet return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( getParent(), mxContext, xTableChart, xDrawPageSupplier ) ) ); } -rtl::OUString& +rtl::OUString& ScVbaChartObjects::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> ScVbaChartObjects::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 3524c8ffe30e..232b07401b90 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.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 @@ -40,14 +40,14 @@ typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE; /* #TODO see if this hash table is 'really' necessary -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::hash_map< ::rtl::OUString, css::uno::Reference< ov::excel::XChartObject >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > aHashTable; */ class ScVbaChartObjects : public ChartObjects_BASE -{ +{ css::uno::Reference< css::table::XTableCharts > xTableCharts; css::uno::Reference< css::drawing::XDrawPageSupplier > xDrawPageSupplier; @@ -66,8 +66,8 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // XElementAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + // ScVbaCollectionBaseImpl + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ChartObjects_BASE virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/sc/source/ui/vba/vbacharts.cxx b/sc/source/ui/vba/vbacharts.cxx index d02e79e8d431..d9a720dc3dd1 100644 --- a/sc/source/ui/vba/vbacharts.cxx +++ b/sc/source/ui/vba/vbacharts.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 @@ -39,33 +39,33 @@ ScVbaCharts::ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xP xSpreadsheetDocument.set( xComponent, uno::UNO_QUERY_THROW ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCharts::Add() throw (css::script::BasicErrorException, css::uno::RuntimeException) { // Not implemented in the helperapi ( see ChartsImpl.java ) if ( true ) - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() ); + throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() ); return aNULL(); } -uno::Reference< excel::XChart > SAL_CALL +uno::Reference< excel::XChart > SAL_CALL ScVbaCharts::getActiveChart() throw (script::BasicErrorException, uno::RuntimeException) { return xActiveChart; } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL ScVbaCharts::createEnumeration() throw (uno::RuntimeException) { // #FIXME not implemented if ( true ) - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() ); + throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() ); return uno::Reference< container::XEnumeration >(); } // #FIXME #TODO this method shouldn't appear in this class directly // a XIndexAccess/XNameAccess wrapper should be passed to the base class instead -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaCharts::getCount() throw (uno::RuntimeException) { sal_Int32 ncount = 0; @@ -88,14 +88,14 @@ ScVbaCharts::getCount() throw (uno::RuntimeException) { throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } - return ncount; + return ncount; } uno::Any ScVbaCharts::createCollectionObject( const uno::Any& aSource ) { if ( true ) - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() ); + throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() ); // #TODO implementation please return aSource; } @@ -107,7 +107,7 @@ ScVbaCharts::getServiceImplName() return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> ScVbaCharts::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sc/source/ui/vba/vbacharts.hxx b/sc/source/ui/vba/vbacharts.hxx index 76bd2bec808b..399910a6c2f6 100644 --- a/sc/source/ui/vba/vbacharts.hxx +++ b/sc/source/ui/vba/vbacharts.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 @@ -36,7 +36,7 @@ typedef CollTestImplHelper< ov::excel::XCharts > Charts_BASE; class ScVbaCharts : public Charts_BASE -{ +{ css::uno::Reference< ov::excel::XChart > xActiveChart; css::uno::Reference< css::sheet::XSpreadsheetDocument > xSpreadsheetDocument; css::uno::Reference< css::lang::XComponent > xComponent; @@ -51,13 +51,13 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // XElementAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) { return ov::excel::XChart::static_type(0); } - // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + // ScVbaCollectionBaseImpl + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // Charts_BASE or HelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index 09f678704422..ca81743b179f 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.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,7 +41,7 @@ ScVbaChartTitle::getServiceImplName() return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaChartTitle::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index db0f3e31529f..2fe2d9e618d9 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.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/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index 81670dca678a..7f6a5a3d5a77 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.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/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index c4c290da3b2a..4d8d79a2106b 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.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 @@ -60,7 +60,7 @@ public: {} virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + { return AnnotationToComment( m_xEnumeration->nextElement(), m_xContext, mxModel ); } @@ -91,20 +91,20 @@ ScVbaComments::createCollectionObject( const css::uno::Any& aSource ) return AnnotationToComment( aSource, mxContext, mxModel ); } -uno::Type +uno::Type ScVbaComments::getElementType() throw (uno::RuntimeException) { return excel::XComment::static_type(0); } -rtl::OUString& +rtl::OUString& ScVbaComments::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComments") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> ScVbaComments::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 8b65a3cafc8a..babefb4e6739 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.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 @@ -54,7 +54,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // ScVbaComments_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index 321ca60d810f..6065f123ef39 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.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 @@ -40,16 +40,16 @@ const sal_Int32 ISFORMULA = 98765432; template< typename Ifc1 > ScVbaCondition< Ifc1 >::ScVbaCondition( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< sheet::XSheetCondition >& _xSheetCondition ) : ScVbaCondition_BASE( xParent, xContext ), mxSheetCondition( _xSheetCondition ) { - mxAddressable.set( xParent, uno::UNO_QUERY_THROW ); + mxAddressable.set( xParent, uno::UNO_QUERY_THROW ); } template< typename Ifc1 > -sheet::ConditionOperator +sheet::ConditionOperator ScVbaCondition< Ifc1 >::retrieveAPIOperator( const uno::Any& _aOperator) throw ( script::BasicErrorException ) { sheet::ConditionOperator aRetAPIOperator = sheet::ConditionOperator_NONE; sal_Int32 nOperator = 0; - if ( (_aOperator >>= nOperator ) ) + if ( (_aOperator >>= nOperator ) ) { switch(nOperator) { @@ -86,21 +86,21 @@ ScVbaCondition< Ifc1 >::retrieveAPIOperator( const uno::Any& _aOperator) throw ( } template< typename Ifc1 > -rtl::OUString +rtl::OUString ScVbaCondition< Ifc1 >::Formula1( ) throw ( script::BasicErrorException, uno::RuntimeException ) { return mxSheetCondition->getFormula1(); } template< typename Ifc1 > -rtl::OUString +rtl::OUString ScVbaCondition< Ifc1 >::Formula2( ) throw ( script::BasicErrorException, uno::RuntimeException ) { return mxSheetCondition->getFormula2(); } template< typename Ifc1 > -void +void ScVbaCondition< Ifc1 >::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException ) { rtl::OUString sFormula; @@ -114,18 +114,18 @@ ScVbaCondition< Ifc1 >::setFormula1( const uno::Any& _aFormula1) throw ( script: } template< typename Ifc1 > -void +void ScVbaCondition< Ifc1 >::setFormula2( const uno::Any& _aFormula2) throw ( script::BasicErrorException ) { rtl::OUString sFormula2; - // #TODO surely this can't be right? + // #TODO surely this can't be right? // ( from helperapi/impl/.../calc/ConditionImpl.java if ( (_aFormula2 >>= sFormula2 )) mxSheetCondition->setFormula1(sFormula2); } template< typename Ifc1 > -sal_Int32 +sal_Int32 ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script::BasicErrorException ) { sal_Int32 retvalue = -1; @@ -160,13 +160,13 @@ ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script: if (_bIncludeFormulaValue) { //#FIXME huh what's this all about - // from helperapi/impl/.../calc/ConditionImpl + // from helperapi/impl/.../calc/ConditionImpl retvalue = ISFORMULA; break; } case sheet::ConditionOperator_NONE: default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Operator not supported"))); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Operator not supported"))); break; } return retvalue; diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx index 878e3d9e346f..80e1b5bccd88 100644 --- a/sc/source/ui/vba/vbacondition.hxx +++ b/sc/source/ui/vba/vbacondition.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 @@ -27,8 +27,8 @@ ************************************************************************/ #ifndef SC_VBA_CONDITION_HXX #define SC_VBA_CONDITION_HXX -#include <com/sun/star/sheet/XSheetCondition.hpp> -#include <com/sun/star/sheet/XCellRangeAddressable.hpp> +#include <com/sun/star/sheet/XSheetCondition.hpp> +#include <com/sun/star/sheet/XCellRangeAddressable.hpp> #include <vbahelper/vbahelperinterface.hxx> #include <com/sun/star/sheet/ConditionOperator.hpp> @@ -50,8 +50,8 @@ public: virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException ); virtual sal_Int32 Operator(sal_Bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException ); virtual sal_Int32 SAL_CALL Operator() throw ( css::script::BasicErrorException, css::uno::RuntimeException ) = 0; - + }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx index 7b2a0edb4103..452fa9aeb84a 100644 --- a/sc/source/ui/vba/vbadialog.cxx +++ b/sc/source/ui/vba/vbadialog.cxx @@ -36,38 +36,38 @@ using namespace ::com::sun::star; //solve the problem that "Application.Dialogs.Item(***).Show" and "Application.Dialogs.Count" cannot get the correct result struct DialogMatch { - sal_Int32 nVbaDlgIndex; - rtl::OUString aOODlgName; + sal_Int32 nVbaDlgIndex; + rtl::OUString aOODlgName; }; static const DialogMatch aDialogMatchList[] = { - { 1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Open" ) ) }, // xlDialogOpen -> .uno:Open - { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatCellDialog" ) ) }, // ??? -> .uno:FormatCellDialog - { 55, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertCell" ) ) }, // xlDialogInsert -> .uno:InsertCell - { 8, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Print" ) ) }, // xlDialogPrint -> .uno:Print - { 9, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrinterSetup" ) ) }, // xlDialogPrinterSetup -> .uno:PrinterSetup - { 53, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PasteSpecial" ) ) }, // xlDialogPasteSpecial -> .uno:PasteSpecial - { 28, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolProtectionDocument" ) ) }, // xlDialogProtectDocument -> uno:ToolProtectionDocument - { 47, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColumnWidth" ) ) }, // xlDialogColumnWidth -> .uno:ColumnWidth - { 61, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineName" ) ) }, // xlDialogDefineName -> .uno:DefineName - { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConfigureDialog" ) ) }, // ??? -> .uno:ConfigureDialog - { 596, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:HyperlinkDialog" ) ) }, // xlDialogInsertHyperlink -> .uno:HyperlinkDialog - { 342, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertGraphic" ) ) }, // xlDialogInsertPicture -> .uno:InsertGraphic - { 259, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertObject" ) ) }, // xlDialogInsertObject -> .uno:InsertObject - { 7, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PageFormatDialog" ) ) }, // xlDialogPageSetup -> .uno:PageFormatDialog - { 39, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataSort" ) ) }, // xlDialogSort -> .uno:DataSort - { 127, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:RowHeight" ) ) }, // xlDialogRowHeight -> .uno:RowHeight - { 485, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoCorrectDlg" ) ) }, // xlDialogAutoCorrect -> .uno:AutoCorrectDlg - { 583, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConditionalFormatDialog" ) ) }, // xlDialogCondiationalFormatting -> .uno:ConditionalFormatDialog - { 191, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataConsolidate" ) ) }, // xlDialogConsolidate -> .uno:DataConsolidate - { 62, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CreateNames" ) ) }, // xlDialogCreateNames -> .uno:CreateNames - { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillSeries" ) ) }, // ??? -> .uno:FillSeries - { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Validation" ) ) }, // ??? -> .uno:Validation" - { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineLabelRange" ) ) }, // ??? -> .uno:DefineLabelRange - { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterAutoFilter" ) ) }, // ??? -> .uno:DataFilterAutoFilter - { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterSpecialFilter" ) ) }, // ??? -> .uno:DataFilterSpecialFilter - { 269, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoFormat" ) ) } // xlDialogFormatAuto -> .uno:AutoFormat + { 1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Open" ) ) }, // xlDialogOpen -> .uno:Open + { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatCellDialog" ) ) }, // ??? -> .uno:FormatCellDialog + { 55, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertCell" ) ) }, // xlDialogInsert -> .uno:InsertCell + { 8, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Print" ) ) }, // xlDialogPrint -> .uno:Print + { 9, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrinterSetup" ) ) }, // xlDialogPrinterSetup -> .uno:PrinterSetup + { 53, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PasteSpecial" ) ) }, // xlDialogPasteSpecial -> .uno:PasteSpecial + { 28, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolProtectionDocument" ) ) }, // xlDialogProtectDocument -> uno:ToolProtectionDocument + { 47, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColumnWidth" ) ) }, // xlDialogColumnWidth -> .uno:ColumnWidth + { 61, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineName" ) ) }, // xlDialogDefineName -> .uno:DefineName + { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConfigureDialog" ) ) }, // ??? -> .uno:ConfigureDialog + { 596, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:HyperlinkDialog" ) ) }, // xlDialogInsertHyperlink -> .uno:HyperlinkDialog + { 342, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertGraphic" ) ) }, // xlDialogInsertPicture -> .uno:InsertGraphic + { 259, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertObject" ) ) }, // xlDialogInsertObject -> .uno:InsertObject + { 7, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PageFormatDialog" ) ) }, // xlDialogPageSetup -> .uno:PageFormatDialog + { 39, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataSort" ) ) }, // xlDialogSort -> .uno:DataSort + { 127, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:RowHeight" ) ) }, // xlDialogRowHeight -> .uno:RowHeight + { 485, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoCorrectDlg" ) ) }, // xlDialogAutoCorrect -> .uno:AutoCorrectDlg + { 583, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConditionalFormatDialog" ) ) }, // xlDialogCondiationalFormatting -> .uno:ConditionalFormatDialog + { 191, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataConsolidate" ) ) }, // xlDialogConsolidate -> .uno:DataConsolidate + { 62, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CreateNames" ) ) }, // xlDialogCreateNames -> .uno:CreateNames + { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillSeries" ) ) }, // ??? -> .uno:FillSeries + { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Validation" ) ) }, // ??? -> .uno:Validation" + { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineLabelRange" ) ) }, // ??? -> .uno:DefineLabelRange + { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterAutoFilter" ) ) }, // ??? -> .uno:DataFilterAutoFilter + { -1, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterSpecialFilter" ) ) }, // ??? -> .uno:DataFilterSpecialFilter + { 269, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoFormat" ) ) } // xlDialogFormatAuto -> .uno:AutoFormat }; const sal_Int32 nDialogSize = SAL_N_ELEMENTS( aDialogMatchList ) ; diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx index da733ce92247..9c73aca10fbf 100644 --- a/sc/source/ui/vba/vbadialog.hxx +++ b/sc/source/ui/vba/vbadialog.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/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index ff4e1553f52f..785757b0a4e5 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.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 @@ -40,7 +40,7 @@ typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::excel::XDialogs > ScVb class ScVbaDialogs : public ScVbaDialogs_BASE { public: - ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): ScVbaDialogs_BASE( xParent, xContext, xModel ) {} + ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): ScVbaDialogs_BASE( xParent, xContext, xModel ) {} virtual ~ScVbaDialogs() {} // XCollection diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 5e9eab58e8c4..abca80602ef5 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -392,7 +392,7 @@ ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, co { mpDocShell = dynamic_cast< ScDocShell* >( mpShell ); // mpShell from base class mpDoc = mpDocShell ? mpDocShell->GetDocument() : 0; - + if( !mxModel.is() || !mpDocShell || !mpDoc ) return; @@ -692,7 +692,7 @@ uno::Any ScVbaEventsHelper::createWorksheet( const uno::Sequence< uno::Any >& rA // extract sheet index, will throw, if parameter is invalid SCTAB nTab = getTabFromArgs( rArgs, nIndex ); - + // create Workbook uno::Sequence< uno::Any > aArgs( 2 ); aArgs[ 0 ] <<= uno::Reference< uno::XInterface >(); diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index f0c73dd88d7f..3bd9655139b5 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -50,7 +50,7 @@ public: // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw (css::uno::RuntimeException); - + protected: virtual bool implEventsEnabled() throw (css::uno::RuntimeException); virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); @@ -74,7 +74,7 @@ private: css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); /** Creates a VBA Window object. */ css::uno::Any createWindow() const throw (css::uno::RuntimeException); - + private: mutable css::uno::WeakReference< ov::excel::XApplication > mxApplication; ::rtl::Reference< ScVbaEventsListener > mxListener; diff --git a/sc/source/ui/vba/vbafiledialog.cxx b/sc/source/ui/vba/vbafiledialog.cxx index 482e6ab2d5e1..9cb308529b88 100644 --- a/sc/source/ui/vba/vbafiledialog.cxx +++ b/sc/source/ui/vba/vbafiledialog.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::uno; ScVbaFileDialog::ScVbaFileDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ) -: ScVbaFileDialog_BASE( xParent, xContext, xModel ) +: ScVbaFileDialog_BASE( xParent, xContext, xModel ) { m_pFileDialogSelectedItems = new VbaFileDialogSelectedItems(xParent, xContext, (com::sun::star::container::XIndexAccess *)&m_FileDialogSelectedObj); } diff --git a/sc/source/ui/vba/vbafiledialogselecteditems.hxx b/sc/source/ui/vba/vbafiledialogselecteditems.hxx index b43364dff709..063bc502667a 100644 --- a/sc/source/ui/vba/vbafiledialogselecteditems.hxx +++ b/sc/source/ui/vba/vbafiledialogselecteditems.hxx @@ -77,7 +77,7 @@ public: //XEnumeration virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL nextElement( ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL nextElement( ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); protected: private: diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 68ade5207674..1d37851785fe 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.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,7 +57,7 @@ ScVbaFont::ScVbaFont( { } -SfxItemSet* +SfxItemSet* ScVbaFont::GetDataSet() { return mpRangeObj ? excel::ScVbaCellRangeAccess::GetDataSet( mpRangeObj ) : 0; @@ -78,7 +78,7 @@ uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table: void SAL_CALL ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException ) { - // #FIXEME create some sort of generic get/set code where + // #FIXEME create some sort of generic get/set code where // you can pass a functor // get/set - Super/sub script code is exactly the same // except for the call applied at each cell position @@ -317,7 +317,7 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException ) rtl::OUString aToken = aStyles.getToken( 0, ' ', nIndex ); aTokens.push_back( aToken ); }while( nIndex >= 0 ); - + std::vector< rtl::OUString >::iterator it; for( it = aTokens.begin(); it != aTokens.end(); ++it ) { @@ -341,7 +341,7 @@ ScVbaFont::getFontStyle() throw ( uno::RuntimeException ) getBold() >>= bValue; if( bValue ) aStyles.appendAscii("Bold"); - + getItalic() >>= bValue; if( bValue ) { diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index b87672a1223a..d7f9010c3cfd 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.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/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index a493bac28e05..a38c7f3c8876 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.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 @@ ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xPar mxServiceInfo.set( mxPropertySet, uno::UNO_QUERY_THROW ); if ( !mxModel.is() ) DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved") ) ); - mxNumberFormatsSupplier.set( mxModel, uno::UNO_QUERY_THROW ); + mxNumberFormatsSupplier.set( mxModel, uno::UNO_QUERY_THROW ); } catch (uno::Exception& ) { @@ -75,16 +75,16 @@ ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xPar } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (script::BasicErrorException, uno::RuntimeException) { - try + try { uno::Any aVal; sal_Int32 nAlignment = 0; if ( !(_oAlignment >>= nAlignment )) throw uno::RuntimeException(); - switch (nAlignment) + switch (nAlignment) { case excel::XlVAlign::xlVAlignBottom : aVal = uno::makeAny( table::CellVertJustify2::BOTTOM ); @@ -96,7 +96,7 @@ ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (s case excel::XlVAlign::xlVAlignJustify: aVal = uno::makeAny( table::CellVertJustify2::STANDARD ); break; - + case excel::XlVAlign::xlVAlignTop: aVal = uno::makeAny( table::CellVertJustify2::TOP); break; @@ -113,7 +113,7 @@ ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (s } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any aResult = aNULL(); @@ -150,10 +150,10 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException, } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) throw (script::BasicErrorException, uno::RuntimeException) { - try + try { uno::Any aVal; sal_Int32 nAlignment = 0; @@ -190,7 +190,7 @@ ScVbaFormat<Ifc1>::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any NRetAlignment = aNULL(); @@ -200,7 +200,7 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException if (!isAmbiguous(sHoriJust)) { table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_BLOCK; - + if ( mxPropertySet->getPropertyValue(sHoriJust) >>= aAPIAlignment ) { switch( aAPIAlignment ) @@ -231,10 +231,10 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script::BasicErrorException, uno::RuntimeException) { - try + try { sal_Int32 nOrientation = 0; if ( !( _aOrientation >>= nOrientation ) ) @@ -268,11 +268,11 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script } } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any NRetOrientation = aNULL(); - try + try { if (!isAmbiguous(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ))) { @@ -293,7 +293,7 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R break; case table::CellOrientation_STACKED: NRetOrientation = uno::makeAny( excel::XlOrientation::xlVertical ); - break; + break; default: NRetOrientation = uno::makeAny( excel::XlOrientation::xlHorizontal ); } @@ -307,25 +307,25 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setWrapText( const uno::Any& _aWrapText ) throw (script::BasicErrorException, uno::RuntimeException) { - try + try { mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText); } catch (uno::Exception& ) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); - } + } } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any aWrap = aNULL(); - try + try { rtl::OUString aPropName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) ); if (!isAmbiguous( aPropName )) @@ -341,21 +341,21 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException ) { - ScVbaPalette aPalette( excel::getDocShell( mxModel ) ); + ScVbaPalette aPalette( excel::getDocShell( mxModel ) ); uno::Reference< XCollection > xColl = new ScVbaBorders( thisHelperIface(), ScVbaFormat_BASE::mxContext, uno::Reference< table::XCellRange >( mxPropertySet, uno::UNO_QUERY_THROW ), aPalette ); if ( Index.hasValue() ) - { + { return xColl->Item( Index, uno::Any() ); - } + } return uno::makeAny( xColl ); } template< typename Ifc1 > -uno::Reference< excel::XFont > SAL_CALL +uno::Reference< excel::XFont > SAL_CALL ScVbaFormat<Ifc1>::Font( ) throw (script::BasicErrorException, uno::RuntimeException) { ScVbaPalette aPalette( excel::getDocShell( mxModel ) ); @@ -363,33 +363,33 @@ ScVbaFormat<Ifc1>::Font( ) throw (script::BasicErrorException, uno::RuntimeExce } template< typename Ifc1 > -uno::Reference< excel::XInterior > SAL_CALL +uno::Reference< excel::XInterior > SAL_CALL ScVbaFormat<Ifc1>::Interior( ) throw (script::BasicErrorException, uno::RuntimeException) { - return new ScVbaInterior( thisHelperIface(), ScVbaFormat_BASE::mxContext, mxPropertySet ); + return new ScVbaInterior( thisHelperIface(), ScVbaFormat_BASE::mxContext, mxPropertySet ); } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any aRet = uno::makeAny( rtl::OUString() ); - try - { + try + { rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_NUMBERFO ) ); if (!isAmbiguous( sPropName )) { - + initializeNumberFormats(); - + sal_Int32 nFormat = 0; if ( ! (mxPropertySet->getPropertyValue( sPropName ) >>= nFormat ) ) throw uno::RuntimeException(); - + rtl::OUString sFormat; xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; aRet = uno::makeAny( sFormat.toAsciiLowerCase() ); - + } } catch (uno::Exception& ) @@ -401,7 +401,7 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, } template< typename Ifc1 > -void +void ScVbaFormat<Ifc1>::setNumberFormat( lang::Locale _aLocale, const rtl::OUString& _sFormatString) throw( script::BasicErrorException ) { try @@ -421,10 +421,10 @@ ScVbaFormat<Ifc1>::setNumberFormat( lang::Locale _aLocale, const rtl::OUString& } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) throw (script::BasicErrorException, uno::RuntimeException) { - try + try { rtl::OUString sLocalFormatString; sal_Int32 nFormat = -1; @@ -450,15 +450,15 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (script::BasicErrorException, uno::RuntimeException) { - try + try { rtl::OUString sFormatString; if ( !( _oFormatString >>= sFormatString ) ) throw uno::RuntimeException(); - + sFormatString = sFormatString.toAsciiUpperCase(); lang::Locale aDefaultLocale = m_aDefaultLocale; @@ -477,24 +477,24 @@ ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (scri { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); } - + } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setIndentLevel( const uno::Any& _aLevel ) throw (script::BasicErrorException, uno::RuntimeException) { - try + try { sal_Int32 nLevel = 0; if ( !(_aLevel >>= nLevel ) ) throw uno::RuntimeException(); - table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_STANDARD; - + table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_STANDARD; + rtl::OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); if ( !( mxPropertySet->getPropertyValue(sHoriJust) >>= aAPIAlignment ) ) throw uno::RuntimeException(); - if (aAPIAlignment == table::CellHoriJustify_STANDARD) + if (aAPIAlignment == table::CellHoriJustify_STANDARD) mxPropertySet->setPropertyValue( sHoriJust, uno::makeAny( table::CellHoriJustify_LEFT) ) ; mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); } @@ -505,11 +505,11 @@ ScVbaFormat<Ifc1>::setIndentLevel( const uno::Any& _aLevel ) throw (script::Basi } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any NRetIndentLevel = aNULL(); - try + try { rtl::OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ); if (!isAmbiguous(sParaIndent)) @@ -517,9 +517,9 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R sal_Int16 IndentLevel = 0; if ( ( mxPropertySet->getPropertyValue(sParaIndent) >>= IndentLevel ) ) NRetIndentLevel = uno::makeAny( sal_Int32( rtl::math::round(static_cast<double>( IndentLevel ) / 352.8)) ); - else + else NRetIndentLevel = uno::makeAny( sal_Int32(0) ); - } + } } catch (uno::Exception& ) { @@ -529,7 +529,7 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setLocked( const uno::Any& _aLocked ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -550,7 +550,7 @@ ScVbaFormat<Ifc1>::setLocked( const uno::Any& _aLocked ) throw (script::BasicErr } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setFormulaHidden( const uno::Any& FormulaHidden ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -559,25 +559,25 @@ ScVbaFormat<Ifc1>::setFormulaHidden( const uno::Any& FormulaHidden ) throw (scri FormulaHidden >>= bIsFormulaHidden; util::CellProtection aCellProtection; rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); - mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; + mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsFormulaHidden = bIsFormulaHidden; mxPropertySet->setPropertyValue(sCellProt,uno::makeAny(aCellProtection)); } catch (uno::Exception& ) { - DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() ); } } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any aCellProtection = aNULL(); - try + try { rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); - + if (!isAmbiguous(sCellProt)) { SfxItemSet* pDataSet = getCurrentDataSet(); @@ -598,13 +598,13 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); } return aCellProtection; } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any aBoolRet = aNULL(); @@ -624,20 +624,20 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno: else { util::CellProtection aCellProtection; - mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; - aBoolRet = uno::makeAny( aCellProtection.IsFormulaHidden ); + mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; + aBoolRet = uno::makeAny( aCellProtection.IsFormulaHidden ); } } } catch (uno::Exception e) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); - } + } return aBoolRet; } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -652,7 +652,7 @@ ScVbaFormat<Ifc1>::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script:: } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getShrinkToFit( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any aRet = aNULL(); @@ -664,13 +664,13 @@ ScVbaFormat<Ifc1>::getShrinkToFit( ) throw (script::BasicErrorException, uno::R } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); } return aRet; } template< typename Ifc1 > -void SAL_CALL +void SAL_CALL ScVbaFormat<Ifc1>::setReadingOrder( const uno::Any& ReadingOrder ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -688,22 +688,22 @@ ScVbaFormat<Ifc1>::setReadingOrder( const uno::Any& ReadingOrder ) throw (script aVal = uno::makeAny( text::WritingMode_RL_TB ); break; case excel::Constants::xlContext: - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); break; default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); } mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal ); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); } } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any NRetReadingOrder = aNULL(); @@ -713,7 +713,7 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno:: if (!isAmbiguous(sWritingMode)) { text::WritingMode aWritingMode = text::WritingMode_LR_TB; - if ( ( mxPropertySet->getPropertyValue(sWritingMode) ) >>= aWritingMode ) + if ( ( mxPropertySet->getPropertyValue(sWritingMode) ) >>= aWritingMode ) switch (aWritingMode){ case text::WritingMode_LR_TB: NRetReadingOrder = uno::makeAny(excel::Constants::xlLTR); @@ -731,19 +731,19 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno:: DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); } return NRetReadingOrder; - + } template< typename Ifc1 > -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Any aFormat = aNULL(); - try + try { sal_Int32 nFormat = -1; rtl::OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_NUMBERFO ) ); - if (!isAmbiguous(sNumFormat) && + if (!isAmbiguous(sNumFormat) && ( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat) ) { initializeNumberFormats(); @@ -774,24 +774,24 @@ ScVbaFormat<Ifc1>::isAmbiguous(const rtl::OUString& _sPropertyName) throw ( scri catch (uno::Exception& ) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); - } + } return bResult; } template< typename Ifc1 > -void +void ScVbaFormat<Ifc1>::initializeNumberFormats() throw ( script::BasicErrorException ) { if ( !xNumberFormats.is() ) { - mxNumberFormatsSupplier.set( mxModel, uno::UNO_QUERY_THROW ); + mxNumberFormatsSupplier.set( mxModel, uno::UNO_QUERY_THROW ); xNumberFormats = mxNumberFormatsSupplier->getNumberFormats(); xNumberFormatTypes.set( xNumberFormats, uno::UNO_QUERY ); // _THROW? } } template< typename Ifc1 > -uno::Reference< beans::XPropertyState > +uno::Reference< beans::XPropertyState > ScVbaFormat<Ifc1>::getXPropertyState() throw ( uno::RuntimeException ) { if ( !xPropertyState.is() ) @@ -821,20 +821,20 @@ ScVbaFormat<Ifc1>::getServiceNames() } template< typename Ifc1 > -ScCellRangesBase* +ScCellRangesBase* ScVbaFormat<Ifc1>::getCellRangesBase() throw ( ::uno::RuntimeException ) { return ScCellRangesBase::getImplementation( mxPropertySet ); } template< typename Ifc1 > -SfxItemSet* +SfxItemSet* ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for XPropertySet" ) ), uno::Reference< uno::XInterface >() ); - return pDataSet; + return pDataSet; } diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index 3646665f5b24..60d1a4460ae1 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.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 @@ -29,10 +29,10 @@ #define SC_VBA_FORMAT_HXX #include <ooo/vba/excel/XFormat.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormats.hpp> -#include <com/sun/star/util/XNumberFormatTypes.hpp> -#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/util/XNumberFormatTypes.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/Locale.hpp> @@ -69,7 +69,7 @@ protected: public: ScVbaFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( css::script::BasicErrorException ); virtual ~ScVbaFormat() {} - virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() = 0; + virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() = 0; css::uno::Reference< css::lang::XServiceInfo > getXServiceInfo() { return mxServiceInfo; } void SAL_CALL setAddIndent( const css::uno::Any& _BAddIndent) throw( css::uno::RuntimeException ) { _BAddIndent >>= mbAddIndent; } css::uno::Any SAL_CALL getAddIndent() throw( css::uno::RuntimeException ) { return css::uno::makeAny( mbAddIndent ); } @@ -98,7 +98,7 @@ public: virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getFormulaHidden( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; - virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; + virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface @@ -106,6 +106,6 @@ public: virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index deed22ab287e..ce7ecfd52a1c 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.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 @@ -32,7 +32,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -ScVbaFormatConditions* +ScVbaFormatConditions* lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions >& xFormatConditions ) throw ( script::BasicErrorException ) { ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() ); @@ -49,7 +49,7 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterf } -void SAL_CALL +void SAL_CALL ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { ScVbaFormatConditions* pFormatConditions = lcl_getScVbaFormatConditionsPtr( moFormatConditions ); @@ -57,7 +57,7 @@ ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::Runtim notifyRange(); } -void SAL_CALL +void SAL_CALL ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -72,18 +72,18 @@ ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, co } } -uno::Reference< excel::XInterior > SAL_CALL +uno::Reference< excel::XInterior > SAL_CALL ScVbaFormatCondition::Interior( ) throw (script::BasicErrorException, uno::RuntimeException) { return mxStyle->Interior(); } -uno::Reference< excel::XFont > SAL_CALL +uno::Reference< excel::XFont > SAL_CALL ScVbaFormatCondition::Font( ) throw (script::BasicErrorException, uno::RuntimeException) { return mxStyle->Font(); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFormatCondition::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException) { return mxStyle->Borders( Index ); } @@ -103,11 +103,11 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< break; default: DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); - } + } return aAPIType; } -void +void ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException ) { // getA1Formula *SHOULD* detect whether the formula is r1c1 or A1 syntax @@ -121,7 +121,7 @@ ScVbaFormatCondition::setFormula2( const uno::Any& _aFormula2) throw ( script::B ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( lcl_getScVbaFormatConditionsPtr( moFormatConditions )->getA1Formula(_aFormula2)) ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::RuntimeException ) { sal_Int32 nReturnType = 0; @@ -133,18 +133,18 @@ ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::Runtime } -::sal_Int32 +::sal_Int32 ScVbaFormatCondition::Operator( sal_Bool bVal ) throw (script::BasicErrorException ) { return ScVbaFormatCondition_BASE::Operator( bVal ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaFormatCondition::Operator( ) throw (script::BasicErrorException, uno::RuntimeException) { return ScVbaFormatCondition_BASE::Operator( sal_True ); } -void +void ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) { try @@ -157,14 +157,14 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) } } -rtl::OUString& +rtl::OUString& ScVbaFormatCondition::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaFormatCondition::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index aa1a3e5bb740..75706878d1c3 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.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 @@ -30,10 +30,10 @@ #include <ooo/vba/excel/XFormatCondition.hpp> #include <ooo/vba/excel/XFormatConditions.hpp> #include <ooo/vba/excel/XStyle.hpp> -#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/sheet/XSheetConditionalEntries.hpp> #include <com/sun/star/sheet/XSheetConditionalEntry.hpp> -#include <com/sun/star/sheet/XSheetCondition.hpp> +#include <com/sun/star/sheet/XSheetCondition.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include "vbacondition.hxx" @@ -42,8 +42,8 @@ class ScVbaFormatCondition : public ScVbaFormatCondition_BASE { protected: rtl::OUString msStyleName; - css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry; - css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries; + css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry; + css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries; css::uno::Reference< ov::excel::XFormatConditions> moFormatConditions; css::uno::Reference< ov::excel::XStyle > mxStyle; css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet; @@ -68,6 +68,6 @@ public: virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 6eda5c654238..26dcaac89040 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.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 @@ -53,12 +53,12 @@ ScVbaFormatConditions::ScVbaFormatConditions( const uno::Reference< XHelperInter mxStyles.set( xApp->getThisWorkbook()->Styles( uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XCellRangeAddressable > xCellRange( mxRangeParent->getCellRange(), uno::UNO_QUERY_THROW ); mxParentRangePropertySet.set( xCellRange, uno::UNO_QUERY_THROW ); - + table::CellRangeAddress rangeAddress = xCellRange->getRangeAddress(); maCellAddress = table::CellAddress( rangeAddress.Sheet, rangeAddress.StartColumn, rangeAddress.StartRow ); } -void SAL_CALL +void SAL_CALL ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -71,7 +71,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti { uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry( mxSheetConditionalEntries->getByIndex(i), uno::UNO_QUERY_THROW ); pStyles->Delete(xSheetConditionalEntry->getStyleName()); - mxSheetConditionalEntries->removeByIndex(i); + mxSheetConditionalEntries->removeByIndex(i); } notifyRange(); } @@ -81,24 +81,24 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti } } -uno::Type SAL_CALL +uno::Type SAL_CALL ScVbaFormatConditions::getElementType() throw (css::uno::RuntimeException) { return excel::XFormatCondition::static_type(0); } -uno::Any xSheetConditionToFormatCondition( const uno::Reference< XHelperInterface >& xRangeParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xFormatConditions, const uno::Reference< beans::XPropertySet >& xRangeProps, const uno::Any& aObject ) +uno::Any xSheetConditionToFormatCondition( const uno::Reference< XHelperInterface >& xRangeParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xFormatConditions, const uno::Reference< beans::XPropertySet >& xRangeProps, const uno::Any& aObject ) { uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry; aObject >>= xSheetConditionalEntry; uno::Reference< excel::XStyle > xStyle( xStyles->Item( uno::makeAny( xSheetConditionalEntry->getStyleName() ), uno::Any() ), uno::UNO_QUERY_THROW ); - uno::Reference< excel::XFormatCondition > xCondition = new ScVbaFormatCondition( xRangeParent, xContext, xSheetConditionalEntry, xStyle, xFormatConditions, xRangeProps ); + uno::Reference< excel::XFormatCondition > xCondition = new ScVbaFormatCondition( xRangeParent, xContext, xSheetConditionalEntry, xStyle, xFormatConditions, xRangeProps ); return uno::makeAny( xCondition ); } -uno::Any +uno::Any ScVbaFormatConditions::createCollectionObject(const uno::Any& aObject ) { return xSheetConditionToFormatCondition( uno::Reference< XHelperInterface >( mxRangeParent, uno::UNO_QUERY_THROW ), mxContext, mxStyles, this, mxParentRangePropertySet, aObject ); @@ -129,21 +129,21 @@ public: } }; -uno::Reference< excel::XFormatCondition > SAL_CALL +uno::Reference< excel::XFormatCondition > SAL_CALL ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException) { return Add( _nType, _aOperator, _aFormula1, _aFormula2, uno::Reference< excel::XStyle >() ); } -uno::Reference< excel::XFormatCondition > +uno::Reference< excel::XFormatCondition > ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2, const css::uno::Reference< excel::XStyle >& _xStyle ) throw (script::BasicErrorException, uno::RuntimeException) { // #TODO - // #FIXME + // #FIXME // This method will NOT handle r1c1 formulas [*]and only assumes that // the formulas are _xlA1 based ( need to hook into calc work ths should // address this ) - // [*] reason: getA1Formula method below is just a hook and just + // [*] reason: getA1Formula method below is just a hook and just // returns whats it gets ( e.g. doesn't convert anything ) uno::Reference< excel::XStyle > xStyle( _xStyle ); uno::Reference< excel::XFormatCondition > xFormatCondition; @@ -151,7 +151,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons { rtl::OUString sStyleName; if ( !xStyle.is() ) - { + { sStyleName = getStyleName(); xStyle = mxStyles->Add(sStyleName, uno::Any() ); } @@ -173,12 +173,12 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons aPropertyValueVector.push_back( aProperty ); if ( _aFormula1.hasValue() ) - { + { beans::PropertyValue aProp( FORMULA1, 0, uno::makeAny( getA1Formula( _aFormula1 ) ), beans::PropertyState_DIRECT_VALUE ); aPropertyValueVector.push_back( aProp ); } if ( _aFormula2.hasValue() ) - { + { beans::PropertyValue aProp( FORMULA2, 0, uno::makeAny( getA1Formula( _aFormula2 ) ), beans::PropertyState_DIRECT_VALUE ); aPropertyValueVector.push_back( aProp ); } @@ -212,14 +212,14 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL ScVbaFormatConditions::createEnumeration() throw (uno::RuntimeException) { return new EnumWrapper( m_xIndexAccess, mxRangeParent, mxContext, mxStyles, this, mxParentRangePropertySet ); } -void +void ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) { try @@ -232,7 +232,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) } } -rtl::OUString +rtl::OUString ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( script::BasicErrorException ) { // #TODO, #FIXME hook-in proper formula conversion detection & logic @@ -242,7 +242,7 @@ ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( scri return sFormula; } -rtl::OUString +rtl::OUString ScVbaFormatConditions::getStyleName() { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); @@ -252,7 +252,7 @@ ScVbaFormatConditions::getStyleName() return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_") )); } -void +void ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( script::BasicErrorException ) { try @@ -281,14 +281,14 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, } } -rtl::OUString& +rtl::OUString& ScVbaFormatConditions::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatConditions") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaFormatConditions::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index dea8f4c45a62..e51ca233164d 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.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 @@ -38,7 +38,7 @@ typedef CollTestImplHelper< ov::excel::XFormatConditions > ScVbaFormatConditions_BASE; class ScVbaFormatConditions: public ScVbaFormatConditions_BASE { - css::table::CellAddress maCellAddress; + css::table::CellAddress maCellAddress; css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries; css::uno::Reference< ov::excel::XStyles > mxStyles; css::uno::Reference< ov::excel::XRange > mxRangeParent; @@ -56,7 +56,7 @@ public: virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface virtual rtl::OUString& getServiceImplName(); diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index e37a2bb933c0..b3e56cddb958 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -76,7 +76,7 @@ ScVbaGlobals::~ScVbaGlobals() uno::Reference<excel::XApplication > ScVbaGlobals::getApplication() throw (uno::RuntimeException) { -// OSL_TRACE("In ScVbaGlobals::getApplication"); +// OSL_TRACE("In ScVbaGlobals::getApplication"); if ( !mxApplication.is() ) mxApplication.set( new ScVbaApplication( mxContext) ); return mxApplication; @@ -94,7 +94,7 @@ ScVbaGlobals::getExcel() throw (uno::RuntimeException) uno::Reference< excel::XWorkbook > SAL_CALL ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException) { -// OSL_TRACE("In ScVbaGlobals::getActiveWorkbook"); +// OSL_TRACE("In ScVbaGlobals::getActiveWorkbook"); uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY); if ( xWorkbook.is() ) { diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index a320ebdf94f6..dc7518ad64c2 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.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 @@ -51,7 +51,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc ov::excel::XApplication > SAL_CALL getApplication() throw (css::uno::RuntimeException); public: - + ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& rxContext ); //ScVbaGlobals( @@ -94,6 +94,6 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; -#endif // +#endif // /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index 62d71a08f4fc..bc1b07d738ab 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -719,32 +719,32 @@ UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp double UserFormGeometryHelper::getTop() { sal_Int32 nTop = 0; - mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop; + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop; return Millimeter::getInPoints( nTop ); } void UserFormGeometryHelper::setTop( double nTop ) { - mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) ); + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) ); } double UserFormGeometryHelper::getHeight() { sal_Int32 nHeight = 0; - mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ) ) >>= nHeight; + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ) ) >>= nHeight; return Millimeter::getInPoints( nHeight ); } void UserFormGeometryHelper::setHeight( double nHeight ) { - mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) ); + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) ); } double UserFormGeometryHelper::getWidth() { sal_Int32 nWidth = 0; - mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ) ) >>= nWidth; + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ) ) >>= nWidth; return Millimeter::getInPoints( nWidth ); } void UserFormGeometryHelper::setWidth( double nWidth) { - mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) ); + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) ); } SfxItemSet* diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index 2f3c5703203f..4499a1183400 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.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 @@ -31,7 +31,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextFieldsSupplier.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/container/XEnumerationAccess.hpp> #include <ooo/vba/office/MsoHyperlinkType.hpp> #include <ooo/vba/msforms/XShape.hpp> #include "vbarange.hxx" diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx index 36df21cf324c..1e74707c2397 100644 --- a/sc/source/ui/vba/vbahyperlink.hxx +++ b/sc/source/ui/vba/vbahyperlink.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef SC_VBA_HYPERLINK_HXX #define SC_VBA_HYPERLINK_HXX @@ -38,7 +38,7 @@ typedef InheritedHelperInterfaceImpl1< ov::excel::XHyperlink > HyperlinkImpl_BASE; -class ScVbaHyperlink : public HyperlinkImpl_BASE +class ScVbaHyperlink : public HyperlinkImpl_BASE { public: ScVbaHyperlink( diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 083607ff345d..686f636669c8 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "vbahyperlinks.hxx" #include <algorithm> #include <vector> @@ -89,7 +89,7 @@ bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& sal_Int32 nType = rxHlink->getType(); if( nType != mnType ) return false; - + switch( nType ) { case office::MsoHyperlinkType::msoHyperlinkRange: @@ -126,7 +126,7 @@ public: /** Inserts the passed hyperlink into the collection. Will remove a Hyperlink object with the same anchor as the passed Hyperlink object. */ void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException); - + // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException); virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException); @@ -134,7 +134,7 @@ public: // XElementAccess virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException); - + private: typedef ::std::vector< uno::Reference< excel::XHyperlink > > HyperlinkVector; HyperlinkVector maHlinks; @@ -252,7 +252,7 @@ uno::Reference< excel::XHyperlink > SAL_CALL ScVbaHyperlinks::Add( the spreadsheet document. Parent of the Hyperlink is the anchor object. */ uno::Reference< excel::XHyperlink > xHlink( new ScVbaHyperlink( xAnchor, mxContext, rAddress, rSubAddress, rScreenTip, rTextToDisplay ) ); - + /* If creation of the hyperlink did not throw, insert it into the collection. */ mxContainer->insertHyperlink( xHlink ); diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index 161b236e26fe..37dab9dd886a 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef SC_VBA_HYPERLINKS_HXX #define SC_VBA_HYPERLINKS_HXX @@ -68,7 +68,7 @@ typedef CollTestImplHelper< ov::excel::XHyperlinks > ScVbaHyperlinks_BASE; Worksheet object, it will always represent the current set of all hyperlinks existing in the sheet. Insertion and deletion of hyperlinks will be reflected by the instance. - + When a Hyperlinks collection object has been constructed from a VBA Range object, it will represent the set of hyperlinks that have existed at its construction time, and that are located completely inside the range(s) @@ -77,9 +77,9 @@ typedef CollTestImplHelper< ov::excel::XHyperlinks > ScVbaHyperlinks_BASE; hyperlinks it has been constructed with, even if they no longer exist. Furthermore, the instance will not offer hyperlinks inserted later, even if the instance itself has been used to insert the new hyperlinks. - + VBA code example: - + With ThisWorkbook.Worksheets(1) Set hlinks = .Hyperlinks ' global Hyperlinks object @@ -132,7 +132,7 @@ public: // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - + // XElementAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 733f394fabd4..f3ea1b0f53dd 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.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 @@ -96,17 +96,17 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, m_aPattColor.SetColor( (sal_uInt32)0x0 ); m_nPattern = 0L; if ( !m_xProps.is() ) - throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "properties") ), uno::Reference< uno::XInterface >(), 2 ); + throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "properties") ), uno::Reference< uno::XInterface >(), 2 ); } uno::Any -ScVbaInterior::getColor() throw (uno::RuntimeException) +ScVbaInterior::getColor() throw (uno::RuntimeException) { Color aBackColor( GetBackColor() ); return uno::makeAny( OORGBToXLRGB( aBackColor.GetColor() ) ); } - -void + +void ScVbaInterior::setColor( const uno::Any& _color ) throw (uno::RuntimeException) { sal_Int32 nColor = 0; @@ -151,15 +151,15 @@ ScVbaInterior::SetMixedColor() uno::Reference< container::XIndexAccess > ScVbaInterior::getPalette() { - if ( !m_pScDoc ) + if ( !m_pScDoc ) throw uno::RuntimeException(); SfxObjectShell* pShell = m_pScDoc->GetDocumentShell(); - ScVbaPalette aPalette( pShell ); - return aPalette.getPalette(); + ScVbaPalette aPalette( pShell ); + return aPalette.getPalette(); } -void SAL_CALL -ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException) +void SAL_CALL +ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException) { sal_Int32 nIndex = 0; _colorindex >>= nIndex; @@ -205,16 +205,16 @@ ScVbaInterior::GetColorIndex( const sal_Int32 nColor ) nIndex = count + 1; // 1 based break; } - } + } return nIndex; } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaInterior::getColorIndex() throw ( css::uno::RuntimeException ) { sal_Int32 nColor = 0; // hackly for excel::XlColorIndex::xlColorIndexNone - uno::Any aColor = m_xProps->getPropertyValue( BACKCOLOR ); + uno::Any aColor = m_xProps->getPropertyValue( BACKCOLOR ); if( ( aColor >>= nColor ) && ( nColor == -1 ) ) { nColor = excel::XlColorIndex::xlColorIndexNone; @@ -222,11 +222,11 @@ ScVbaInterior::getColorIndex() throw ( css::uno::RuntimeException ) } // getColor returns Xl ColorValue, need to convert it to OO val - // as the palette deals with OO RGB values - // #FIXME this is daft in getColor we convert OO RGB val to XL RGB val + // as the palette deals with OO RGB values + // #FIXME this is daft in getColor we convert OO RGB val to XL RGB val // and then back again to OO RGB value - XLRGBToOORGB( getColor() ) >>= nColor; - + XLRGBToOORGB( getColor() ) >>= nColor; + return uno::makeAny( GetColorIndex( nColor ) ); } Color @@ -246,7 +246,7 @@ ScVbaInterior::GetPatternColor( const Color& rPattColor, const Color& rBackColor Color ScVbaInterior::GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans ) { - return Color( + return Color( nTrans, GetMixedColorComp( rFore.GetRed(), rBack.GetRed(), nTrans ), GetMixedColorComp( rFore.GetGreen(), rBack.GetGreen(), nTrans ), @@ -305,7 +305,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno:: } } // OOo do not support below API -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaInterior::getPattern() throw (uno::RuntimeException) { // XlPattern @@ -314,7 +314,7 @@ ScVbaInterior::getPattern() throw (uno::RuntimeException) return uno::makeAny( GetAttributeData( aPattern ) ); return uno::makeAny( excel::XlPattern::xlPatternNone ); } -void SAL_CALL +void SAL_CALL ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeException) { if( _pattern >>= m_nPattern ) @@ -330,7 +330,7 @@ ScVbaInterior::GetBackColor() { sal_Int32 nColor = 0; Color aBackColor; - uno::Any aColor = GetUserDefinedAttributes( BACKCOLOR ); + uno::Any aColor = GetUserDefinedAttributes( BACKCOLOR ); if( aColor.hasValue() ) { nColor = GetAttributeData( aColor ); @@ -349,7 +349,7 @@ ScVbaInterior::GetBackColor() } return aBackColor; } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaInterior::getPatternColor() throw (uno::RuntimeException) { // 0 is the default color. no filled. @@ -361,7 +361,7 @@ ScVbaInterior::getPatternColor() throw (uno::RuntimeException) } return uno::makeAny( sal_Int32( 0 ) ); } -void SAL_CALL +void SAL_CALL ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::RuntimeException) { sal_Int32 nPattColor = 0; @@ -373,15 +373,15 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt else throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException) { sal_Int32 nColor = 0; - XLRGBToOORGB( getPatternColor() ) >>= nColor; - + XLRGBToOORGB( getPatternColor() ) >>= nColor; + return uno::makeAny( GetIndexColor( nColor ) ); } -void SAL_CALL +void SAL_CALL ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw (uno::RuntimeException) { sal_Int32 nColorIndex = 0; @@ -397,14 +397,14 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } -rtl::OUString& +rtl::OUString& ScVbaInterior::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaInterior") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaInterior::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 72b0f3748ffe..51b06e7d97c4 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.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 @@ -48,9 +48,9 @@ class ScVbaInterior : public ScVbaInterior_BASE css::uno::Reference< css::beans::XPropertySet > m_xProps; ScDocument* m_pScDoc; Color m_aPattColor; - sal_Int32 m_nPattern; + sal_Int32 m_nPattern; - css::uno::Reference< css::container::XIndexAccess > getPalette(); + css::uno::Reference< css::container::XIndexAccess > getPalette(); css::uno::Reference< css::container::XNameContainer > GetAttributeContainer(); css::uno::Any SetAttributeData( sal_Int32 nValue ); sal_Int32 GetAttributeData( css::uno::Any aValue ); @@ -80,7 +80,7 @@ public: virtual css::uno::Any SAL_CALL getPatternColor() throw (css::uno::RuntimeException); virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException); - virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException); //XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx index 71d42038f89b..37170f60bb39 100644 --- a/sc/source/ui/vba/vbaname.cxx +++ b/sc/source/ui/vba/vbaname.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,12 +43,12 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -ScVbaName::ScVbaName(const css::uno::Reference< ov::XHelperInterface >& xParent, +ScVbaName::ScVbaName(const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRange >& xName, const css::uno::Reference< css::sheet::XNamedRanges >& xNames, const css::uno::Reference< css::frame::XModel >& xModel ): - NameImpl_BASE( xParent , xContext ), + NameImpl_BASE( xParent , xContext ), mxModel( xModel ), mxNamedRange( xName ), mxNames( xNames ) @@ -130,7 +130,7 @@ ScVbaName::getValue(const formula::FormulaGrammar::Grammar eGrammar) throw (css: return sValue; } -void +void ScVbaName::setValue( const ::rtl::OUString & rValue ) throw (css::uno::RuntimeException) { ::rtl::OUString sValue = rValue; @@ -145,25 +145,25 @@ ScVbaName::setValue( const ::rtl::OUString & rValue ) throw (css::uno::RuntimeEx mxNamedRange->setContent( sValue ); } -::rtl::OUString +::rtl::OUString ScVbaName::getRefersTo() throw (css::uno::RuntimeException) { return getValue(); } -void +void ScVbaName::setRefersTo( const ::rtl::OUString & rRefersTo ) throw (css::uno::RuntimeException) { setValue( rRefersTo ); } -::rtl::OUString +::rtl::OUString ScVbaName::getRefersToLocal() throw (css::uno::RuntimeException) { return getRefersTo(); } -void +void ScVbaName::setRefersToLocal( const ::rtl::OUString & rRefersTo ) throw (css::uno::RuntimeException) { setRefersTo( rRefersTo ); @@ -181,7 +181,7 @@ ScVbaName::setRefersToR1C1( const ::rtl::OUString & rRefersTo ) throw (css::uno: setRefersTo( rRefersTo ); } -::rtl::OUString +::rtl::OUString ScVbaName::getRefersToR1C1Local() throw (css::uno::RuntimeException) { return getValue( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); @@ -209,7 +209,7 @@ ScVbaName::setRefersToRange( const css::uno::Reference< ov::excel::XRange > /*rR void ScVbaName::Delete() throw (css::uno::RuntimeException) { - mxNames->removeByName( mxNamedRange->getName() ); + mxNames->removeByName( mxNamedRange->getName() ); } rtl::OUString& diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index fc6d210ffa10..4ef4b3a13a39 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.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 @@ -36,11 +36,11 @@ #include <formula/grammar.hxx> -class ScDocument; +class ScDocument; typedef InheritedHelperInterfaceImpl1< ov::excel::XName > NameImpl_BASE; -class ScVbaName : public NameImpl_BASE +class ScVbaName : public NameImpl_BASE { css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::sheet::XNamedRange > mxNamedRange; diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index a3fddb13286d..de9b2d862e56 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.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 @@ -43,13 +43,13 @@ class ScVbaNames : public ScVbaNames_BASE { css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::sheet::XNamedRanges > mxNames; - + protected: virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } public: ScVbaNames( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRanges >& xNames , const css::uno::Reference< css::frame::XModel >& xModel ); - + ScDocument* getScDocument(); ScDocShell* getScDocShell(); @@ -60,7 +60,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // Methods - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& aName , + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& aName , const css::uno::Any& aRefersTo, const css::uno::Any& aVisible, const css::uno::Any& aMacroType, @@ -71,7 +71,7 @@ public: const css::uno::Any& aCategoryLocal, const css::uno::Any& aRefersToR1C1, const css::uno::Any& aRefersToR1C1Local ) throw (css::uno::RuntimeException); - + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ScVbaNames_BASE diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index ebf87bf5275d..2d8347bdbd8b 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.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,94 +65,94 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) ); } -uno::Reference< uno::XInterface > SAL_CALL +uno::Reference< uno::XInterface > SAL_CALL ScVbaOLEObject::getObject() throw (uno::RuntimeException) { return uno::Reference< uno::XInterface >( m_xControl, uno::UNO_QUERY_THROW ); } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaOLEObject::getEnabled() throw (uno::RuntimeException) { return m_xControl->getEnabled(); } -void SAL_CALL +void SAL_CALL ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException) { m_xControl->setEnabled( _enabled ); } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaOLEObject::getVisible() throw (uno::RuntimeException) { OSL_TRACE("OleObject %s returning visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" ); return m_xControl->getVisible(); } -void SAL_CALL +void SAL_CALL ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) { OSL_TRACE("OleObject %s set visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" ); m_xControl->setVisible( _visible ); } -double SAL_CALL +double SAL_CALL ScVbaOLEObject::getLeft() throw (uno::RuntimeException) { return m_xControl->getLeft(); } -void SAL_CALL +void SAL_CALL ScVbaOLEObject::setLeft( double _left ) throw (uno::RuntimeException) { m_xControl->setLeft( _left ); } -double SAL_CALL +double SAL_CALL ScVbaOLEObject::getTop() throw (uno::RuntimeException) { return m_xControl->getTop(); } -void SAL_CALL +void SAL_CALL ScVbaOLEObject::setTop( double _top ) throw (uno::RuntimeException) { m_xControl->setTop( _top ); } -double SAL_CALL +double SAL_CALL ScVbaOLEObject::getHeight() throw (uno::RuntimeException) { return m_xControl->getHeight(); } -void SAL_CALL +void SAL_CALL ScVbaOLEObject::setHeight( double _height ) throw (uno::RuntimeException) { m_xControl->setHeight( _height ); } -double SAL_CALL +double SAL_CALL ScVbaOLEObject::getWidth() throw (uno::RuntimeException) { return m_xControl->getWidth(); } -void SAL_CALL +void SAL_CALL ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException) { m_xControl->setWidth( _width ); } -rtl::OUString& +rtl::OUString& ScVbaOLEObject::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObject") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaOLEObject::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index e329789cd7a4..da0630282506 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.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 @@ -62,7 +62,7 @@ public: virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException); virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException); virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException); - + }; #endif //SC_VBA_OLEOBJECT_HXX diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 84cba7b96e92..bbb88d9b7680 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.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 @@ class IndexAccessWrapper : public XIndexAccess_BASE typedef std::vector< uno::Reference< drawing::XControlShape > > OLEObjects; OLEObjects vObjects; public: - IndexAccessWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) + IndexAccessWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) { sal_Int32 nLen = xIndexAccess->getCount(); for ( sal_Int32 index = 0; index < nLen; ++index ) @@ -64,7 +64,7 @@ public: { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); - return uno::makeAny( vObjects[ Index ] ); + return uno::makeAny( vObjects[ Index ] ); } // Methods XElementAcess @@ -166,14 +166,14 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException) { return ooo::vba::excel::XOLEObject::static_type(0); } -rtl::OUString& +rtl::OUString& ScVbaOLEObjects::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObjects") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaOLEObjects::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index c949d578422a..7ebbf4956734 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.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 @@ -43,7 +43,7 @@ protected: virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); public: - ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, + ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); // XEnumerationAccess @@ -52,7 +52,7 @@ public: // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - + }; #endif //SC_VBA_OLEOBJECTS_HXX diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index b42d81052d15..3d00b80ca0a5 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.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 @@ -30,15 +30,15 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; void -ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels ) throw (uno::RuntimeException) +ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels ) throw (uno::RuntimeException) { sal_Int16 nLevel = 0; - if (mxOutline.is()) + if (mxOutline.is()) { if (RowLevels >>= nLevel) { mxOutline->showLevel(nLevel, table::TableOrientation_ROWS); - } + } if (ColumnLevels >>= nLevel) { mxOutline->showLevel(nLevel,table::TableOrientation_COLUMNS); @@ -46,14 +46,14 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel } } -rtl::OUString& +rtl::OUString& ScVbaOutline::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOutline") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaOutline::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index 4b297a0a9079..4cc1c7386779 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.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 @@ -36,7 +36,7 @@ typedef InheritedHelperInterfaceImpl1< ov::excel::XOutline > ScVbaOutline_BASE; -class ScVbaOutline : public ScVbaOutline_BASE +class ScVbaOutline : public ScVbaOutline_BASE { css::uno::Reference< css::sheet::XSheetOutline > mxOutline; public: @@ -44,7 +44,7 @@ public: css::uno::Reference<css::sheet::XSheetOutline> outline): ScVbaOutline_BASE( xParent, xContext) , mxOutline(outline) {} virtual ~ScVbaOutline(){} - + virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException) ; // XHelperInterface virtual rtl::OUString& getServiceImplName(); diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 8c28aada76f4..813a5954d6e1 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.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 @@ -32,7 +32,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; template< typename Ifc1 > -ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& xParent, +ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< beans::XPropertySet >& xProps, sheet::TablePageBreakData aTablePageBreakData) throw (uno::RuntimeException): @@ -43,7 +43,7 @@ ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& } template< typename Ifc1 > -sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException) +sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException) { uno::Any aValue = mxRowColPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" ))); sal_Bool hasPageBreak = sal_False; @@ -51,17 +51,17 @@ sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException) if( !hasPageBreak ) return excel::XlPageBreak::xlPageBreakNone; - + if( maTablePageBreakData.ManualBreak ) return excel::XlPageBreak::xlPageBreakManual; - + return excel::XlPageBreak::xlPageBreakAutomatic; } template< typename Ifc1 > -void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) +void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) { - if( (type != excel::XlPageBreak::xlPageBreakNone) && + if( (type != excel::XlPageBreak::xlPageBreakNone) && (type != excel::XlPageBreak::xlPageBreakManual) && (type != excel::XlPageBreak::xlPageBreakAutomatic) ) { @@ -95,7 +95,7 @@ uno::Reference< excel::XRange> ScVbaPageBreak<Ifc1>::Location() throw ( script:: } template< typename Ifc1 > -rtl::OUString& +rtl::OUString& ScVbaPageBreak<Ifc1>::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPageBreak") ); @@ -103,7 +103,7 @@ ScVbaPageBreak<Ifc1>::getServiceImplName() } template< typename Ifc1 > -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaPageBreak<Ifc1>::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -118,14 +118,14 @@ ScVbaPageBreak<Ifc1>::getServiceNames() template class ScVbaPageBreak< excel::XHPageBreak >; /* class ScVbaHPageBreak */ -rtl::OUString& +rtl::OUString& ScVbaHPageBreak::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreak") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaHPageBreak::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -140,26 +140,26 @@ ScVbaHPageBreak::getServiceNames() template class ScVbaPageBreak< excel::XVPageBreak >; /* class ScVbaVPageBreak */ -ScVbaVPageBreak::ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, +ScVbaVPageBreak::ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, css::sheet::TablePageBreakData aTablePageBreakData ) throw ( css::uno::RuntimeException ) : ScVbaVPageBreak_BASE( xParent, xContext, xProps, aTablePageBreakData ) { } - + ScVbaVPageBreak::~ScVbaVPageBreak() { } -rtl::OUString& +rtl::OUString& ScVbaVPageBreak::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaVPageBreak::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index c047a8e3c06a..c0579787a4c6 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.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 @@ -47,12 +47,12 @@ protected: css::uno::Reference< css::beans::XPropertySet > mxRowColPropertySet; css::sheet::TablePageBreakData maTablePageBreakData; public: - ScVbaPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, + ScVbaPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException); virtual ~ScVbaPageBreak(){} - + virtual sal_Int32 SAL_CALL getType( ) throw (css::uno::RuntimeException); virtual void SAL_CALL setType(sal_Int32 type) throw (css::uno::RuntimeException); @@ -70,14 +70,14 @@ typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE; class ScVbaHPageBreak : public ScVbaHPageBreak_BASE { public: - ScVbaHPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, + ScVbaHPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException): ScVbaHPageBreak_BASE( xParent,xContext,xProps,aTablePageBreakData ){} - + virtual ~ScVbaHPageBreak(){} - + // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); @@ -89,13 +89,13 @@ typedef ScVbaPageBreak < ov::excel::XVPageBreak > ScVbaVPageBreak_BASE; class ScVbaVPageBreak : public ScVbaVPageBreak_BASE { public: - ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, + ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException); - + virtual ~ScVbaVPageBreak(); - + // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 5b8feb57c221..0230b2be0b58 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.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 @@ -50,17 +50,17 @@ class ScVbaHPageBreaks : public ScVbaHPageBreaks_BASE { css::uno::Reference< css::sheet::XSheetPageBreak > mxSheetPageBreak; public: - ScVbaHPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, + ScVbaHPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak) throw (css::uno::RuntimeException); virtual ~ScVbaHPageBreaks(){} - // XHPageBreaks + // XHPageBreaks virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) throw ( css::script::BasicErrorException, css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface @@ -76,18 +76,18 @@ class ScVbaVPageBreaks : public ScVbaVPageBreaks_BASE css::uno::Reference< css::sheet::XSheetPageBreak > mxSheetPageBreak; public: - ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, + ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( css::uno::RuntimeException ); virtual ~ScVbaVPageBreaks(); - // XVPageBreaks + // XVPageBreaks virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException ); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException ); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException ); virtual css::uno::Any createCollectionObject( const css::uno::Any& ); // XHelperInterface diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index 57cc3dbbd153..9fc3a5b295d6 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.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 @@ -38,16 +38,16 @@ typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ov::excel::XPageSetup > ScVbaPageSetup_BASE; -class ScVbaPageSetup : public ScVbaPageSetup_BASE +class ScVbaPageSetup : public ScVbaPageSetup_BASE { css::uno::Reference< css::sheet::XSpreadsheet > mxSheet; public: - ScVbaPageSetup( const css::uno::Reference< ov::XHelperInterface >& xParent, + ScVbaPageSetup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSpreadsheet>& xSheet, - const css::uno::Reference< css::frame::XModel >& xModel) throw (css::uno::RuntimeException); + const css::uno::Reference< css::frame::XModel >& xModel) throw (css::uno::RuntimeException); virtual ~ScVbaPageSetup(){} - + // Attribute virtual rtl::OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException); virtual void SAL_CALL setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbapalette.hxx b/sc/source/ui/vba/vbapalette.hxx index 2f5c752e3ebd..a1ec16979c96 100644 --- a/sc/source/ui/vba/vbapalette.hxx +++ b/sc/source/ui/vba/vbapalette.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef SC_VBAPALETTE_HXX #define SC_VBAPALETTE_HXX diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx index e034ffeead41..ee32fc3e5286 100644 --- a/sc/source/ui/vba/vbapane.cxx +++ b/sc/source/ui/vba/vbapane.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "vbapane.hxx" #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> @@ -46,13 +46,13 @@ ScVbaPane::ScVbaPane( { } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaPane::getScrollColumn() throw (uno::RuntimeException) { return ( m_xViewPane->getFirstVisibleColumn() + 1 ); } -void SAL_CALL +void SAL_CALL ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeException) { if( _scrollcolumn < 1 ) @@ -63,13 +63,13 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti m_xViewPane->setFirstVisibleColumn( _scrollcolumn - 1 ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaPane::getScrollRow() throw (uno::RuntimeException) { return ( m_xViewPane->getFirstVisibleRow() + 1 ); } -void SAL_CALL +void SAL_CALL ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException) { if( _scrollrow < 1 ) @@ -94,7 +94,7 @@ ScVbaPane::getVisibleRange() throw (uno::RuntimeException) } //Method -void SAL_CALL +void SAL_CALL ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { rtl::OUString messageBuffer; @@ -137,7 +137,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( messageBuffer.getLength() > 0 ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); - sal_Int32 newStartRow = visibleRange.StartRow + downRows; + sal_Int32 newStartRow = visibleRange.StartRow + downRows; if( newStartRow < 0 ) newStartRow = 0; sal_Int32 newStartCol = visibleRange.StartColumn + rightCols; @@ -147,7 +147,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any m_xViewPane->setFirstVisibleColumn( newStartCol ); } -void SAL_CALL +void SAL_CALL ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { rtl::OUString messageBuffer; @@ -169,7 +169,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any { sal_Int32 up = 0; if( Up >>= up ) - downPages -= up; + downPages -= up; else messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: Up\n" ); } diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx index 27a9c3529545..841776a7d918 100644 --- a/sc/source/ui/vba/vbapane.hxx +++ b/sc/source/ui/vba/vbapane.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/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index cffd07eeb5e1..7d788b1ed321 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.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 @@ -40,18 +40,18 @@ uno::Reference< excel::XPivotCache > ScVbaPivotTable::PivotCache() throw (uno::RuntimeException) { // #FIXME with a quick example failed to determine what the parent - // should be, leaving as null at the moment + // should be, leaving as null at the moment return new ScVbaPivotCache( uno::Reference< XHelperInterface >(), mxContext, m_xTable ); } -rtl::OUString& +rtl::OUString& ScVbaPivotTable::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaPivotTable::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index 5f244a8ef95e..dd7201be6170 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.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 @@ -37,7 +37,7 @@ typedef InheritedHelperInterfaceImpl1< ov::excel::XPivotTable > PivotTableImpl_BASE; class ScVbaPivotTable : public PivotTableImpl_BASE -{ +{ css::uno::Reference< css::sheet::XDataPilotTable > m_xTable; public: ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index b7e090d1a841..3212ac27a1af 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.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,14 +45,14 @@ class PivotTableEnumeration : public EnumerationHelperImpl public: PivotTableEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { return DataPilotToPivotTable( m_xEnumeration->nextElement(), m_xContext ); } }; -ScVbaPivotTables::ScVbaPivotTables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ): ScVbaPivotTables_BASE( xParent, xContext, xIndexAccess ) +ScVbaPivotTables::ScVbaPivotTables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ): ScVbaPivotTables_BASE( xParent, xContext, xIndexAccess ) { } @@ -69,20 +69,20 @@ ScVbaPivotTables::createCollectionObject( const css::uno::Any& aSource ) return DataPilotToPivotTable( aSource, mxContext ); } -uno::Type +uno::Type ScVbaPivotTables::getElementType() throw (uno::RuntimeException) { return excel::XPivotTable::static_type(0); } -rtl::OUString& +rtl::OUString& ScVbaPivotTables::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTables") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> ScVbaPivotTables::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index 4928756e179b..c511f064b229 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.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 @@ -33,7 +33,7 @@ #include <ooo/vba/excel/XPivotTables.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/uno/XComponentContext.hpp> - + #include "excelvbahelper.hxx" #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbacollectionimpl.hxx> @@ -57,8 +57,8 @@ public: // XPivotTables // ScVbaPivotTables_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual rtl::OUString& getServiceImplName(); }; diff --git a/sc/source/ui/vba/vbapropvalue.cxx b/sc/source/ui/vba/vbapropvalue.cxx index 2fdbd16195fe..a850ef44269b 100644 --- a/sc/source/ui/vba/vbapropvalue.cxx +++ b/sc/source/ui/vba/vbapropvalue.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 @@ -28,18 +28,18 @@ #include "vbapropvalue.hxx" using namespace com::sun::star; - + ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListener ) { } -css::uno::Any SAL_CALL +css::uno::Any SAL_CALL ScVbaPropValue::getValue() throw (css::uno::RuntimeException) { return m_pListener->getValueEvent(); } -void SAL_CALL +void SAL_CALL ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException) { m_pListener->setValueEvent( _value ); diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx index 289870e5b520..51608e8642ed 100644 --- a/sc/source/ui/vba/vbapropvalue.hxx +++ b/sc/source/ui/vba/vbapropvalue.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 @@ -34,15 +34,15 @@ typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE; -class PropListener +class PropListener { public: virtual void setValueEvent( const css::uno::Any& value ) = 0; - virtual css::uno::Any getValueEvent() = 0; + virtual css::uno::Any getValueEvent() = 0; }; -class ScVbaPropValue : public PropValueImpl_BASE +class ScVbaPropValue : public PropValueImpl_BASE { PropListener* m_pListener; public: diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 46c60ac35e50..059d85502f3e 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -71,7 +71,7 @@ class ArrayVisitor { public: virtual void visitNode( sal_Int32 x, sal_Int32 y, const css::uno::Reference< css::table::XCell >& xCell ) = 0; - virtual ~ArrayVisitor(){} + virtual ~ArrayVisitor(){} }; class ValueSetter : public ArrayVisitor @@ -209,7 +209,7 @@ public: virtual void SAL_CALL FillRight() throw (css::uno::RuntimeException); virtual void SAL_CALL FillUp() throw (css::uno::RuntimeException); virtual void SAL_CALL FillDown() throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset ) + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbaseriescollection.cxx b/sc/source/ui/vba/vbaseriescollection.cxx index 1ccb7bda8f7f..794f91137092 100644 --- a/sc/source/ui/vba/vbaseriescollection.cxx +++ b/sc/source/ui/vba/vbaseriescollection.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 @@ -33,7 +33,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -ScVbaSeriesCollection::ScVbaSeriesCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : SeriesCollection_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ) +ScVbaSeriesCollection::ScVbaSeriesCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : SeriesCollection_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ) { } @@ -48,26 +48,26 @@ ScVbaSeriesCollection::createEnumeration() throw (uno::RuntimeException) // XElementAccess -uno::Type +uno::Type ScVbaSeriesCollection::getElementType() throw (uno::RuntimeException) { return excel::XSeries::static_type(0); } -uno::Any +uno::Any ScVbaSeriesCollection::createCollectionObject( const css::uno::Any& rSource ) { return rSource; } -rtl::OUString& +rtl::OUString& ScVbaSeriesCollection::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSeriesCollection") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> ScVbaSeriesCollection::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sc/source/ui/vba/vbaseriescollection.hxx b/sc/source/ui/vba/vbaseriescollection.hxx index 1b1d59e6157d..ddffda7ac375 100644 --- a/sc/source/ui/vba/vbaseriescollection.hxx +++ b/sc/source/ui/vba/vbaseriescollection.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 @@ -37,7 +37,7 @@ typedef CollTestImplHelper< ov::excel::XSeriesCollection > SeriesCollection_BASE; class ScVbaSeriesCollection : public SeriesCollection_BASE -{ +{ css::uno::Reference< css::uno::XComponentContext > m_xContext; public: @@ -47,7 +47,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SeriesCollection_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 652c8e4f87b1..dc6c0e26a9ad 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.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 @@ -486,7 +486,7 @@ sal_Int32 SAL_CALL ScVbaButton::getOrientation() throw (uno::RuntimeException) // not supported return excel::XlOrientation::xlHorizontal; } - + void SAL_CALL ScVbaButton::setOrientation( sal_Int32 /*nOrientation*/ ) throw (uno::RuntimeException) { // not supported diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 245320e5be3b..928c9006e757 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.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 @@ -170,7 +170,7 @@ public: protected: sal_Int32 getModelIndexInForm() const throw (css::uno::RuntimeException); - + protected: css::uno::Reference< css::container::XIndexContainer > mxFormIC; css::uno::Reference< css::beans::XPropertySet > mxControlProps; @@ -207,7 +207,7 @@ public: // XButton methods css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters( const css::uno::Any& rStart, const css::uno::Any& rLength ) throw (css::uno::RuntimeException); - + // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 3847209989f9..b05aa82722b8 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.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 @@ -376,7 +376,7 @@ public: protected: uno::Reference< container::XIndexContainer > createForm() throw (uno::RuntimeException); - + virtual bool implPickShape( const uno::Reference< drawing::XShape >& rxShape ) const; virtual OUString implGetShapeServiceName() const; virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const; diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index 2a68d2251ad4..c59ec8882e91 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.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 @@ -59,7 +59,7 @@ public: /** Updates the collection by fetching all shapes from the draw page. */ void collectShapes() throw (css::uno::RuntimeException); - + // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 83d72dd99c05..2594effca2e0 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.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 @@ -36,7 +36,7 @@ static rtl::OUString DISPLAYNAME( RTL_CONSTASCII_USTRINGPARAM("DisplayName") ); -uno::Reference< container::XNameAccess > +uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW); @@ -44,26 +44,26 @@ ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xMode return xStylesAccess; } -uno::Reference< beans::XPropertySet > +uno::Reference< beans::XPropertySet > lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) { - - uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW ); + + uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW ); return xStyleProps; } void ScVbaStyle::initialise() throw ( uno::RuntimeException ) { - if (!mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved")) ); + if (!mxModel.is() ) + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved")) ); uno::Reference< lang::XServiceInfo > xServiceInfo( mxPropertySet, uno::UNO_QUERY_THROW ); if ( !xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CellStyle" ) ) ) ) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); } mxStyle.set( mxPropertySet, uno::UNO_QUERY_THROW ); - + uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxModel, uno::UNO_QUERY_THROW ); mxStyleFamilyNameContainer.set( ScVbaStyle::getStylesNameContainer( mxModel ), uno::UNO_QUERY_THROW ); @@ -94,25 +94,25 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException) { return !mxStyle->isUserDefined(); } -void SAL_CALL +void SAL_CALL ScVbaStyle::setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException) { mxStyle->setName(Name); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaStyle::getName() throw (script::BasicErrorException, uno::RuntimeException) { return mxStyle->getName(); } -void SAL_CALL +void SAL_CALL ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException) { try @@ -125,7 +125,7 @@ ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::Basi } } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeException) { rtl::OUString sName; @@ -140,7 +140,7 @@ ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeExcep return sName; } -void SAL_CALL +void SAL_CALL ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException) { try @@ -153,13 +153,13 @@ ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException) } } -void SAL_CALL +void SAL_CALL ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) throw (script::BasicErrorException, uno::RuntimeException) { DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeException) { DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index f98ecac1a163..c965146a1703 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.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 @@ -83,12 +83,12 @@ public: virtual void SAL_CALL setLocked( const css::uno::Any& Locked ) throw (css::script::BasicErrorException, css::uno::RuntimeException);; virtual css::uno::Any SAL_CALL getLocked( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);; virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ) throw (css::script::BasicErrorException, css::uno::RuntimeException);; -/ virtual css::uno::Any SAL_CALL getFormulaHidden( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);; +/ virtual css::uno::Any SAL_CALL getFormulaHidden( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);; virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; - virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; + virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException);; virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);; -*/ +*/ // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index b07d98e81b80..1ffc2af27997 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.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 @@ -37,7 +37,7 @@ css::uno::Any lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) { uno::Reference< beans::XPropertySet > xStyleProps( aObject, uno::UNO_QUERY_THROW ); - uno::Reference< excel::XStyle > xStyle( new ScVbaStyle( xParent, xContext, xStyleProps, xModel ) ); + uno::Reference< excel::XStyle > xStyle( new ScVbaStyle( xParent, xContext, xStyleProps, xModel ) ); return uno::makeAny( xStyle ); } @@ -45,30 +45,30 @@ lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Referenc ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent ) { try - { + { mxMSF.set( mxModel, uno::UNO_QUERY_THROW ); mxNameContainerCellStyles.set( m_xNameAccess, uno::UNO_QUERY_THROW ); } - catch (uno::Exception& ) + catch (uno::Exception& ) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); } } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaStyles::getStyleNames() throw ( uno::RuntimeException ) { return mxNameContainerCellStyles->getElementNames(); } -uno::Any +uno::Any ScVbaStyles::createCollectionObject(const uno::Any& aObject) { return lcl_createAPIStyleToVBAObject( aObject, mxParent, mxContext, mxModel ); } -uno::Type SAL_CALL +uno::Type SAL_CALL ScVbaStyles::getElementType() throw (uno::RuntimeException) { return excel::XStyle::static_type(0); @@ -96,13 +96,13 @@ public: } }; -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL ScVbaStyles::createEnumeration() throw (uno::RuntimeException) { return new EnumWrapper( m_xIndexAccess, mxParent, mxContext, mxModel ); } -uno::Reference< excel::XStyle > SAL_CALL +uno::Reference< excel::XStyle > SAL_CALL ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< excel::XStyle > aRet; @@ -149,7 +149,7 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr return aRet; } -void +void ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorException ) { try diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index 821233f75ea0..b9677954463f 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.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 @@ -35,7 +35,7 @@ typedef CollTestImplHelper< ov::excel::XStyles > ScVbaStyles_BASE; class ScVbaStyles: public ScVbaStyles_BASE { css::uno::Reference< css::frame::XModel > mxModel; - // hard ref to parent ( perhaps we should try this in the + // hard ref to parent ( perhaps we should try this in the // XHelperInterface itself css::uno::Reference< ov::XHelperInterface > mxParent; css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF; @@ -48,13 +48,13 @@ public: virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const ::rtl::OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx index b5502fac9aa8..558d33111cd4 100644 --- a/sc/source/ui/vba/vbatextboxshape.cxx +++ b/sc/source/ui/vba/vbatextboxshape.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 @@ -40,19 +40,19 @@ ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentConte m_xModel.set( xModel ); } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaTextBoxShape::getText() throw (css::uno::RuntimeException) { return m_xTextRange->getString(); } -void SAL_CALL +void SAL_CALL ScVbaTextBoxShape::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException) { m_xTextRange->setString( _text ); } -uno::Reference< excel::XCharacters > SAL_CALL +uno::Reference< excel::XCharacters > SAL_CALL ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException) { ScDocShell* pDocShell = excel::getDocShell( m_xModel ); diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx index 02298cd767eb..0947bea6868c 100644 --- a/sc/source/ui/vba/vbatextboxshape.hxx +++ b/sc/source/ui/vba/vbatextboxshape.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 @@ -42,7 +42,7 @@ class ScVbaTextBoxShape : public TextBoxShapeImpl_BASE css::uno::Reference< css::frame::XModel > m_xModel; public: ScVbaTextBoxShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); - + // Attributes virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index dffbed8b511f..c00af2d94775 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.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 @@ -39,7 +39,7 @@ ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Refe } // Methods -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaTextFrame::Characters() throw (uno::RuntimeException) { uno::Reference< text::XSimpleText > xSimpleText( m_xShape, uno::UNO_QUERY_THROW ); @@ -68,7 +68,7 @@ ScVbaTextFrame::getServiceNames() return aServiceNames; } -namespace textframe +namespace textframe { namespace sdecl = comphelper::service_decl; sdecl::vba_service_class_<ScVbaTextFrame, sdecl::with_args<true> > serviceImpl; diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index e45af4e1c2be..7e2b6b81ee88 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.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/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index 1d89ea01e6d3..5e1594b8786c 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.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 @@ -45,7 +45,7 @@ class TitleImpl : public InheritedHelperInterfaceImpl< Ifc1 > { typedef InheritedHelperInterfaceImpl< Ifc1 > BaseClass; -protected: +protected: css::uno::Reference< css::drawing::XShape > xTitleShape; css::uno::Reference< css::beans::XPropertySet > xShapePropertySet; std::auto_ptr<ov::ShapeHelper> oShapeHelper; @@ -101,7 +101,7 @@ public: // #FIXME #TODO the helperapi Characters implementation doesn't // seem to do very much, need to know how the existing Characters // impl ( that we use for Range ) can be reused - return css::uno::Reference< ov::excel::XCharacters > (); + return css::uno::Reference< ov::excel::XCharacters > (); } void SAL_CALL setTop( double Top ) throw (css::script::BasicErrorException, css::uno::RuntimeException) @@ -141,9 +141,9 @@ public: catch (css::uno::Exception& ) { throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); - } + } return static_cast< sal_Int32 >(nSOOrientation / 100) ; - } + } // XHelperInterface rtl::OUString& getServiceImplName() { diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 36662c87c598..229e8f41c5cd 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.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 @@ -68,7 +68,7 @@ lcl_getValidationProps( const uno::Reference< table::XCellRange >& xRange ) return xValProps; } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); @@ -77,74 +77,74 @@ ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException) return bBlank; } -void SAL_CALL +void SAL_CALL ScVbaValidation::setIgnoreBlank( ::sal_Bool _ignoreblank ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); - xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( _ignoreblank ) ); - lcl_setValidationProps( m_xRange, xProps ); + xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( _ignoreblank ) ); + lcl_setValidationProps( m_xRange, xProps ); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); sal_Int32 nShowList = 0; - xProps->getPropertyValue( SHOWLIST ) >>= nShowList; + xProps->getPropertyValue( SHOWLIST ) >>= nShowList; return ( nShowList ? sal_True : sal_False ); } -void SAL_CALL +void SAL_CALL ScVbaValidation::setInCellDropdown( ::sal_Bool _incelldropdown ) throw (uno::RuntimeException) { sal_Int32 nDropDown = sal_False; if ( _incelldropdown ) nDropDown = 1; uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps(m_xRange) ); - xProps->setPropertyValue( SHOWLIST, uno::makeAny( nDropDown ) ); + xProps->setPropertyValue( SHOWLIST, uno::makeAny( nDropDown ) ); lcl_setValidationProps( m_xRange, xProps ); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaValidation::getShowInput() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); sal_Bool bShowInput = sal_False; - xProps->getPropertyValue( SHOWINPUT ) >>= bShowInput; + xProps->getPropertyValue( SHOWINPUT ) >>= bShowInput; return bShowInput; } -void SAL_CALL +void SAL_CALL ScVbaValidation:: setShowInput( ::sal_Bool _showinput ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps(m_xRange) ); - xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( _showinput ) ); + xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( _showinput ) ); lcl_setValidationProps( m_xRange, xProps ); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaValidation::getShowError() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); sal_Bool bShowError = sal_False; - xProps->getPropertyValue( SHOWERROR ) >>= bShowError; + xProps->getPropertyValue( SHOWERROR ) >>= bShowError; return bShowError; } -void SAL_CALL +void SAL_CALL ScVbaValidation::setShowError( ::sal_Bool _showerror ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); - xProps->setPropertyValue( SHOWERROR, uno::makeAny( _showerror ) ); + xProps->setPropertyValue( SHOWERROR, uno::makeAny( _showerror ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaValidation::getErrorTitle() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); rtl::OUString sErrorTitle; - xProps->getPropertyValue( ERRORTITLE ) >>= sErrorTitle; + xProps->getPropertyValue( ERRORTITLE ) >>= sErrorTitle; return sErrorTitle; } @@ -152,63 +152,63 @@ void ScVbaValidation::setErrorTitle( const rtl::OUString& _errormessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); - xProps->setPropertyValue( ERRORTITLE, uno::makeAny( _errormessage ) ); + xProps->setPropertyValue( ERRORTITLE, uno::makeAny( _errormessage ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaValidation::getInputMessage() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); rtl::OUString sMsg; - xProps->getPropertyValue( INPUTMESS ) >>= sMsg; + xProps->getPropertyValue( INPUTMESS ) >>= sMsg; return sMsg; } -void SAL_CALL +void SAL_CALL ScVbaValidation::setInputMessage( const ::rtl::OUString& _inputmessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); - xProps->setPropertyValue( INPUTMESS, uno::makeAny( _inputmessage ) ); + xProps->setPropertyValue( INPUTMESS, uno::makeAny( _inputmessage ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaValidation::getInputTitle() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); rtl::OUString sString; - xProps->getPropertyValue( INPUTTITLE ) >>= sString; + xProps->getPropertyValue( INPUTTITLE ) >>= sString; return sString; } -void SAL_CALL +void SAL_CALL ScVbaValidation::setInputTitle( const ::rtl::OUString& _inputtitle ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); - xProps->setPropertyValue( INPUTTITLE, uno::makeAny( _inputtitle ) ); + xProps->setPropertyValue( INPUTTITLE, uno::makeAny( _inputtitle ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaValidation::getErrorMessage() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); rtl::OUString sString; - xProps->getPropertyValue( ERRORMESS ) >>= sString; + xProps->getPropertyValue( ERRORMESS ) >>= sString; return sString; } -void SAL_CALL +void SAL_CALL ScVbaValidation::setErrorMessage( const ::rtl::OUString& _errormessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); - xProps->setPropertyValue( ERRORMESS, uno::makeAny( _errormessage ) ); + xProps->setPropertyValue( ERRORMESS, uno::makeAny( _errormessage ) ); lcl_setValidationProps( m_xRange, xProps ); } -void SAL_CALL +void SAL_CALL ScVbaValidation::Delete( ) throw (uno::RuntimeException) { rtl::OUString sBlank; @@ -220,7 +220,7 @@ ScVbaValidation::Delete( ) throw (uno::RuntimeException) xProps->setPropertyValue( ERRORTITLE, uno::makeAny( sBlank ) ); xProps->setPropertyValue( INPUTMESS, uno::makeAny( sBlank) ); xProps->setPropertyValue( ALERTSTYLE, uno::makeAny( sheet::ValidationAlertStyle_STOP) ); - xProps->setPropertyValue( STYPE, uno::makeAny( sheet::ValidationType_ANY ) ); + xProps->setPropertyValue( STYPE, uno::makeAny( sheet::ValidationType_ANY ) ); xCond->setFormula1( sBlank ); xCond->setFormula2( sBlank ); xCond->setOperator( sheet::ConditionOperator_NONE ); @@ -229,12 +229,12 @@ ScVbaValidation::Delete( ) throw (uno::RuntimeException) } // Fix the defect that validatation cannot work when the input should be limited between a lower bound and an upper bound -void SAL_CALL +void SAL_CALL ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const uno::Any& Operator, const uno::Any& Formula1, const uno::Any& Formula2 ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); uno::Reference< sheet::XSheetCondition > xCond( xProps, uno::UNO_QUERY_THROW ); - + sheet::ValidationType nValType = sheet::ValidationType_ANY; xProps->getPropertyValue( STYPE ) >>= nValType; if ( nValType != sheet::ValidationType_ANY ) @@ -243,7 +243,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un if ( !Type.hasValue() || !( Type >>= nType ) ) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "missing required param" ) ), uno::Reference< uno::XInterface >() ); - Delete(); // set up defaults + Delete(); // set up defaults rtl::OUString sFormula1; Formula1 >>= sFormula1; rtl::OUString sFormula2; @@ -252,25 +252,25 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un { case excel::XlDVType::xlValidateList: { - // for validate list + // for validate list // at least formula1 is required if ( !Formula1.hasValue() ) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "missing param" ) ), uno::Reference< uno::XInterface >() ); nValType = sheet::ValidationType_LIST; - xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); + xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); // #TODO validate required params // #TODO need to correct the ';' delimited formula on get/set break; } case excel::XlDVType::xlValidateWholeNumber: nValType = sheet::ValidationType_WHOLE; - xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); - break; + xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); + break; default: throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unsupported operation..." ) ), uno::Reference< uno::XInterface >() ); } - sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP; + sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP; sal_Int32 nVbaAlertStyle = excel::XlDVAlertStyle::xlValidAlertStop; if ( AlertStyle.hasValue() && ( AlertStyle >>= nVbaAlertStyle ) ) { @@ -279,18 +279,18 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un case excel::XlDVAlertStyle::xlValidAlertStop: // yes I know it's already defaulted but safer to assume // someone propbably could change the code above - eStyle = sheet::ValidationAlertStyle_STOP; - break; + eStyle = sheet::ValidationAlertStyle_STOP; + break; case excel::XlDVAlertStyle::xlValidAlertWarning: - eStyle = sheet::ValidationAlertStyle_WARNING; - break; + eStyle = sheet::ValidationAlertStyle_WARNING; + break; case excel::XlDVAlertStyle::xlValidAlertInformation: - eStyle = sheet::ValidationAlertStyle_INFO; - break; + eStyle = sheet::ValidationAlertStyle_INFO; + break; default: throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bad param..." ) ), uno::Reference< uno::XInterface >() ); - } + } } xProps->setPropertyValue( ALERTSTYLE, uno::makeAny( eStyle ) ); @@ -306,32 +306,32 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un xCond->setFormula1( sFormula1 ); if ( sFormula2.getLength() ) xCond->setFormula2( sFormula2 ); - - lcl_setValidationProps( m_xRange, xProps ); + + lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaValidation::getFormula1() throw (uno::RuntimeException) { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); return xCond->getFormula1(); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaValidation::getFormula2() throw (uno::RuntimeException) { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); return xCond->getFormula2(); } -rtl::OUString& +rtl::OUString& ScVbaValidation::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaValidation") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaValidation::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index 1ac0f3e35858..6ede46176544 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.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 @@ -36,9 +36,9 @@ typedef InheritedHelperInterfaceImpl1<ov::excel::XValidation > ValidationImpl_BASE; class ScVbaValidation : public ValidationImpl_BASE -{ +{ css::uno::Reference< css::table::XCellRange > m_xRange; - + public: ScVbaValidation( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange ) : ValidationImpl_BASE( xParent, xContext ), m_xRange( xRange) {} // Attributes @@ -69,6 +69,6 @@ public: }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index a31d348ff7c8..625666b236b9 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.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 @@ typedef ::cppu::WeakImplHelper1< container::XEnumeration > Enumeration_BASE; -typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess +typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess , com::sun::star::container::XIndexAccess , com::sun::star::container::XNameAccess > SelectedSheets_BASE; @@ -85,12 +85,12 @@ public: m_it = m_sheets.begin(); } // XEnumeration - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) + { return m_it != m_sheets.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { if ( !hasMoreElements() ) { throw container::NoSuchElementException(); @@ -107,7 +107,7 @@ class SelectedSheetsEnumAccess : public SelectedSheets_BASE uno::Reference< uno::XComponentContext > m_xContext; NameIndexHash namesToIndices; Sheets sheets; - uno::Reference< frame::XModel > m_xModel; + uno::Reference< frame::XModel > m_xModel; public: SelectedSheetsEnumAccess( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ):m_xContext( xContext ), m_xModel( xModel ) { @@ -120,7 +120,7 @@ public: ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( !pViewShell ) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() ); - + SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); uno::Sequence<sal_Int32> aSheets( nTabCount ); SCTAB nIndex = 0; @@ -140,60 +140,60 @@ public: } } - + //XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException) { - return new SelectedSheetsEnum( m_xContext, sheets, m_xModel ); + return new SelectedSheetsEnum( m_xContext, sheets, m_xModel ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) - { + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) + { return sheets.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + { if ( Index < 0 - || static_cast< Sheets::size_type >( Index ) >= sheets.size() ) + || static_cast< Sheets::size_type >( Index ) >= sheets.size() ) throw lang::IndexOutOfBoundsException(); - + return uno::makeAny( sheets[ Index ] ); } //XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) - { - return excel::XWorksheet::static_type(0); + { + return excel::XWorksheet::static_type(0); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) + { return (sheets.size() > 0); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) throw container::NoSuchElementException(); return uno::makeAny( sheets[ it->second ] ); - + } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) - { + virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + { uno::Sequence< ::rtl::OUString > names( namesToIndices.size() ); ::rtl::OUString* pString = names.getArray(); NameIndexHash::const_iterator it = namesToIndices.begin(); NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) - *pString = it->first; - return names; + *pString = it->first; + return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); } @@ -239,19 +239,19 @@ ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& T m_xPane->SmallScroll( Down, Up, ToRight, ToLeft ); } -void SAL_CALL +void SAL_CALL ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { Scroll( Down, Up, ToRight, ToLeft ); } -void SAL_CALL +void SAL_CALL ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { Scroll( Down, Up, ToRight, ToLeft, true ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< container::XEnumerationAccess > xEnumAccess( new SelectedSheetsEnumAccess( mxContext, m_xModel ) ); @@ -260,12 +260,12 @@ ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeExcepti if ( aIndex.hasValue() ) { uno::Reference< XCollection > xColl( xSheets, uno::UNO_QUERY_THROW ); - return xColl->Item( aIndex, uno::Any() ); + return xColl->Item( aIndex, uno::Any() ); } - return uno::makeAny( xSheets ); + return uno::makeAny( xSheets ); } -void SAL_CALL +void SAL_CALL ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*Position*/ ) throw (uno::RuntimeException) { // #TODO #FIXME need some implementation to scroll through the tabs @@ -273,7 +273,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P /* sal_Int32 nSheets = 0; sal_Int32 nPosition = 0; - throw uno::RuntimeException( rtl::OUString::createFromAscii("No Implemented" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString::createFromAscii("No Implemented" ), uno::Reference< uno::XInterface >() ); sal_Bool bSheets = ( Sheets >>= nSheets ); sal_Bool bPosition = ( Position >>= nPosition ); if ( bSheets || bPosition ) // at least one param specified @@ -290,12 +290,12 @@ getPropsFromModel( const uno::Reference< frame::XModel >& xModel ) uno::Reference< frame::XController > xController = xModel->getCurrentController(); if ( !xController.is() ) throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM ("No controller for model") ), uno::Reference< uno::XInterface >() ); + RTL_CONSTASCII_USTRINGPARAM ("No controller for model") ), uno::Reference< uno::XInterface >() ); return uno::Reference< beans::XPropertySet >( xController->getFrame(), uno::UNO_QUERY ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaWindow::getCaption() throw (uno::RuntimeException) { static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) ); @@ -303,8 +303,8 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) uno::Reference< beans::XPropertySet > xProps = getPropsFromModel( m_xModel ); rtl::OUString sTitle; - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; - sal_Int32 nCrudIndex = sTitle.indexOf( sCrud ); + xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; + sal_Int32 nCrudIndex = sTitle.indexOf( sCrud ); // adjust title ( by removing crud ) // sCrud string present if ( nCrudIndex != -1 ) @@ -319,8 +319,8 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) // is like XL // if the adjusted title == workbook name, use name // if the adjusted title != workbook name but ... - // name == title + extension ( .csv, ,odt, .xls ) - // etc. then also use the name + // name == title + extension ( .csv, ,odt, .xls ) + // etc. then also use the name if ( !sTitle.equals( sName ) ) { @@ -332,40 +332,40 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) sTitle = sName; } } - } + } return uno::makeAny( sTitle ); } -void SAL_CALL +void SAL_CALL ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException) { - + uno::Reference< beans::XPropertySet > xProps = getPropsFromModel( m_xModel ); xProps->setPropertyValue( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) , _caption ); + RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) , _caption ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaWindow::getScrollRow() throw (uno::RuntimeException) -{ +{ sal_Int32 nValue = 0; - ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( pViewShell ) { ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart(); nValue = pViewShell->GetViewData()->GetPosY(WhichV(eWhich)); } - + return uno::makeAny( nValue + 1); } -void SAL_CALL +void SAL_CALL ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException) { - ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( pViewShell ) { - sal_Int32 scrollRow = 0; + sal_Int32 scrollRow = 0; _scrollrow >>= scrollRow; ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart(); sal_Int32 nOldValue = pViewShell->GetViewData()->GetPosY(WhichV(eWhich)) + 1; @@ -373,27 +373,27 @@ ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeExcep } } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaWindow::getScrollColumn() throw (uno::RuntimeException) -{ +{ sal_Int32 nValue = 0; - ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( pViewShell ) { ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart(); nValue = pViewShell->GetViewData()->GetPosX(WhichH(eWhich)); } - + return uno::makeAny( nValue + 1); } -void SAL_CALL +void SAL_CALL ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException) { - ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( pViewShell ) { - sal_Int32 scrollColumn = 0; + sal_Int32 scrollColumn = 0; _scrollcolumn >>= scrollColumn; ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart(); sal_Int32 nOldValue = pViewShell->GetViewData()->GetPosX(WhichH(eWhich)) + 1; @@ -401,11 +401,11 @@ ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::Runtim } } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaWindow::getWindowState() throw (uno::RuntimeException) -{ +{ sal_Int32 nwindowState = xlNormal; - ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame(); WorkWindow* pWork = (WorkWindow*) pViewFrame->GetFrame().GetSystemWindow(); if ( pWork ) @@ -418,12 +418,12 @@ ScVbaWindow::getWindowState() throw (uno::RuntimeException) return uno::makeAny( nwindowState ); } -void SAL_CALL +void SAL_CALL ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeException) { sal_Int32 nwindowState = xlMaximized; _windowstate >>= nwindowState; - ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame(); WorkWindow* pWork = (WorkWindow*) pViewFrame->GetFrame().GetSystemWindow(); if ( pWork ) @@ -455,19 +455,19 @@ ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const } uno::Reference< excel::XPane > SAL_CALL -ScVbaWindow::ActivePane() throw (script::BasicErrorException, uno::RuntimeException) -{ +ScVbaWindow::ActivePane() throw (script::BasicErrorException, uno::RuntimeException) +{ return new ScVbaPane( this, mxContext, m_xModel, m_xViewPane ); } -uno::Reference< excel::XRange > SAL_CALL +uno::Reference< excel::XRange > SAL_CALL ScVbaWindow::ActiveCell( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); return xApplication->getActiveCell(); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaWindow::Selection( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); @@ -489,11 +489,11 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); sal_Bool bGrid = sal_True; xProps->getPropertyValue( sName ) >>= bGrid; - return bGrid; + return bGrid; } -void SAL_CALL +void SAL_CALL ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -501,17 +501,17 @@ ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::Run xProps->setPropertyValue( sName, uno::makeAny( _displaygridlines )); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); sal_Bool bHeading = sal_True; xProps->getPropertyValue( sName ) >>= bHeading; - return bHeading; + return bHeading; } -void SAL_CALL +void SAL_CALL ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -519,17 +519,17 @@ ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::Runt xProps->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings )); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); sal_Bool bHorizontalScrollBar = sal_True; xProps->getPropertyValue( sName ) >>= bHorizontalScrollBar; - return bHorizontalScrollBar; + return bHorizontalScrollBar; } -void SAL_CALL +void SAL_CALL ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -537,17 +537,17 @@ ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScroll xProps->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar )); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); sal_Bool bOutline = sal_True; xProps->getPropertyValue( sName ) >>= bOutline; - return bOutline; + return bOutline; } -void SAL_CALL +void SAL_CALL ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -555,17 +555,17 @@ ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::Runtim xProps->setPropertyValue( sName, uno::makeAny( _bDisplayOutline )); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); sal_Bool bVerticalScrollBar = sal_True; xProps->getPropertyValue( sName ) >>= bVerticalScrollBar; - return bVerticalScrollBar; + return bVerticalScrollBar; } -void SAL_CALL +void SAL_CALL ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -573,17 +573,17 @@ ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar xProps->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar )); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); sal_Bool bWorkbookTabs = sal_True; xProps->getPropertyValue( sName ) >>= bWorkbookTabs; - return bWorkbookTabs; + return bWorkbookTabs; } -void SAL_CALL +void SAL_CALL ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -591,13 +591,13 @@ ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (u xProps->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs )); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaWindow::getFreezePanes() throw (uno::RuntimeException) { - return m_xViewFreezable->hasFrozenPanes(); + return m_xViewFreezable->hasFrozenPanes(); } -void SAL_CALL +void SAL_CALL ScVbaWindow::setFreezePanes( ::sal_Bool /*_bFreezePanes*/ ) throw (uno::RuntimeException) { if( m_xViewSplitable->getIsWindowSplit() ) @@ -609,21 +609,21 @@ ScVbaWindow::setFreezePanes( ::sal_Bool /*_bFreezePanes*/ ) throw (uno::RuntimeE } else { - // otherwise we freeze in the center of the visible sheet + // otherwise we freeze in the center of the visible sheet table::CellRangeAddress aCellRangeAddress = m_xViewPane->getVisibleRange(); sal_Int32 nColumn = aCellRangeAddress.StartColumn + (( aCellRangeAddress.EndColumn - aCellRangeAddress.StartColumn )/2 ); sal_Int32 nRow = aCellRangeAddress.StartRow + (( aCellRangeAddress.EndRow - aCellRangeAddress.StartRow )/2 ); - m_xViewFreezable->freezeAtPosition( nColumn, nRow ); + m_xViewFreezable->freezeAtPosition( nColumn, nRow ); } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaWindow::getSplit() throw (uno::RuntimeException) { - return m_xViewSplitable->getIsWindowSplit(); + return m_xViewSplitable->getIsWindowSplit(); } -void SAL_CALL +void SAL_CALL ScVbaWindow::setSplit( ::sal_Bool _bSplit ) throw (uno::RuntimeException) { if( !_bSplit ) @@ -640,13 +640,13 @@ ScVbaWindow::setSplit( ::sal_Bool _bSplit ) throw (uno::RuntimeException) } } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaWindow::getSplitColumn() throw (uno::RuntimeException) { - return m_xViewSplitable->getSplitColumn(); + return m_xViewSplitable->getSplitColumn(); } -void SAL_CALL +void SAL_CALL ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeException) { if( getSplitColumn() != _splitcolumn ) @@ -658,7 +658,7 @@ ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeExcepti } } -double SAL_CALL +double SAL_CALL ScVbaWindow::getSplitHorizontal() throw (uno::RuntimeException) { double fSplitHorizontal = m_xViewSplitable->getSplitHorizontal(); @@ -666,21 +666,21 @@ ScVbaWindow::getSplitHorizontal() throw (uno::RuntimeException) return fHoriPoints; } -void SAL_CALL +void SAL_CALL ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeException) { double fHoriPixels = PointsToPixels( m_xDevice, _splithorizontal, sal_True ); - m_xViewSplitable->splitAtPosition( static_cast<sal_Int32>( fHoriPixels ), 0 ); + m_xViewSplitable->splitAtPosition( static_cast<sal_Int32>( fHoriPixels ), 0 ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaWindow::getSplitRow() throw (uno::RuntimeException) { sal_Int32 nValue = m_xViewSplitable->getSplitRow(); - return nValue ? nValue - 1 : nValue; + return nValue ? nValue - 1 : nValue; } -void SAL_CALL +void SAL_CALL ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException) { if( getSplitRow() != _splitrow ) @@ -692,15 +692,15 @@ ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException) } } -double SAL_CALL +double SAL_CALL ScVbaWindow::getSplitVertical() throw (uno::RuntimeException) { double fSplitVertical = m_xViewSplitable->getSplitVertical(); - double fVertiPoints = PixelsToPoints( m_xDevice, fSplitVertical, sal_False ); + double fVertiPoints = PixelsToPoints( m_xDevice, fSplitVertical, sal_False ); return fVertiPoints; } -void SAL_CALL +void SAL_CALL ScVbaWindow::setSplitVertical(double _splitvertical ) throw (uno::RuntimeException) { double fVertiPixels = PointsToPixels( m_xDevice, _splitvertical, sal_False ); @@ -718,9 +718,9 @@ void ScVbaWindow::SplitAtDefinedPosition(sal_Bool _bUnFreezePane) m_xViewSplitable->splitAtPosition(nHoriSplit, nVertSplit); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaWindow::getZoom() throw (uno::RuntimeException) -{ +{ uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) ); sal_Int16 nZoomType = view::DocumentZoomType::PAGE_WIDTH; @@ -739,7 +739,7 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException) return uno::Any(); } -void SAL_CALL +void SAL_CALL ScVbaWindow::setZoom( const uno::Any& _zoom ) throw (uno::RuntimeException) { sal_Int16 nZoom = 100; @@ -754,7 +754,7 @@ ScVbaWindow::setZoom( const uno::Any& _zoom ) throw (uno::RuntimeException) excel::implSetZoom( m_xModel, nZoom, vTabs ); } -uno::Reference< excel::XWorksheet > SAL_CALL +uno::Reference< excel::XWorksheet > SAL_CALL ScVbaWindow::ActiveSheet( ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); @@ -764,9 +764,9 @@ ScVbaWindow::ActiveSheet( ) throw (script::BasicErrorException, uno::RuntimeExc uno::Any SAL_CALL ScVbaWindow::getView() throw (uno::RuntimeException) { - // not supported now - sal_Int32 nWindowView = excel::XlWindowView::xlNormalView; - return uno::makeAny( nWindowView ); + // not supported now + sal_Int32 nWindowView = excel::XlWindowView::xlNormalView; + return uno::makeAny( nWindowView ); } void SAL_CALL @@ -808,7 +808,7 @@ ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicE return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException) { sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points ); @@ -816,28 +816,28 @@ ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicE return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters ); } -void SAL_CALL +void SAL_CALL ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { - // need test, print current active sheet + // need test, print current active sheet PrintOutHelper( excel::getBestViewShell( m_xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True ); } -void SAL_CALL +void SAL_CALL ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { - // need test, print preview current active sheet - PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) ); + // need test, print preview current active sheet + PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) ); } -rtl::OUString& +rtl::OUString& ScVbaWindow::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWindow") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaWindow::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index b21e5a42b9c1..7daf0ba54c63 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.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 @@ -45,8 +45,8 @@ typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::excel::XWindow > WindowImpl_BASE; class ScVbaWindow : public WindowImpl_BASE -{ -private: +{ +private: css::uno::Reference< css::sheet::XViewPane > m_xViewPane; css::uno::Reference< css::sheet::XViewFreezable > m_xViewFreezable; css::uno::Reference< css::sheet::XViewSplitable > m_xViewSplitable; @@ -55,16 +55,16 @@ private: void init(); protected: void SplitAtDefinedPosition(sal_Bool _bUnFreezePane); -public: - void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll = false ) throw (css::uno::RuntimeException); +public: + void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll = false ) throw (css::uno::RuntimeException); public: ScVbaWindow( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ); ScVbaWindow( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ); // XWindow - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getCaption() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getDisplayGridlines() throw (css::uno::RuntimeException); @@ -106,7 +106,7 @@ public: // Methods virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException); virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) throw (css::uno::RuntimeException); virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException); virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) throw (css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index f7a3e6acb589..1456c71af12c 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.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 @@ -195,11 +195,11 @@ public: NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) *pString = it->first; - return names; + return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); } @@ -207,7 +207,7 @@ public: }; -ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ): ScVbaWindows_BASE( xParent, xContext, xIndexAccess ) +ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ): ScVbaWindows_BASE( xParent, xContext, xIndexAccess ) { } @@ -226,28 +226,28 @@ ScVbaWindows::createCollectionObject( const css::uno::Any& aSource ) return ComponentToWindow( aSource, mxContext, Application() ); } -uno::Type +uno::Type ScVbaWindows::getElementType() throw (uno::RuntimeException) { return excel::XWindows::static_type(0); } -void SAL_CALL +void SAL_CALL ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException) { //#TODO #FIXME see what can be done for an implementation here } -rtl::OUString& +rtl::OUString& ScVbaWindows::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWindows") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> ScVbaWindows::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 9b1ac796503a..71d5f7cd59cb 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.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 @@ -32,7 +32,7 @@ #include <ooo/vba/excel/XWindows.hpp> #include <com/sun/star/uno/XComponentContext.hpp> - + #include "excelvbahelper.hxx" #include <vbahelper/vbacollectionimpl.hxx> @@ -53,8 +53,8 @@ public: // XWindows virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (::com::sun::star::uno::RuntimeException); - // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + // ScVbaCollectionBaseImpl + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface virtual rtl::OUString& getServiceImplName(); diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 3e9fa27443cb..1af4fee63ef3 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -211,7 +211,7 @@ ScVbaWorkbook::init() if ( !ColorData.getLength() ) ResetColors(); } -ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext ) +ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext ) { //#FIXME this persists the color data per office instance and // not per workbook instance, need to hook the data into XModel @@ -222,7 +222,7 @@ ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface init(); } -ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext, xModel ) +ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext, xModel ) { init(); } diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 3f52e2683f3f..6bde08a111ae 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.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 @@ -46,11 +46,11 @@ class ScVbaWorkbook : public ScVbaWorkbook_BASE ::rtl::OUString convertFileFormat(sal_Int32 aFileFormat); protected: - ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); + ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); public: - ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, + ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ); - ScVbaWorkbook( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); + ScVbaWorkbook( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); virtual ~ScVbaWorkbook() {} // Attributes diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 67de260af9aa..2d64f50764ba 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.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 @@ -83,12 +83,12 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& if( xLibContainer.is() ) { if( !xLibContainer->hasByName( aPrjName ) ) - xLibContainer->createLibrary( aPrjName ); + xLibContainer->createLibrary( aPrjName ); uno::Any aLibAny = xLibContainer->getByName( aPrjName ); uno::Reference< container::XNameContainer > xLib; aLibAny >>= xLib; if( xLib.is() ) - { + { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); // bootstrap vbaglobals @@ -120,7 +120,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& for ( std::vector<rtl::OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) { script::ModuleInfo sModuleInfo; - + sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( *it ), uno::UNO_QUERY ); sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); @@ -130,7 +130,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& xLib->insertByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ) ) ); } } - } + } } } @@ -141,7 +141,7 @@ getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Refe uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY ); if( !xModel.is() ) return uno::Any(); - + ScDocShell* pShell = excel::getDocShell( xModel ); if ( pShell ) { @@ -164,8 +164,8 @@ class WorkBookEnumImpl : public EnumerationHelperImpl public: WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { uno::Reference< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getWorkbook( m_xContext, xDoc, m_xParent ); } @@ -185,7 +185,7 @@ uno::Reference< container::XEnumeration > ScVbaWorkbooks::createEnumeration() throw (uno::RuntimeException) { // #FIXME its possible the WorkBookEnumImpl here doens't reflect - // the state of this object ( although it should ) would be + // the state of this object ( although it should ) would be // safer to create an enumeration based on this objects state // rather than one effectively based of the desktop component uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); @@ -205,7 +205,7 @@ ScVbaWorkbooks::Add() throw (uno::RuntimeException) { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW ); - // need to set up the document modules ( and vba mode ) here + // need to set up the document modules ( and vba mode ) here setUpDocumentModules( xSpreadDoc ); if( xSpreadDoc.is() ) return getWorkbook( mxContext, xSpreadDoc, mxParent ); @@ -218,13 +218,13 @@ ScVbaWorkbooks::Close() throw (uno::RuntimeException) VbaDocumentsBase::Close(); } -bool +bool ScVbaWorkbooks::isTextFile( const rtl::OUString& sType ) { // will return true if the file is // a) a variant of a text file // b) a csv file - // c) unknown + // c) unknown // returning true basically means treat this like a csv file const static rtl::OUString txtType( RTL_CONSTASCII_USTRINGPARAM("writer_Text" ) ); const static rtl::OUString csvType( RTL_CONSTASCII_USTRINGPARAM("calc_Text_txt_csv_StarCalc" ) ); @@ -232,18 +232,18 @@ ScVbaWorkbooks::isTextFile( const rtl::OUString& sType ) return sType.equals( txtType ) || sType.equals( csvType ) || ( sType.getLength() == 0 ) || sType.equals( encodedTxtType ); } -bool +bool ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) { // include calc_QPro etc. ? ( not for the moment anyway ) - if ( sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc_MS"))) == 0 - || sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc8"))) == 0 + if ( sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc_MS"))) == 0 + || sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc8"))) == 0 || sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc_StarOffice"))) == 0 ) return true; return false; } -rtl::OUString +rtl::OUString ScVbaWorkbooks::getFileFilterType( const rtl::OUString& rFileName ) { uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); @@ -270,10 +270,10 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi uno::Sequence< beans::PropertyValue > sProps(0); sal_Int32 nIndex = 0; - + rtl::OUString sType = getFileFilterType( aURL ); - // A text file means it needs to be processed as a csv file - if ( isTextFile( sType ) ) + // A text file means it needs to be processed as a csv file + if ( isTextFile( sType ) ) { // Values for format // 1 Tabs @@ -285,24 +285,24 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi // no format means use the current delimiter sProps.realloc( 3 ); sProps[ nIndex ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterOptions" ) ); - sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ }; + sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ }; static rtl::OUString sRestOfFormat( RTL_CONSTASCII_USTRINGPARAM(",34,0,1" ) ); - + rtl::OUString sFormat; sal_Int16 nFormat = 0; // default indicator if ( Format.hasValue() ) { - Format >>= nFormat; // val of nFormat overwritten if extracted - // validate param + Format >>= nFormat; // val of nFormat overwritten if extracted + // validate param if ( nFormat < 1 || nFormat > 6 ) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal value for Format" ) ), uno::Reference< uno::XInterface >() ); } sal_Int16 nDelim = getCurrentDelim(); - if ( nFormat > 0 && nFormat < CUSTOM_CHAR ) + if ( nFormat > 0 && nFormat < CUSTOM_CHAR ) { nDelim = delims[ nFormat ]; } @@ -333,7 +333,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi } else if ( !isSpreadSheetFile( sType ) ) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Bad Format")), uno::Reference< uno::XInterface >() ); - + uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Open( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW ); uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, mxParent ); uno::Reference< excel::XWorkbook > xWBook( aRet, uno::UNO_QUERY ); @@ -348,14 +348,14 @@ ScVbaWorkbooks::Open( const rtl::OUString& Filename, const uno::Any& ReadOnly, c return VbaDocumentsBase::Open( Filename, ReadOnly, rProps ); } -rtl::OUString& +rtl::OUString& ScVbaWorkbooks::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbooks") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> ScVbaWorkbooks::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index a195bb8d3cd0..6cd6d90fc46b 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.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 @@ -43,9 +43,9 @@ typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > class ScVbaWorkbooks : public ScVbaWorkbooks_BASE { private: - rtl::OUString getFileFilterType( const rtl::OUString& rString ); - bool isTextFile( const rtl::OUString& rString ); - bool isSpreadSheetFile( const rtl::OUString& rString ); + rtl::OUString getFileFilterType( const rtl::OUString& rString ); + bool isTextFile( const rtl::OUString& rString ); + bool isSpreadSheetFile( const rtl::OUString& rString ); static sal_Int16& getCurrentDelim(){ static sal_Int16 nDelim = 44; return nDelim; } public: ScVbaWorkbooks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); @@ -56,7 +56,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // ScVbaWorkbooks_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index abcdf60398af..b27bf99fd40a 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.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 @@ -70,16 +70,16 @@ class ScVbaWorksheet : public WorksheetImpl_BASE css::uno::Reference< css::container::XNameAccess > getFormControls(); css::uno::Any getControlShape( const rtl::OUString& sName ); - + css::uno::Reference< css::beans::XPropertySet > getFirstDBRangeProperties() throw (css::uno::RuntimeException); - + protected: ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); public: ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet, + const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet, const css::uno::Reference< css::frame::XModel >& xModel )throw (css::uno::RuntimeException) ; ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException ); @@ -133,7 +133,7 @@ public: virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); @@ -153,7 +153,7 @@ public: virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException); virtual void SAL_CALL setEnableCalculation( ::sal_Bool EnableCalculation ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException); // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException); @@ -169,7 +169,7 @@ public: virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException); // XHelperInterface virtual rtl::OUString& getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SC_VBA_WORKSHEET_HXX */ diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index cb345950958b..5263b9a8ea34 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.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 @@ -61,7 +61,7 @@ using namespace ::com::sun::star; typedef ::cppu::WeakImplHelper1< container::XEnumeration > SheetEnumeration_BASE; typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > SheetCollectionHelper_BASE; -// a map ( or hashmap ) wont do as we need also to preserve the order +// a map ( or hashmap ) wont do as we need also to preserve the order // (as added ) of the items typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap; @@ -69,7 +69,7 @@ typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap; // #FIXME #TODO the implementation of the Sheets collections sucks, // e.g. there is no support for tracking sheets added/removed from the collection -uno::Reference< uno::XInterface > +uno::Reference< uno::XInterface > lcl_getModulAsUnoObject( const uno::Reference< sheet::XSpreadsheet >& xSheet, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { uno::Reference< uno::XInterface > xRet; @@ -80,7 +80,7 @@ lcl_getModulAsUnoObject( const uno::Reference< sheet::XSpreadsheet >& xSheet, co xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_CODENAME ) ) ) >>= sName; ScDocShell* pShell = excel::getDocShell( xModel ); - + if ( pShell ) xRet = getUnoDocModule( sName, pShell ); return xRet; @@ -114,7 +114,7 @@ public: // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return sheet::XSpreadsheet::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( mSheetMap.size() > 0 ); } - // XNameAcess + // XNameAcess virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) @@ -130,7 +130,7 @@ public: for ( ; it != it_end; ++it, ++pString ) { - uno::Reference< container::XNamed > xName( *it, uno::UNO_QUERY_THROW ); + uno::Reference< container::XNamed > xName( *it, uno::UNO_QUERY_THROW ); *pString = xName->getName(); } return sNames; @@ -141,7 +141,7 @@ public: SheetMap::iterator it_end = mSheetMap.end(); for ( ; cachePos != it_end; ++cachePos ) { - uno::Reference< container::XNamed > xName( *cachePos, uno::UNO_QUERY_THROW ); + uno::Reference< container::XNamed > xName( *cachePos, uno::UNO_QUERY_THROW ); if ( aName.equals( xName->getName() ) ) break; } @@ -149,12 +149,12 @@ public: } // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) { return mSheetMap.size(); } + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) { return mSheetMap.size(); } virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); - + return uno::makeAny( mSheetMap[ Index ] ); } @@ -171,35 +171,35 @@ class SheetsEnumeration : public EnumerationHelperImpl public: SheetsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { uno::Reference< sheet::XSpreadsheet > xSheet( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); uno::Reference< uno::XInterface > xIf = lcl_getModulAsUnoObject( xSheet, m_xModel ); uno::Any aRet; if ( !xIf.is() ) { - // if the Sheet is in a document created by the api unfortunately ( at the + // if the Sheet is in a document created by the api unfortunately ( at the // moment, it actually wont have the special Document modules uno::Reference< excel::XWorksheet > xNewSheet( new ScVbaWorksheet( m_xParent, m_xContext, xSheet, m_xModel ) ); - aRet <<= xNewSheet; + aRet <<= xNewSheet; } else - aRet <<= xIf; + aRet <<= xIf; return aRet; } }; -ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xSheets, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, xSheets ), mxModel( xModel ), m_xSheets( uno::Reference< sheet::XSpreadsheets >( xSheets, uno::UNO_QUERY ) ) +ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xSheets, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, xSheets ), mxModel( xModel ), m_xSheets( uno::Reference< sheet::XSpreadsheets >( xSheets, uno::UNO_QUERY ) ) { } -ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XEnumerationAccess >& xEnumAccess, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xEnumAccess, uno::UNO_QUERY ) ), mxModel(xModel) +ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XEnumerationAccess >& xEnumAccess, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xEnumAccess, uno::UNO_QUERY ) ), mxModel(xModel) { } // XEnumerationAccess -uno::Type +uno::Type ScVbaWorksheets::getElementType() throw (uno::RuntimeException) { return excel::XWorksheet::static_type(0); @@ -211,7 +211,7 @@ ScVbaWorksheets::createEnumeration() throw (uno::RuntimeException) if ( !m_xSheets.is() ) { uno::Reference< container::XEnumerationAccess > xAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); - return xAccess->createEnumeration(); + return xAccess->createEnumeration(); } uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xSheets, uno::UNO_QUERY_THROW ); return new SheetsEnumeration( this, mxContext, xEnumAccess->createEnumeration(), mxModel ); @@ -225,7 +225,7 @@ ScVbaWorksheets::createCollectionObject( const uno::Any& aSource ) uno::Any aRet; if ( !xIf.is() ) { - // if the Sheet is in a document created by the api unfortunately ( at the + // if the Sheet is in a document created by the api unfortunately ( at the // moment, it actually wont have the special Document modules uno::Reference< excel::XWorksheet > xNewSheet( new ScVbaWorksheet( getParent(), mxContext, xSheet, mxModel ) ); aRet <<= xNewSheet; @@ -242,7 +242,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, { if ( isSelectedSheets() ) return uno::Any(); // or should we throw? - + rtl::OUString aStringSheet; sal_Bool bBefore(sal_True); SCTAB nSheetIndex = 0; @@ -291,7 +291,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, nSheetIndex++; SCTAB nSheetName = nCount + 1L; - String aStringBase( RTL_CONSTASCII_USTRINGPARAM("Sheet") ); + String aStringBase( RTL_CONSTASCII_USTRINGPARAM("Sheet") ); uno::Any result; for (SCTAB i=0; i < nNewSheets; i++, nSheetName++) { @@ -308,7 +308,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, } uno::Reference< excel::XWorksheet > xNewSheet( result, uno::UNO_QUERY ); if ( xNewSheet.is() ) - xNewSheet->Activate(); + xNewSheet->Activate(); return result; } @@ -333,7 +333,7 @@ ScVbaWorksheets::isSelectedSheets() return !m_xSheets.is(); } -void SAL_CALL +void SAL_CALL ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException) { sal_Int32 nTo = 0; @@ -354,7 +354,7 @@ ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno:: PrintOutHelper( excel::getBestViewShell( mxModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaWorksheets::getVisible() throw (uno::RuntimeException) { sal_Bool bVisible = sal_True; @@ -371,7 +371,7 @@ ScVbaWorksheets::getVisible() throw (uno::RuntimeException) return uno::makeAny( bVisible ); } -void SAL_CALL +void SAL_CALL ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeException) { sal_Bool bState = sal_False; @@ -385,24 +385,24 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep } } else - throw uno::RuntimeException( rtl::OUString( + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Visible property doesn't support non boolean #FIXME" ) ), uno::Reference< uno::XInterface >() ); } -void SAL_CALL +void SAL_CALL ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException) { ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel ); if ( !pViewShell ) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() ); - + ScMarkData& rMarkData = pViewShell->GetViewData()->GetMarkData(); sal_Bool bReplace = sal_True; Replace >>= bReplace; - // Replace is defaulted to True, meanining this current collection + // Replace is defaulted to True, meanining this current collection // becomes the Selection, if it were false then the current selection would // be extended - bool bSelectSingle = bReplace; + bool bSelectSingle = bReplace; sal_Int32 nElems = getCount(); for ( sal_Int32 nItem = 1; nItem <= nElems; ++nItem ) { @@ -417,15 +417,15 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException) } else rMarkData.SelectTable( static_cast< SCTAB >( pSheet->getSheetID() ), TRUE ); - + } } - + } //ScVbaCollectionBaseImpl -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaWorksheets::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException) { if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE ) @@ -447,28 +447,28 @@ ScVbaWorksheets::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (u uno::Reference< container::XNamed > xName( xSheet, uno::UNO_QUERY_THROW ); mSheets.push_back( xSheet ); } - } + } uno::Reference< container::XIndexAccess > xIndexAccess = new SheetCollectionHelper( mSheets ); uno::Reference< XCollection > xSelectedSheets( new ScVbaWorksheets( this->getParent(), mxContext, xIndexAccess, mxModel ) ); return uno::makeAny( xSelectedSheets ); } - return ScVbaWorksheets_BASE::Item( Index, Index2 ); + return ScVbaWorksheets_BASE::Item( Index, Index2 ); } -uno::Any +uno::Any ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException) { return ScVbaWorksheets_BASE::getItemByStringIndex( sIndex ); } -rtl::OUString& +rtl::OUString& ScVbaWorksheets::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheets") ); return sImplName; } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<rtl::OUString> ScVbaWorksheets::getServiceNames() { static uno::Sequence< rtl::OUString > sNames; diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index 9854c0447c1d..82001c0d77c8 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.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 @@ -35,7 +35,7 @@ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/uno/XComponentContext.hpp> - + #include <vbahelper/vbacollectionimpl.hxx> #include "address.hxx" @@ -70,7 +70,7 @@ public: virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException); virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException); // ScVbaWorksheets_BASE virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index 2e1c768b9588..ff7c68cea6ba 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.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 @@ -49,7 +49,7 @@ public: virtual css::uno::Any SAL_CALL getValue(const rtl::OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); virtual sal_Bool SAL_CALL hasMethod(const rtl::OUString& Name) throw(css::uno::RuntimeException); virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException); // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 115055b2f136..f75778991f09 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.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 @@ -103,7 +103,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) rBindings.Invalidate( SID_FILL_ADD_SUCC ); rBindings.Invalidate( SID_FILL_DEL_SUCC ); break; - case SID_CANCEL: // Escape + case SID_CANCEL: // Escape case SID_FILL_NONE: pViewData->GetViewShell()->SetAuditShell( FALSE ); break; @@ -150,7 +150,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) void ScAuditingShell::GetState( SfxItemSet& rSet ) { - rSet.Put( SfxBoolItem( nFunction, TRUE ) ); // aktive Funktion markieren + rSet.Put( SfxBoolItem( nFunction, TRUE ) ); // aktive Funktion markieren } diff --git a/sc/source/ui/view/cellmergeoption.cxx b/sc/source/ui/view/cellmergeoption.cxx index d7a4343db4e0..61f2d8bd7727 100644 --- a/sc/source/ui/view/cellmergeoption.cxx +++ b/sc/source/ui/view/cellmergeoption.cxx @@ -17,7 +17,7 @@ * Portions created by the Initial Developer are Copyright (C) 2010 the * Initial Developer. All Rights Reserved. * - * Contributor(s): + * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 3 or later (the "GPLv3+"), or diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 7cfa50a4e686..ba4127e51331 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.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 @@ //------------------------------------------------------------------ #define ScCellShell -#define CellMovement +#define CellMovement #include "scslots.hxx" #define SearchSettings @@ -117,7 +117,7 @@ ScCellShell::~ScCellShell() void ScCellShell::GetBlockState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); ScRange aMarkRange; ScMarkType eMarkType = GetViewData()->GetSimpleArea( aMarkRange ); BOOL bSimpleArea = (eMarkType == SC_MARK_SIMPLE); @@ -138,59 +138,59 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) while ( nWhich ) { BOOL bDisable = FALSE; - BOOL bNeedEdit = TRUE; // muss Selektion editierbar sein? + BOOL bNeedEdit = TRUE; // muss Selektion editierbar sein? switch ( nWhich ) { - case FID_FILL_TO_BOTTOM: // Fuellen oben/unten - case FID_FILL_TO_TOP: // mind. 2 Zeilen markiert? + case FID_FILL_TO_BOTTOM: // Fuellen oben/unten + case FID_FILL_TO_TOP: // mind. 2 Zeilen markiert? bDisable = (!bSimpleArea) || (nRow1 == nRow2); if ( !bDisable && bEditable ) - { // Matrix nicht zerreissen + { // Matrix nicht zerreissen if ( nWhich == FID_FILL_TO_BOTTOM ) bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow1, nCol2, nRow1, rMark ); // erste Zeile + nCol1, nRow1, nCol2, nRow1, rMark ); // erste Zeile else bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow2, nCol2, nRow2, rMark ); // letzte Zeile + nCol1, nRow2, nCol2, nRow2, rMark ); // letzte Zeile } break; - case FID_FILL_TO_RIGHT: // Fuellen links/rechts - case FID_FILL_TO_LEFT: // mind. 2 Spalten markiert? + case FID_FILL_TO_RIGHT: // Fuellen links/rechts + case FID_FILL_TO_LEFT: // mind. 2 Spalten markiert? bDisable = (!bSimpleArea) || (nCol1 == nCol2); if ( !bDisable && bEditable ) - { // Matrix nicht zerreissen + { // Matrix nicht zerreissen if ( nWhich == FID_FILL_TO_RIGHT ) bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow1, nCol1, nRow2, rMark ); // erste Spalte + nCol1, nRow1, nCol1, nRow2, rMark ); // erste Spalte else bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte + nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte } break; - case FID_FILL_SERIES: // Block fuellen - case SID_OPENDLG_TABOP: // Mehrfachoperationen, mind. 2 Zellen markiert? + case FID_FILL_SERIES: // Block fuellen + case SID_OPENDLG_TABOP: // Mehrfachoperationen, mind. 2 Zellen markiert? if (pDoc->GetChangeTrack()!=NULL &&nWhich ==SID_OPENDLG_TABOP) bDisable = TRUE; else bDisable = (!bSimpleArea) || (nCol1 == nCol2 && nRow1 == nRow2); if ( !bDisable && bEditable && nWhich == FID_FILL_SERIES ) - { // Matrix nicht zerreissen + { // Matrix nicht zerreissen bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow1, nCol2, nRow1, rMark ) // erste Zeile - || pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow2, nCol2, nRow2, rMark ) // letzte Zeile - || pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow1, nCol1, nRow2, rMark ) // erste Spalte - || pDoc->HasSelectedBlockMatrixFragment( - nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte + nCol1, nRow1, nCol2, nRow1, rMark ) // erste Zeile + || pDoc->HasSelectedBlockMatrixFragment( + nCol1, nRow2, nCol2, nRow2, rMark ) // letzte Zeile + || pDoc->HasSelectedBlockMatrixFragment( + nCol1, nRow1, nCol1, nRow2, rMark ) // erste Spalte + || pDoc->HasSelectedBlockMatrixFragment( + nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte } break; - case SID_CUT: // Ausschneiden, - case FID_INS_CELL: // Zellen einfuegen, nur einf. Selektion + case SID_CUT: // Ausschneiden, + case FID_INS_CELL: // Zellen einfuegen, nur einf. Selektion bDisable = (!bSimpleArea); break; @@ -204,16 +204,16 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) bDisable = (!bSimpleArea) || GetViewData()->SimpleRowMarked(); break; - case SID_COPY: // Kopieren + case SID_COPY: // Kopieren // nur wegen Matrix nicht editierbar? Matrix nicht zerreissen //! schlaegt nicht zu, wenn geschuetzt UND Matrix, aber damit //! muss man leben.. wird in Copy-Routine abgefangen, sonst //! muesste hier nochmal Aufwand getrieben werden if ( !(!bEditable && bOnlyNotBecauseOfMatrix) ) - bNeedEdit = FALSE; // erlaubt, wenn geschuetzt/ReadOnly + bNeedEdit = FALSE; // erlaubt, wenn geschuetzt/ReadOnly break; - case SID_AUTOFORMAT: // Autoformat, mind. 3x3 selektiert + case SID_AUTOFORMAT: // Autoformat, mind. 3x3 selektiert bDisable = (!bSimpleArea) || ((nCol2 - nCol1) < 2) || ((nRow2 - nRow1) < 2); break; @@ -270,9 +270,9 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) } } -// Funktionen, die je nach Cursorposition disabled sind -// Default: -// SID_INSERT_POSTIT, SID_CHARMAP, SID_OPENDLG_FUNCTION +// Funktionen, die je nach Cursorposition disabled sind +// Default: +// SID_INSERT_POSTIT, SID_CHARMAP, SID_OPENDLG_FUNCTION void ScCellShell::GetCellState( SfxItemSet& rSet ) { @@ -286,7 +286,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) while ( nWhich ) { BOOL bDisable = FALSE; - BOOL bNeedEdit = TRUE; // muss Cursorposition editierbar sein? + BOOL bNeedEdit = TRUE; // muss Cursorposition editierbar sein? switch ( nWhich ) { case SID_THESAURUS: @@ -295,7 +295,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) bDisable = ( eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT); if (!bDisable) { - // test for available languages + // test for available languages USHORT nLang = ScViewUtil::GetEffLanguage( pDoc, aCursor ); bDisable = !ScModule::HasThesaurusLanguage( nLang ); } @@ -343,9 +343,9 @@ sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHe { if ( rDataHelper.HasFormat( nFormatId ) ) { - // #90675# translated format name strings are no longer inserted here, - // handled by "paste special" dialog / toolbox controller instead. - // Only the object type name has to be set here: + // #90675# translated format name strings are no longer inserted here, + // handled by "paste special" dialog / toolbox controller instead. + // Only the object type name has to be set here: String aStrVal; if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE ) { @@ -401,7 +401,7 @@ void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ) lcl_TestFormat( rFormats, aDataHelper, SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ); } -// Einfuegen, Inhalte einfuegen +// Einfuegen, Inhalte einfuegen BOOL lcl_IsCellPastePossible( const TransferableDataHelper& rData ) { @@ -469,7 +469,7 @@ void __EXPORT ScCellShell::GetClipState( SfxItemSet& rSet ) BOOL bDisable = !bPastePossible; - // Zellschutz / Multiselektion + // Zellschutz / Multiselektion if (!bDisable) { @@ -499,17 +499,17 @@ void __EXPORT ScCellShell::GetClipState( SfxItemSet& rSet ) } } -// only SID_HYPERLINK_GETLINK: +// only SID_HYPERLINK_GETLINK: void ScCellShell::GetHLinkState( SfxItemSet& rSet ) { - // always return an item (or inserting will be disabled) - // if the cell at the cursor contains only a link, return that link + // always return an item (or inserting will be disabled) + // if the cell at the cursor contains only a link, return that link SvxHyperlinkItem aHLinkItem; if ( !GetViewData()->GetView()->HasBookmarkAtCursor( &aHLinkItem ) ) { - //! put selected text into item? + //! put selected text into item? } rSet.Put(aHLinkItem); @@ -519,16 +519,16 @@ void ScCellShell::GetState(SfxItemSet &rSet) { // removed: SID_BORDER_OBJECT (old Basic) - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); // BOOL bOle = pTabViewShell->GetViewFrame()->GetFrame().IsInPlace(); -// BOOL bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo()); +// BOOL bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo()); ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScViewData* pData = GetViewData(); - ScDocument* pDoc = pData->GetDocument(); - ScMarkData& rMark = pData->GetMarkData(); - SCCOL nPosX = pData->GetCurX(); - SCROW nPosY = pData->GetCurY(); - SCTAB nTab = pData->GetTabNo(); + ScDocument* pDoc = pData->GetDocument(); + ScMarkData& rMark = pData->GetMarkData(); + SCCOL nPosX = pData->GetCurX(); + SCROW nPosY = pData->GetCurY(); + SCTAB nTab = pData->GetTabNo(); SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nTabSelCount = rMark.GetSelectCount(); @@ -561,7 +561,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) case SID_RANGE_NOTETEXT: { - // #43343# always take cursor position, do not use top-left cell of selection + // #43343# always take cursor position, do not use top-left cell of selection ScAddress aPos( nPosX, nPosY, nTab ); String aNoteText; if ( const ScPostIt* pNote = pDoc->GetNote( aPos ) ) @@ -612,16 +612,16 @@ void ScCellShell::GetState(SfxItemSet &rSet) case SID_STATUS_SELMODE: { - /* 0: STD Click hebt Sel auf - * 1: ER Click erweitert Selektion - * 2: ERG Click definiert weitere Selektion + /* 0: STD Click hebt Sel auf + * 1: ER Click erweitert Selektion + * 2: ERG Click definiert weitere Selektion */ USHORT nMode = pTabViewShell->GetLockedModifiers(); switch ( nMode ) { - case KEY_SHIFT: nMode = 1; break; - case KEY_MOD1: nMode = 2; break; // Control-Taste + case KEY_SHIFT: nMode = 1; break; + case KEY_MOD1: nMode = 2; break; // Control-Taste case 0: default: nMode = 0; @@ -633,7 +633,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) case SID_STATUS_DOCPOS: { - String aStr( ScGlobal::GetRscString( STR_TABLE ) ); + String aStr( ScGlobal::GetRscString( STR_TABLE ) ); aStr += ' '; aStr += String::CreateFromInt32( nTab + 1 ); @@ -643,14 +643,14 @@ void ScCellShell::GetState(SfxItemSet &rSet) } break; - // Summe etc. mit Datum/Zeit/Fehler/Pos&Groesse zusammengefasst + // Summe etc. mit Datum/Zeit/Fehler/Pos&Groesse zusammengefasst // #i34458# The SfxStringItem belongs only into SID_TABLE_CELL. It no longer has to be // duplicated in SID_ATTR_POSITION or SID_ATTR_SIZE for SvxPosSizeStatusBarControl. case SID_TABLE_CELL: { - // Testen, ob Fehler unter Cursor - // (nicht pDoc->GetErrCode, um keine zirkulaeren Referenzen auszuloesen) + // Testen, ob Fehler unter Cursor + // (nicht pDoc->GetErrCode, um keine zirkulaeren Referenzen auszuloesen) // In interpreter may happen via rescheduled Basic if ( pDoc->IsInInterpreter() ) @@ -744,9 +744,9 @@ void ScCellShell::GetState(SfxItemSet &rSet) { // ScDocument* pDoc = GetViewData()->GetDocument(); // SCTAB nTab = GetViewData()->GetTabNo(); - List aList; + List aList; - Color aDummyCol; + Color aDummyCol; if ( !pDoc->IsScenario(nTab) ) { @@ -770,8 +770,8 @@ void ScCellShell::GetState(SfxItemSet &rSet) } else { - String aComment; - USHORT nDummyFlags; + String aComment; + USHORT nDummyFlags; pDoc->GetScenarioData( nTab, aComment, aDummyCol, nDummyFlags ); DBG_ASSERT( aList.Count() == 0, "List not empty!" ); aList.Insert( new String( aComment ) ); @@ -796,12 +796,12 @@ void ScCellShell::GetState(SfxItemSet &rSet) rSet.DisableItem( nWhich ); break; -/* Zellschutz bei selektierten Zellen wird bei anderen Funktionen auch nicht abgefragt... +/* Zellschutz bei selektierten Zellen wird bei anderen Funktionen auch nicht abgefragt... case SID_DELETE: { if ( pDoc->IsTabProtected(nTab) ) { - const SfxItemSet& rAttrSet = GetSelectionPattern()->GetItemSet(); + const SfxItemSet& rAttrSet = GetSelectionPattern()->GetItemSet(); const ScProtectionAttr& rProtAttr = (const ScProtectionAttr&)rAttrSet.Get( ATTR_PROTECTION, TRUE ); if ( rProtAttr.GetProtection() ) rSet.DisableItem( nWhich ); @@ -890,8 +890,8 @@ void ScCellShell::GetState(SfxItemSet &rSet) DBG_ERROR( "Old update method. Use ScTabViewShell::UpdateInputHandler()." ); break; - case SID_SCENARIOS: // Szenarios: - if (!(rMark.IsMarked() || rMark.IsMultiMarked())) // nur, wenn etwas selektiert + case SID_SCENARIOS: // Szenarios: + if (!(rMark.IsMarked() || rMark.IsMultiMarked())) // nur, wenn etwas selektiert rSet.DisableItem( nWhich ); break; diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 750d3648631e..bd139fab1fd8 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.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 @@ -118,13 +118,13 @@ using namespace ::com::sun::star::uno; //------------------------------------------------------------------ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { - ScModule* pScMod = SC_MOD(); - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + ScModule* pScMod = SC_MOD(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox // Eingabe beenden if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) ) @@ -149,7 +149,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) switch ( nSlot ) { // - // Einfuegen / Loeschen von Zellen / Zeilen / Spalten + // Einfuegen / Loeschen von Zellen / Zeilen / Spalten // case FID_INS_ROW: @@ -327,7 +327,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) break; // - // Inhalte von Zellen loeschen + // Inhalte von Zellen loeschen // case SID_DELETE_CONTENTS: @@ -337,18 +337,18 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_DELETE: { - USHORT nFlags = IDF_NONE; + USHORT nFlags = IDF_NONE; if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { - const SfxPoolItem* pItem; - String aFlags = 'A'; + const SfxPoolItem* pItem; + String aFlags = 'A'; if( IS_AVAILABLE( SID_DELETE, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); aFlags.ToUpperAscii(); - BOOL bCont = TRUE; + BOOL bCont = TRUE; for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ ) { @@ -358,7 +358,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) nFlags |= IDF_ALL; bCont = FALSE; // nicht mehr weitermachen! break; - case 'S': nFlags |= IDF_STRING; break; + case 'S': nFlags |= IDF_STRING; break; case 'V': nFlags |= IDF_VALUE; break; case 'D': nFlags |= IDF_DATETIME; break; case 'F': nFlags |= IDF_FORMULA; break; @@ -398,7 +398,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - String aFlags; + String aFlags; if( nFlags == IDF_ALL ) { @@ -423,7 +423,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) break; // - // Ausfuellen... + // Ausfuellen... // case FID_FILL_TO_BOTTOM: @@ -451,18 +451,18 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) USHORT nFlags = IDF_NONE; USHORT nFunction = PASTE_NOFUNC; BOOL bSkipEmpty = FALSE; - BOOL bAsLink = FALSE; + BOOL bAsLink = FALSE; if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { - const SfxPoolItem* pItem; - String aFlags = 'A'; + const SfxPoolItem* pItem; + String aFlags = 'A'; if( IS_AVAILABLE( FID_FILL_TAB, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); aFlags.ToUpperAscii(); - BOOL bCont = TRUE; + BOOL bCont = TRUE; for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ ) { @@ -472,7 +472,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) nFlags |= IDF_ALL; bCont = FALSE; // nicht mehr weitermachen! break; - case 'S': nFlags |= IDF_STRING; break; + case 'S': nFlags |= IDF_STRING; break; case 'V': nFlags |= IDF_VALUE; break; case 'D': nFlags |= IDF_DATETIME; break; case 'F': nFlags |= IDF_FORMULA; break; @@ -494,11 +494,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if (pDlg->Execute() == RET_OK) { - nFlags = pDlg->GetInsContentsCmdBits(); + nFlags = pDlg->GetInsContentsCmdBits(); nFunction = pDlg->GetFormulaCmdBits(); bSkipEmpty = pDlg->IsSkipEmptyCells(); - bAsLink = pDlg->IsLink(); - // MoveMode gibt's bei Tabelle fuellen nicht + bAsLink = pDlg->IsLink(); + // MoveMode gibt's bei Tabelle fuellen nicht } delete pDlg; } @@ -509,7 +509,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - String aFlags; + String aFlags; if( nFlags == IDF_ALL ) { @@ -541,13 +541,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SCROW nEndRow; SCTAB nEndTab; USHORT nPossDir = FDS_OPT_NONE; - FillDir eFillDir = FILL_TO_BOTTOM; - FillCmd eFillCmd = FILL_LINEAR; - FillDateCmd eFillDateCmd = FILL_DAY; + FillDir eFillDir = FILL_TO_BOTTOM; + FillCmd eFillCmd = FILL_LINEAR; + FillDateCmd eFillDateCmd = FILL_DAY; double fStartVal = MAXDOUBLE; - double fIncVal = 1; - double fMaxVal = MAXDOUBLE; - BOOL bDoIt = FALSE; + double fIncVal = 1; + double fMaxVal = MAXDOUBLE; + BOOL bDoIt = FALSE; GetViewData()->GetSimpleArea( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); @@ -564,16 +564,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) eFillDir=FILL_TO_BOTTOM; } - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); if( pReqArgs ) { const SfxPoolItem* pItem; - String aFillDir, aFillCmd, aFillDateCmd; - String aFillStep, aFillStart, aFillMax; + String aFillDir, aFillCmd, aFillDateCmd; + String aFillStep, aFillStart, aFillMax; sal_uInt32 nKey; - double fTmpVal; + double fTmpVal; bDoIt=FALSE; @@ -630,7 +630,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( pFormatter->IsNumberFormat( aFillMax, nKey, fTmpVal )) fMaxVal = fTmpVal; - bDoIt = TRUE; + bDoIt = TRUE; } else // (pReqArgs == NULL) => Dialog hochziehen @@ -661,7 +661,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // String aStartStr; - // Startwert nur vorbelegen, wenn nur 1 Zeile oder Spalte: + // Startwert nur vorbelegen, wenn nur 1 Zeile oder Spalte: if ( nStartCol == nEndCol || nStartRow == nEndRow ) { double fInputEndVal = 0.0; @@ -735,9 +735,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pDlg->Execute() == RET_OK ) { - eFillDir = pDlg->GetFillDir(); - eFillCmd = pDlg->GetFillCmd(); - eFillDateCmd = pDlg->GetFillDateCmd(); + eFillDir = pDlg->GetFillDir(); + eFillCmd = pDlg->GetFillCmd(); + eFillDateCmd = pDlg->GetFillDateCmd(); if(eFillCmd==FILL_AUTO) { @@ -745,51 +745,51 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if(aStr.Len()>0) pTabViewShell->EnterData( nStartCol, nStartRow, nStartTab, aStr ); } - fStartVal = pDlg->GetStart(); - fIncVal = pDlg->GetStep(); - fMaxVal = pDlg->GetMax(); - bDoIt = TRUE; + fStartVal = pDlg->GetStart(); + fIncVal = pDlg->GetStep(); + fMaxVal = pDlg->GetMax(); + bDoIt = TRUE; } delete pDlg; } if( bDoIt ) { - //nScFillModeMouseModifier = 0; // kein Ctrl/Copy + //nScFillModeMouseModifier = 0; // kein Ctrl/Copy pTabViewShell->FillSeries( eFillDir, eFillCmd, eFillDateCmd, fStartVal, fIncVal, fMaxVal ); if( ! rReq.IsAPI() ) { - String aPara; - Color* pColor=0; + String aPara; + Color* pColor=0; switch( eFillDir ) { - case FILL_TO_BOTTOM: aPara = 'B'; break; - case FILL_TO_RIGHT: aPara = 'R'; break; - case FILL_TO_TOP: aPara = 'T'; break; - case FILL_TO_LEFT: aPara = 'L'; break; + case FILL_TO_BOTTOM: aPara = 'B'; break; + case FILL_TO_RIGHT: aPara = 'R'; break; + case FILL_TO_TOP: aPara = 'T'; break; + case FILL_TO_LEFT: aPara = 'L'; break; default: aPara.Erase(); break; } rReq.AppendItem( SfxStringItem( FID_FILL_SERIES, aPara ) ); switch( eFillCmd ) { - case FILL_SIMPLE: aPara = 'S'; break; - case FILL_LINEAR: aPara = 'L'; break; - case FILL_GROWTH: aPara = 'G'; break; - case FILL_DATE: aPara = 'D'; break; - case FILL_AUTO: aPara = 'A'; break; + case FILL_SIMPLE: aPara = 'S'; break; + case FILL_LINEAR: aPara = 'L'; break; + case FILL_GROWTH: aPara = 'G'; break; + case FILL_DATE: aPara = 'D'; break; + case FILL_AUTO: aPara = 'A'; break; default: aPara.Erase(); break; } rReq.AppendItem( SfxStringItem( FN_PARAM_1, aPara ) ); switch( eFillDateCmd ) { - case FILL_DAY: aPara = 'D'; break; - case FILL_WEEKDAY: aPara = 'W'; break; - case FILL_MONTH: aPara = 'M'; break; - case FILL_YEAR: aPara = 'Y'; break; + case FILL_DAY: aPara = 'D'; break; + case FILL_WEEKDAY: aPara = 'W'; break; + case FILL_MONTH: aPara = 'M'; break; + case FILL_YEAR: aPara = 'Y'; break; default: aPara.Erase(); break; } rReq.AppendItem( SfxStringItem( FN_PARAM_2, aPara ) ); @@ -844,9 +844,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab, nEndCol,nEndRow,nEndTab ); } - else // Aufruf per Maus + else // Aufruf per Maus { - // #55284# nicht innerhalb einer zusammengefassten Zelle + // #55284# nicht innerhalb einer zusammengefassten Zelle if ( nStartCol == nEndCol && nStartRow == nEndRow ) { @@ -904,7 +904,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - String aAdrStr; + String aAdrStr; ScAddress aAdr( nFillCol, nFillRow, 0 ); aAdr.Format( aAdrStr, SCR_ABS, pDoc, pDoc->GetAddressConvention() ); @@ -923,8 +923,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) break; // - // Gliederung (Outlines) - // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl) + // Gliederung (Outlines) + // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl) // case SID_OUTLINE_HIDE: @@ -1032,7 +1032,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } } - else // Dialog, wenn nicht ganze Zeilen/Spalten markiert + else // Dialog, wenn nicht ganze Zeilen/Spalten markiert { if ( GetViewData()->SimpleColMarked() && !GetViewData()->SimpleRowMarked() ) bColumns = TRUE; @@ -1094,7 +1094,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } } - else // Dialog nur, wenn Aufheben fuer Zeilen und Spalten moeglich + else // Dialog nur, wenn Aufheben fuer Zeilen und Spalten moeglich { BOOL bColPoss, bRowPoss; pTabViewShell->TestRemoveOutline( bColPoss, bRowPoss ); @@ -1133,11 +1133,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) break; // - // Clipboard + // Clipboard // - case SID_COPY: // fuer Grafiken in DrawShell + case SID_COPY: // fuer Grafiken in DrawShell { WaitObject aWait( GetViewData()->GetDialogParent() ); pTabViewShell->CopyToClip( NULL, FALSE, FALSE, TRUE ); @@ -1148,7 +1148,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - case SID_CUT: // fuer Grafiken in DrawShell + case SID_CUT: // fuer Grafiken in DrawShell { WaitObject aWait( GetViewData()->GetDialogParent() ); pTabViewShell->CutToClip( NULL, TRUE ); @@ -1193,7 +1193,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pTabViewShell->PasteFromSystem(nFormat); } //?else - //? pTabViewShell->PasteFromSystem(); + //? pTabViewShell->PasteFromSystem(); rReq.Done(); } @@ -1206,7 +1206,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) USHORT nFunction = PASTE_NOFUNC; BOOL bSkipEmpty = FALSE; BOOL bTranspose = FALSE; - BOOL bAsLink = FALSE; + BOOL bAsLink = FALSE; InsCellCmd eMoveMode = INS_NONE; Window* pWin = GetViewData()->GetActiveWin(); @@ -1219,14 +1219,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip ); if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { - const SfxPoolItem* pItem; - String aFlags = 'A'; + const SfxPoolItem* pItem; + String aFlags = 'A'; if( IS_AVAILABLE( FID_INS_CELL_CONTENTS, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); aFlags.ToUpperAscii(); - BOOL bCont = TRUE; + BOOL bCont = TRUE; for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ ) { @@ -1236,7 +1236,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) nFlags |= IDF_ALL; bCont = FALSE; // nicht mehr weitermachen! break; - case 'S': nFlags |= IDF_STRING; break; + case 'S': nFlags |= IDF_STRING; break; case 'V': nFlags |= IDF_VALUE; break; case 'D': nFlags |= IDF_DATETIME; break; case 'F': nFlags |= IDF_FORMULA; break; @@ -1306,11 +1306,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } if (pDlg->Execute() == RET_OK) { - nFlags = pDlg->GetInsContentsCmdBits(); + nFlags = pDlg->GetInsContentsCmdBits(); nFunction = pDlg->GetFormulaCmdBits(); bSkipEmpty = pDlg->IsSkipEmptyCells(); bTranspose = pDlg->IsTranspose(); - bAsLink = pDlg->IsLink(); + bAsLink = pDlg->IsLink(); eMoveMode = pDlg->GetMoveMode(); } delete pDlg; @@ -1324,16 +1324,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { WaitObject aWait( GetViewData()->GetDialogParent() ); if ( bAsLink && bOtherDoc ) - pTabViewShell->PasteFromSystem(SOT_FORMATSTR_ID_LINK); // DDE einfuegen + pTabViewShell->PasteFromSystem(SOT_FORMATSTR_ID_LINK); // DDE einfuegen else pTabViewShell->PasteFromClip( nFlags, pOwnClip->GetDocument(), nFunction, bSkipEmpty, bTranspose, bAsLink, - eMoveMode, IDF_NONE, TRUE ); // allow warning dialog + eMoveMode, IDF_NONE, TRUE ); // allow warning dialog } if( !pReqArgs ) { - String aFlags; + String aFlags; if( nFlags == IDF_ALL ) { @@ -1360,7 +1360,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } } - pTabViewShell->CellContentChanged(); // => PasteFromXXX ??? + pTabViewShell->CellContentChanged(); // => PasteFromXXX ??? break; case SID_PASTE_SPECIAL: @@ -1369,7 +1369,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { Window* pWin = GetViewData()->GetActiveWin(); - // Clipboard-ID als Parameter angegeben? Basic "PasteSpecial(Format)" + // Clipboard-ID als Parameter angegeben? Basic "PasteSpecial(Format)" const SfxPoolItem* pItem=NULL; if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET && @@ -1458,11 +1458,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } } - pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? + pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? break; // - // sonstiges + // sonstiges // case FID_INS_ROWBRK: @@ -1685,22 +1685,22 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { const SfxBoolItem* pOkItem = (const SfxBoolItem*)&pReqArgs->Get( SID_DLG_RETOK ); -// pScMod->SetFunctionDlg( NULL ); +// pScMod->SetFunctionDlg( NULL ); - if ( pOkItem->GetValue() ) // OK + if ( pOkItem->GetValue() ) // OK { - String aFormula; - const SfxStringItem* pSItem = (const SfxStringItem*)&pReqArgs->Get( SCITEM_STRING ); - const SfxBoolItem* pMatrixItem = (const SfxBoolItem*) &pReqArgs->Get( SID_DLG_MATRIX ); + String aFormula; + const SfxStringItem* pSItem = (const SfxStringItem*)&pReqArgs->Get( SCITEM_STRING ); + const SfxBoolItem* pMatrixItem = (const SfxBoolItem*) &pReqArgs->Get( SID_DLG_MATRIX ); aFormula += pSItem->GetValue(); pScMod->ActivateInputWindow( &aFormula, pMatrixItem->GetValue() ); } - else // CANCEL + else // CANCEL { pScMod->ActivateInputWindow( NULL ); } - rReq.Ignore(); // only SID_ENTER_STRING is recorded + rReq.Ignore(); // only SID_ENTER_STRING is recorded } break; @@ -1708,7 +1708,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pReqArgs ) { const SfxPoolItem* pItem; - String aName, aSymbol, aAttrib; + String aName, aSymbol, aAttrib; if( IS_AVAILABLE( FID_DEFINE_NAME, &pItem ) ) aName = ((const SfxStringItem*)pItem)->GetValue(); @@ -1724,12 +1724,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if (pTabViewShell->InsertName( aName, aSymbol, aAttrib )) rReq.Done(); else - SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler + SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler } } else { - USHORT nId = ScNameDlgWrapper::GetChildWindowId(); + USHORT nId = ScNameDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -1740,7 +1740,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_DEFINE_COLROWNAMERANGES: { - USHORT nId = ScColRowNameRangesDlgWrapper::GetChildWindowId(); + USHORT nId = ScColRowNameRangesDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -1800,7 +1800,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case FID_INSERT_NAME: { - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); @@ -1816,11 +1816,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScInputHandler* pHdl = pScMod->GetInputHdl( pTabViewShell ); if (pHdl) { - // das "=" per Key-Event, schaltet in den Eingabe-Modus + // das "=" per Key-Event, schaltet in den Eingabe-Modus pScMod->InputKeyEvent( KeyEvent('=',KeyCode()) ); String aName = pDlg->GetSelectedName(); - pHdl->InsertFunction( aName, FALSE ); // ohne "()" + pHdl->InsertFunction( aName, FALSE ); // ohne "()" } } break; @@ -1834,7 +1834,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { const SfxStringItem& rTextItem = (const SfxStringItem&)pReqArgs->Get( SID_RANGE_NOTETEXT ); - // #43343# immer Cursorposition + // #43343# immer Cursorposition ScAddress aPos( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); pTabViewShell->SetNoteText( aPos, rTextItem.GetValue() ); rReq.Done(); @@ -1926,7 +1926,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); // font color doesn't matter here - Font aCurFont; + Font aCurFont; pTabViewShell->GetSelectionPattern()->GetFont( aCurFont, SC_AUTOCOL_BLACK, NULL, NULL, NULL, pTabViewShell->GetSelectionScriptType() ); @@ -1969,7 +1969,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( pItem ) { pTabViewShell->UseScenario( pItem->GetValue() ); - //! wofuer soll der Return-Wert gut sein?!?! + //! wofuer soll der Return-Wert gut sein?!?! rReq.SetReturnValue( SfxStringItem( SID_SELECT_SCENARIO, pItem->GetValue() ) ); rReq.Done(); } @@ -1988,8 +1988,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( IS_AVAILABLE( SID_HYPERLINK_SETLINK, &pItem ) ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; - const String& rName = pHyper->GetName(); - const String& rURL = pHyper->GetURL(); + const String& rName = pHyper->GetName(); + const String& rURL = pHyper->GetURL(); const String& rTarget = pHyper->GetTargetFrame(); USHORT nType = (USHORT) pHyper->GetInsertMode(); @@ -2189,10 +2189,10 @@ void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTa pTabViewShell->PasteFromClip( nFlags, pClipDoc, PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE, - bShowDialog ); // allow warning dialog + bShowDialog ); // allow warning dialog } } - pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? + pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index a74a73c85721..16959485992b 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -70,8 +70,8 @@ #include "scresid.hxx" #include "pivot.hxx" #include "dpobject.hxx" -#include "dpsdbtab.hxx" // ScImportSourceDesc -#include "dpshttab.hxx" // ScSheetSourceDesc +#include "dpsdbtab.hxx" // ScImportSourceDesc +#include "dpshttab.hxx" // ScSheetSourceDesc #include "validate.hrc" // ScValidationDlg #include "scui_def.hxx" @@ -128,7 +128,7 @@ bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& rRange ) BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam ) { ScTabViewShell* pTabViewShell = pData->GetViewShell(); - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); ScDocument* pDoc = pData->GetDocument(); SCTAB nTab = pData->GetTabNo(); ScDirection eFillDir = DIR_TOP; @@ -210,12 +210,12 @@ namespace void ScCellShell::ExecuteDB( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); USHORT nSlotId = rReq.GetSlot(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - ScModule* pScMod = SC_MOD(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + ScModule* pScMod = SC_MOD(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) ) { @@ -227,7 +227,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { case SID_VIEW_DATA_SOURCE_BROWSER: { - // check if database beamer is open + // check if database beamer is open SfxViewFrame* pViewFrame = pTabViewShell->GetViewFrame(); BOOL bWasOpen = FALSE; @@ -242,26 +242,26 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if ( bWasOpen ) { - // close database beamer: just forward to SfxViewFrame + // close database beamer: just forward to SfxViewFrame pViewFrame->ExecuteSlot( rReq ); } else { - // show database beamer: SfxViewFrame call must be synchronous + // show database beamer: SfxViewFrame call must be synchronous - pViewFrame->ExecuteSlot( rReq, (BOOL) FALSE ); // FALSE = synchronous + pViewFrame->ExecuteSlot( rReq, (BOOL) FALSE ); // FALSE = synchronous - // select current database in database beamer + // select current database in database beamer ScImportParam aImportParam; - ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD); // don't create if none found + ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD); // don't create if none found if (pDBData) pDBData->GetImportParam( aImportParam ); ScDBDocFunc::ShowInBeamer( aImportParam, pTabViewShell->GetViewFrame() ); } - rReq.Done(); // needed because it's a toggle slot + rReq.Done(); // needed because it's a toggle slot } break; @@ -276,7 +276,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if (aImportParam.bImport && !pDBData->HasImportSelection()) { pTabViewShell->ImportData( aImportParam ); - pDBData->SetImportParam( aImportParam ); //! Undo ?? + pDBData->SetImportParam( aImportParam ); //! Undo ?? bOk = TRUE; } } @@ -294,7 +294,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD); if (pDBData) { - // Import wiederholen wie SID_REIMPORT_DATA + // Import wiederholen wie SID_REIMPORT_DATA BOOL bContinue = TRUE; ScImportParam aImportParam; @@ -302,23 +302,23 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if (aImportParam.bImport && !pDBData->HasImportSelection()) { bContinue = pTabViewShell->ImportData( aImportParam ); - pDBData->SetImportParam( aImportParam ); //! Undo ?? + pDBData->SetImportParam( aImportParam ); //! Undo ?? - // markieren (Groesse kann sich geaendert haben) + // markieren (Groesse kann sich geaendert haben) ScRange aNewRange; pDBData->GetArea(aNewRange); pTabViewShell->MarkRange(aNewRange); } - if ( bContinue ) // #41905# Fehler beim Import -> Abbruch + if ( bContinue ) // #41905# Fehler beim Import -> Abbruch { - // interne Operationen, wenn welche gespeichert + // interne Operationen, wenn welche gespeichert if ( pDBData->HasQueryParam() || pDBData->HasSortParam() || pDBData->HasSubTotalParam() ) pTabViewShell->RepeatDB(); - // Pivottabellen die den Bereich als Quelldaten haben + // Pivottabellen die den Bereich als Quelldaten haben ScRange aRange; pDBData->GetArea(aRange); @@ -362,7 +362,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { SfxAbstractTabDialog * pDlg = NULL; ScSubTotalParam aSubTotalParam; - SfxItemSet aArgSet( GetPool(), SCITEM_SUBTDATA, SCITEM_SUBTDATA ); + SfxItemSet aArgSet( GetPool(), SCITEM_SUBTDATA, SCITEM_SUBTDATA ); ScDBData* pDBData = pTabViewShell->GetDBData(); pDBData->GetSubTotalParam( aSubTotalParam ); @@ -417,7 +417,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) //#i60401 ux-ctest: Calc does not support all users' strategies regarding sorting data //the patch comes from maoyg ScSortParam aSortParam; - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); ScViewData* pData = GetViewData(); pDBData->GetSortParam( aSortParam ); @@ -437,22 +437,22 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) else if( nCol > aSortParam.nCol2 ) nCol = aSortParam.nCol2; - aSortParam.bHasHeader = bHasHeader; - aSortParam.bByRow = TRUE; - aSortParam.bCaseSens = FALSE; - aSortParam.bNaturalSort = FALSE; - aSortParam.bIncludePattern = TRUE; - aSortParam.bInplace = TRUE; - aSortParam.bDoSort[0] = TRUE; - aSortParam.nField[0] = nCol; - aSortParam.bAscending[0] = (nSlotId == SID_SORT_ASCENDING); + aSortParam.bHasHeader = bHasHeader; + aSortParam.bByRow = TRUE; + aSortParam.bCaseSens = FALSE; + aSortParam.bNaturalSort = FALSE; + aSortParam.bIncludePattern = TRUE; + aSortParam.bInplace = TRUE; + aSortParam.bDoSort[0] = TRUE; + aSortParam.nField[0] = nCol; + aSortParam.bAscending[0] = (nSlotId == SID_SORT_ASCENDING); for ( USHORT i=1; i<MAXSORT; i++ ) aSortParam.bDoSort[i] = FALSE; aArgSet.Put( ScSortItem( SCITEM_SORTDATA, GetViewData(), &aSortParam ) ); - pTabViewShell->UISort( aSortParam ); // Teilergebnisse bei Bedarf neu + pTabViewShell->UISort( aSortParam ); // Teilergebnisse bei Bedarf neu rReq.Done(); } @@ -466,10 +466,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) //#i60401 ux-ctest: Calc does not support all users' strategies regarding sorting data //the patch comes from maoyg - if ( pArgs ) // Basic + if ( pArgs ) // Basic { ScSortParam aSortParam; - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); ScViewData* pData = GetViewData(); pDBData->GetSortParam( aSortParam ); @@ -483,7 +483,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if( bHasHeader ) aSortParam.bHasHeader = bHasHeader; - aSortParam.bInplace = TRUE; // von Basic immer + aSortParam.bInplace = TRUE; // von Basic immer const SfxPoolItem* pItem; if ( pArgs->GetItemState( SID_SORT_BYROW, TRUE, &pItem ) == SFX_ITEM_SET ) @@ -501,7 +501,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) USHORT nUserIndex = ((const SfxUInt16Item*)pItem)->GetValue(); aSortParam.bUserDef = ( nUserIndex != 0 ); if ( nUserIndex ) - aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-basiert + aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-basiert } SCCOLROW nField0 = 0; @@ -534,7 +534,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) else { ScSortParam aSortParam; - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); ScViewData* pData = GetViewData(); pDBData->GetSortParam( aSortParam ); @@ -543,7 +543,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { SfxAbstractTabDialog* pDlg = NULL; ScDocument* pDoc = GetViewData()->GetDocument(); - SfxItemSet aArgSet( GetPool(), SCITEM_SORTDATA, SCITEM_SORTDATA ); + SfxItemSet aArgSet( GetPool(), SCITEM_SORTDATA, SCITEM_SORTDATA ); pDBData->GetSortParam( aSortParam ); BOOL bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() ); @@ -557,7 +557,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) pDlg = pFact->CreateScSortDlg( pTabViewShell->GetDialogParent(), &aArgSet, RID_SCDLG_SORT ); DBG_ASSERT(pDlg, "Dialog create fail!"); - pDlg->SetCurPageId(1); // 1=sort field tab 2=sort options tab + pDlg->SetCurPageId(1); // 1=sort field tab 2=sort options tab if ( pDlg->Execute() == RET_OK ) { @@ -628,7 +628,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } else { - USHORT nId = ScFilterDlgWrapper::GetChildWindowId(); + USHORT nId = ScFilterDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -649,7 +649,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } else { - USHORT nId = ScSpecialFilterDlgWrapper::GetChildWindowId(); + USHORT nId = ScSpecialFilterDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -691,7 +691,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) case SID_UNFILTER: { ScQueryParam aParam; - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); pDBData->GetQueryParam( aParam ); SCSIZE nEC = aParam.GetEntryCount(); @@ -758,23 +758,23 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ScDPObject* pDPObj = pDoc->GetDPAtCursor( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() ); - if ( pDPObj ) // on an existing table? + if ( pDPObj ) // on an existing table? { pNewDPObject = new ScDPObject( *pDPObj ); } - else // create new table + else // create new table { - // select database range or data + // select database range or data pTabViewShell->GetDBData( TRUE, SC_DB_OLD ); ScMarkData& rMark = GetViewData()->GetMarkData(); if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) pTabViewShell->MarkDataArea( FALSE ); - // output to cursor position for non-sheet data + // output to cursor position for non-sheet data ScAddress aDestPos( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() ); - // first select type of source data + // first select type of source data BOOL bEnableExt = ScDPObject::HasRegisteredSources(); @@ -818,9 +818,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } delete pDataDlg; } - else // selection + else // selection { - //! use database ranges (select before type dialog?) + //! use database ranges (select before type dialog?) ScRange aRange; ScMarkType eType = GetViewData()->GetSimpleArea(aRange); if ( (eType & SC_MARK_SIMPLE) == SC_MARK_SIMPLE ) @@ -841,7 +841,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) BOOL bOK = TRUE; if ( pDoc->HasSubTotalCells( aRange ) ) { - // confirm selection if it contains SubTotal cells + // confirm selection if it contains SubTotal cells QueryBox aBox( pTabViewShell->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), @@ -856,7 +856,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) pNewDPObject = new ScDPObject( pDoc ); pNewDPObject->SetSheetDesc( aShtDesc ); - // output below source data + // output below source data if ( aRange.aEnd.Row()+2 <= MAXROW - 4 ) aDestPos = ScAddress( aRange.aStart.Col(), aRange.aEnd.Row()+2, @@ -871,10 +871,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) pNewDPObject->SetOutRange( aDestPos ); } - pTabViewShell->SetDialogDPObject( pNewDPObject ); // is copied + pTabViewShell->SetDialogDPObject( pNewDPObject ); // is copied if ( pNewDPObject ) { - // start layout dialog + // start layout dialog USHORT nId = ScPivotLayoutWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); @@ -888,7 +888,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) case SID_DEFINE_DBNAME: { - USHORT nId = ScDbNameDlgWrapper::GetChildWindowId(); + USHORT nId = ScDbNameDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -916,16 +916,16 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } else { - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); ScDBCollection* pDBCol = pDoc->GetDBCollection(); if ( pDBCol ) { - const String aStrNoName( ScGlobal::GetRscString(STR_DB_NONAME) ); - List aList; - USHORT nDBCount = pDBCol->GetCount(); - ScDBData* pDbData = NULL; - String* pDBName = NULL; + const String aStrNoName( ScGlobal::GetRscString(STR_DB_NONAME) ); + List aList; + USHORT nDBCount = pDBCol->GetCount(); + ScDBData* pDbData = NULL; + String* pDBName = NULL; for ( USHORT i=0; i < nDBCount; i++ ) { @@ -1008,7 +1008,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) nCurX, nCurY, nTab, ATTR_VALIDDATA ))->GetValue(); if ( nIndex ) { - const ScValidationData* pOldData = pDoc->GetValidationEntry( nIndex ); + const ScValidationData* pOldData = pDoc->GetValidationEntry( nIndex ); if ( pOldData ) { eMode = pOldData->GetDataMode(); @@ -1031,17 +1031,17 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aArgSet.Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<USHORT>(eMode) ) ); aArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<USHORT>(eOper) ) ); - aArgSet.Put( SfxStringItem( FID_VALID_VALUE1, aExpr1 ) ); - aArgSet.Put( SfxStringItem( FID_VALID_VALUE2, aExpr2 ) ); - aArgSet.Put( SfxBoolItem( FID_VALID_BLANK, bBlank ) ); + aArgSet.Put( SfxStringItem( FID_VALID_VALUE1, aExpr1 ) ); + aArgSet.Put( SfxStringItem( FID_VALID_VALUE2, aExpr2 ) ); + aArgSet.Put( SfxBoolItem( FID_VALID_BLANK, bBlank ) ); aArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) ); - aArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, bShowHelp ) ); - aArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aHelpTitle ) ); - aArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, aHelpText ) ); - aArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, bShowError ) ); + aArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, bShowHelp ) ); + aArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aHelpTitle ) ); + aArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, aHelpText ) ); + aArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, bShowError ) ); aArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, sal::static_int_cast<USHORT>(eErrStyle) ) ); - aArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, aErrTitle ) ); - aArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, aErrText ) ); + aArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, aErrTitle ) ); + aArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, aErrText ) ); } } @@ -1120,13 +1120,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aData.SetIgnoreBlank( bBlank ); aData.SetListType( nListType ); - aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE + aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE if (!bShowHelp) - aData.ResetInput(); // reset only bShowInput + aData.ResetInput(); // reset only bShowInput - aData.SetError(aErrTitle, aErrText, eErrStyle); // sets bShowError to TRUE + aData.SetError(aErrTitle, aErrText, eErrStyle); // sets bShowError to TRUE if (!bShowError) - aData.ResetError(); // reset only bShowError + aData.ResetError(); // reset only bShowError pTabViewShell->SetValidation( aData ); rReq.Done( *pOutSet ); @@ -1196,13 +1196,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); ScViewData* pData = GetViewData(); - ScDocShell* pDocSh = pData->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); - SCCOL nPosX = pData->GetCurX(); - SCROW nPosY = pData->GetCurY(); - SCTAB nTab = pData->GetTabNo(); + ScDocShell* pDocSh = pData->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); + SCCOL nPosX = pData->GetCurX(); + SCROW nPosY = pData->GetCurY(); + SCTAB nTab = pData->GetTabNo(); BOOL bAutoFilter = FALSE; BOOL bAutoFilterTested = FALSE; @@ -1215,8 +1215,8 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) { case SID_REFRESH_DBAREA: { - // importierte Daten ohne Selektion - // oder Filter,Sortierung,Teilergebis (auch ohne Import) + // importierte Daten ohne Selektion + // oder Filter,Sortierung,Teilergebis (auch ohne Import) BOOL bOk = FALSE; ScDBData* pDBData = pTabViewShell->GetDBData(FALSE,SC_DB_OLD); if (pDBData && pDoc->GetChangeTrack() == NULL) @@ -1255,7 +1255,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) case SCITEM_SUBTDATA: case SID_OPENDLG_PIVOTTABLE: { - //! move ReadOnly check to idl flags + //! move ReadOnly check to idl flags if ( pDocSh->IsReadOnly() || pDoc->GetChangeTrack()!=NULL || GetViewData()->IsMultiMarked() ) @@ -1267,7 +1267,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) case SID_REIMPORT_DATA: { - // nur importierte Daten ohne Selektion + // nur importierte Daten ohne Selektion ScDBData* pDBData = pTabViewShell->GetDBData(FALSE,SC_DB_OLD); if (!pDBData || !pDBData->HasImportParam() || pDBData->HasImportSelection() || pDoc->GetChangeTrack()!=NULL) @@ -1282,13 +1282,13 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE)) rSet.Put(SfxVisibilityItem(nWhich, sal_False)); else - // get state (BoolItem) from SfxViewFrame + // get state (BoolItem) from SfxViewFrame pTabViewShell->GetViewFrame()->GetSlotState( nWhich, NULL, &rSet ); } break; case SID_SBA_BRW_INSERT: { - // SBA will ein BOOL-Item, damit ueberhaupt enabled + // SBA will ein BOOL-Item, damit ueberhaupt enabled BOOL bEnable = TRUE; rSet.Put(SfxBoolItem(nWhich, bEnable)); diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index a57835fdf54d..c56d82691f85 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.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 @@ -53,7 +53,7 @@ #include "autoform.hxx" #include "autofmt.hxx" #include "cellsh.hxx" -#include "attrdlg.hrc" // TP_ALIGNMENT +#include "attrdlg.hrc" // TP_ALIGNMENT #include "inputhdl.hxx" #include "editable.hxx" @@ -61,34 +61,34 @@ #define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() ) -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; } //------------------------------------------------------------------ void ScCellShell::Execute( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); - ScModule* pScMod = SC_MOD(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); + ScModule* pScMod = SC_MOD(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); - if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox if ( IS_EDITMODE() ) { switch ( nSlot ) { - // beim Oeffnen eines Referenz-Dialogs darf die SubShell nicht umgeschaltet werden - // (beim Schliessen des Dialogs wird StopEditShell gerufen) + // beim Oeffnen eines Referenz-Dialogs darf die SubShell nicht umgeschaltet werden + // (beim Schliessen des Dialogs wird StopEditShell gerufen) case SID_OPENDLG_FUNCTION: - // #53318# inplace macht die EditShell Aerger... - //! kann nicht immer umgeschaltet werden ???? + // #53318# inplace macht die EditShell Aerger... + //! kann nicht immer umgeschaltet werden ???? if (!pTabViewShell->GetViewFrame()->GetFrame().IsInPlace()) - pTabViewShell->SetDontSwitch(TRUE); // EditShell nicht abschalten + pTabViewShell->SetDontSwitch(TRUE); // EditShell nicht abschalten // kein break case FID_CELL_FORMAT: @@ -121,16 +121,16 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_STATUS_SELMODE: if ( pReqArgs ) { - /* 0: STD Click hebt Sel auf - * 1: ER Click erweitert Selektion - * 2: ERG Click definiert weitere Selektion + /* 0: STD Click hebt Sel auf + * 1: ER Click erweitert Selektion + * 2: ERG Click definiert weitere Selektion */ UINT16 nMode = ((const SfxUInt16Item&)pReqArgs->Get( nSlot )).GetValue(); switch ( nMode ) { - case 1: nMode = KEY_SHIFT; break; - case 2: nMode = KEY_MOD1; break; // Control-Taste + case 1: nMode = KEY_SHIFT; break; + case 2: nMode = KEY_MOD1; break; // Control-Taste case 0: default: nMode = 0; @@ -140,15 +140,15 @@ void ScCellShell::Execute( SfxRequest& rReq ) } else { - // no arguments (also executed by double click on the status bar controller): - // advance to next selection mode + // no arguments (also executed by double click on the status bar controller): + // advance to next selection mode USHORT nModifiers = pTabViewShell->GetLockedModifiers(); switch ( nModifiers ) { - case KEY_SHIFT: nModifiers = KEY_MOD1; break; // EXT -> ADD - case KEY_MOD1: nModifiers = 0; break; // ADD -> STD - default: nModifiers = KEY_SHIFT; break; // STD -> EXT + case KEY_SHIFT: nModifiers = KEY_MOD1; break; // EXT -> ADD + case KEY_MOD1: nModifiers = 0; break; // ADD -> STD + default: nModifiers = KEY_SHIFT; break; // STD -> EXT } pTabViewShell->LockModifiers( nModifiers ); } @@ -157,14 +157,14 @@ void ScCellShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - // SID_STATUS_SELMODE_NORM wird nicht benutzt ??? + // SID_STATUS_SELMODE_NORM wird nicht benutzt ??? case SID_STATUS_SELMODE_NORM: pTabViewShell->LockModifiers( 0 ); rBindings.Invalidate( SID_STATUS_SELMODE ); break; - // SID_STATUS_SELMODE_ERG / SID_STATUS_SELMODE_ERW als Toggles: + // SID_STATUS_SELMODE_ERG / SID_STATUS_SELMODE_ERW als Toggles: case SID_STATUS_SELMODE_ERG: if ( pTabViewShell->GetLockedModifiers() & KEY_MOD1 ) @@ -197,18 +197,18 @@ void ScCellShell::Execute( SfxRequest& rReq ) ScInputHandler* pHdl = SC_MOD()->GetInputHdl( pTabViewShell ); if ( !pHdl || !pHdl->IsInEnterHandler() ) { - // #101061# UpdateInputHandler is needed after the cell content - // has changed, but if called from EnterHandler, UpdateInputHandler - // will be called later when moving the cursor. + // #101061# UpdateInputHandler is needed after the cell content + // has changed, but if called from EnterHandler, UpdateInputHandler + // will be called later when moving the cursor. pTabViewShell->UpdateInputHandler(); } rReq.Done(); - // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die - // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war - // (GrabFocus passiert in KillEditView) + // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die + // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war + // (GrabFocus passiert in KillEditView) } } break; @@ -264,7 +264,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) aCursorPos.Tab() == GetViewData()->GetTabNo() ) { - SfxStringItem aItem( SID_ENTER_STRING, aString ); + SfxStringItem aItem( SID_ENTER_STRING, aString ); // SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); const SfxPoolItem* aArgs[2]; @@ -294,9 +294,9 @@ void ScCellShell::Execute( SfxRequest& rReq ) } - // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die - // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war - // (GrabFocus passiert in KillEditView) + // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die + // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war + // (GrabFocus passiert in KillEditView) } break; @@ -313,7 +313,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_CONSOLIDATE: { - USHORT nId = ScConsolidateDlgWrapper::GetChildWindowId(); + USHORT nId = ScConsolidateDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -328,18 +328,18 @@ void ScCellShell::Execute( SfxRequest& rReq ) //---------------------------------- // Zellattribute ohne Dialog setzen: //---------------------------------- - SfxItemSet* pEmptySet = + SfxItemSet* pEmptySet = new SfxItemSet( *pReqArgs->GetPool(), ATTR_PATTERN_START, ATTR_PATTERN_END ); - SfxItemSet* pNewSet = + SfxItemSet* pNewSet = new SfxItemSet( *pReqArgs->GetPool(), ATTR_PATTERN_START, ATTR_PATTERN_END ); - const SfxPoolItem* pAttr = NULL; - USHORT nWhich = 0; + const SfxPoolItem* pAttr = NULL; + USHORT nWhich = 0; for ( nWhich=ATTR_PATTERN_START; nWhich<=ATTR_PATTERN_END; nWhich++ ) if ( pReqArgs->GetItemState( nWhich, TRUE, &pAttr ) == SFX_ITEM_SET ) @@ -365,7 +365,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_SOLVE: { - USHORT nId = ScSolverDlgWrapper::GetChildWindowId(); + USHORT nId = ScSolverDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -385,7 +385,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_TABOP: { - USHORT nId = ScTabOpDlgWrapper::GetChildWindowId(); + USHORT nId = ScTabOpDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -438,8 +438,8 @@ void ScCellShell::Execute( SfxRequest& rReq ) aBaseName += ScGlobal::GetRscString(STR_SCENARIO); aBaseName += '_'; - // vorneweg testen, ob der Prefix als gueltig erkannt wird - // wenn nicht, nur doppelte vermeiden + // vorneweg testen, ob der Prefix als gueltig erkannt wird + // wenn nicht, nur doppelte vermeiden BOOL bPrefix = pDoc->ValidTabName( aBaseName ); DBG_ASSERT(bPrefix, "ungueltiger Tabellenname"); @@ -470,8 +470,8 @@ void ScCellShell::Execute( SfxRequest& rReq ) if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, TRUE, &pItem ) == SFX_ITEM_SET ) aArgComment = ((const SfxStringItem*)pItem)->GetValue(); - aColor = Color( COL_LIGHTGRAY ); // Default - nFlags = 0; // nicht-TwoWay + aColor = Color( COL_LIGHTGRAY ); // Default + nFlags = 0; // nicht-TwoWay pTabViewShell->MakeScenario( aArgName, aArgComment, aColor, nFlags ); if( ! rReq.IsAPI() ) @@ -530,8 +530,8 @@ void ScCellShell::Execute( SfxRequest& rReq ) else { ScViewData* pData = GetViewData(); - FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric(); - USHORT nCurHeight = pData->GetDocument()-> + FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric(); + USHORT nCurHeight = pData->GetDocument()-> GetRowHeight( pData->GetCurY(), pData->GetTabNo() ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -621,9 +621,9 @@ void ScCellShell::Execute( SfxRequest& rReq ) } else { - FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric(); + FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric(); ScViewData* pData = GetViewData(); - USHORT nCurHeight = pData->GetDocument()-> + USHORT nCurHeight = pData->GetDocument()-> GetColWidth( pData->GetCurX(), pData->GetTabNo() ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -864,7 +864,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) else if (pTabViewShell->HasPaintBrush()) pTabViewShell->ResetBrushDocument(); // abort format paint brush else if (pTabViewShell->HasHintWindow()) - pTabViewShell->RemoveHintWindow(); // Eingabemeldung abschalten + pTabViewShell->RemoveHintWindow(); // Eingabemeldung abschalten else if( ScViewUtil::IsFullScreen( *pTabViewShell ) ) ScViewUtil::SetFullScreen( *pTabViewShell, false ); else @@ -880,7 +880,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) //} } -// SetSumAssignMode(); //ScInputWindow +// SetSumAssignMode(); //ScInputWindow } break; @@ -898,7 +898,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_CONDFRMT: { - USHORT nId = ScCondFormatDlgWrapper::GetChildWindowId(); + USHORT nId = ScCondFormatDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -906,7 +906,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - // ---------------------------------------------------------------- + // ---------------------------------------------------------------- case FID_INPUTLINE_STATUS: DBG_ERROR("Execute von InputLine-Status"); @@ -914,7 +914,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_STATUS_DOCPOS: // Launch navigator. - GetViewData()->GetDispatcher().Execute( + GetViewData()->GetDispatcher().Execute( SID_NAVIGATOR, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD ); break; diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index f5c4e70ae98a..894bee330330 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.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 @@ -61,16 +61,16 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) { ScViewData* pData = GetViewData(); - ScTabViewShell* pTabViewShell = pData->GetViewShell(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); - SCsCOLROW nRepeat = 1; - BOOL bSel = FALSE; - BOOL bKeep = FALSE; + ScTabViewShell* pTabViewShell = pData->GetViewShell(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlotId = rReq.GetSlot(); + SCsCOLROW nRepeat = 1; + BOOL bSel = FALSE; + BOOL bKeep = FALSE; if ( pReqArgs != NULL ) { - const SfxPoolItem* pItem; + const SfxPoolItem* pItem; if( IS_AVAILABLE( FN_PARAM_1, &pItem ) ) nRepeat = static_cast<SCsCOLROW>(((const SfxInt16Item*)pItem)->GetValue()); if( IS_AVAILABLE( FN_PARAM_2, &pItem ) ) @@ -78,11 +78,11 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) } else { - // evaluate locked selection mode + // evaluate locked selection mode USHORT nLocked = pTabViewShell->GetLockedModifiers(); if ( nLocked & KEY_SHIFT ) - bSel = TRUE; // EXT + bSel = TRUE; // EXT else if ( nLocked & KEY_MOD1 ) { // ADD mode: keep the selection, start a new block when marking with shift again @@ -140,7 +140,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) SCsCOLROW nRTLSign = 1; if ( pData->GetDocument()->IsLayoutRTL( pData->GetTabNo() ) ) { - //! evaluate cursor movement option? + //! evaluate cursor movement option? nRTLSign = -1; } @@ -152,7 +152,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) switch ( nSlotId ) { case SID_CURSORDOWN: - pTabViewShell->MoveCursorRel( 0, nRepeat, SC_FOLLOW_LINE, bSel, bKeep ); + pTabViewShell->MoveCursorRel( 0, nRepeat, SC_FOLLOW_LINE, bSel, bKeep ); break; case SID_CURSORBLKDOWN: @@ -160,7 +160,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) break; case SID_CURSORUP: - pTabViewShell->MoveCursorRel( 0, -nRepeat, SC_FOLLOW_LINE, bSel, bKeep ); + pTabViewShell->MoveCursorRel( 0, -nRepeat, SC_FOLLOW_LINE, bSel, bKeep ); break; case SID_CURSORBLKUP: @@ -176,7 +176,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) break; case SID_CURSORRIGHT: - pTabViewShell->MoveCursorRel( static_cast<SCsCOL>(nRepeat * nRTLSign), 0, SC_FOLLOW_LINE, bSel, bKeep ); + pTabViewShell->MoveCursorRel( static_cast<SCsCOL>(nRepeat * nRTLSign), 0, SC_FOLLOW_LINE, bSel, bKeep ); break; case SID_CURSORBLKRIGHT: @@ -184,11 +184,11 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) break; case SID_CURSORPAGEDOWN: - pTabViewShell->MoveCursorPage( 0, nRepeat, SC_FOLLOW_FIX, bSel, bKeep ); + pTabViewShell->MoveCursorPage( 0, nRepeat, SC_FOLLOW_FIX, bSel, bKeep ); break; case SID_CURSORPAGEUP: - pTabViewShell->MoveCursorPage( 0, -nRepeat, SC_FOLLOW_FIX, bSel, bKeep ); + pTabViewShell->MoveCursorPage( 0, -nRepeat, SC_FOLLOW_FIX, bSel, bKeep ); break; case SID_CURSORPAGERIGHT_: //XXX !!! @@ -279,7 +279,7 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq ) void ScCellShell::ExecuteMove( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); USHORT nSlotId = rReq.GetSlot(); if(nSlotId != SID_CURSORTOPOFSCREEN && nSlotId != SID_CURSORENDOFSCREEN) @@ -296,8 +296,8 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) pTabViewShell->SelectNextTab( -1, (nSlotId == SID_PREV_TABLE_SEL) ); break; - // Cursorbewegungen in Bloecken gehen nicht von Basic aus, - // weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert + // Cursorbewegungen in Bloecken gehen nicht von Basic aus, + // weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert case SID_NEXT_UNPROTECT: pTabViewShell->FindNextUnprot( FALSE, !rReq.IsAPI() ); @@ -379,13 +379,13 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) void ScCellShell::ExecutePageSel( SfxRequest& rReq ) { - USHORT nSlotId = rReq.GetSlot(); + USHORT nSlotId = rReq.GetSlot(); switch ( nSlotId ) { - case SID_CURSORHOME_SEL: rReq.SetSlot( SID_CURSORHOME ); break; - case SID_CURSOREND_SEL: rReq.SetSlot( SID_CURSOREND ); break; - case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break; - case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break; + case SID_CURSORHOME_SEL: rReq.SetSlot( SID_CURSORHOME ); break; + case SID_CURSOREND_SEL: rReq.SetSlot( SID_CURSOREND ); break; + case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break; + case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break; default: DBG_ERROR("Unbekannte Message bei ViewShell (ExecutePageSel)"); return; @@ -396,25 +396,25 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq ) void ScCellShell::ExecutePage( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); - BOOL bSel = FALSE; - BOOL bKeep = FALSE; + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlotId = rReq.GetSlot(); + BOOL bSel = FALSE; + BOOL bKeep = FALSE; if ( pReqArgs != NULL ) { - const SfxPoolItem* pItem; + const SfxPoolItem* pItem; if( IS_AVAILABLE( FN_PARAM_2, &pItem ) ) bSel = ((const SfxBoolItem*)pItem)->GetValue(); } else { - // evaluate locked selection mode + // evaluate locked selection mode USHORT nLocked = pTabViewShell->GetLockedModifiers(); if ( nLocked & KEY_SHIFT ) - bSel = TRUE; // EXT + bSel = TRUE; // EXT else if ( nLocked & KEY_MOD1 ) { // ADD mode: keep the selection, start a new block when marking with shift again diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index c94e08803594..4f4bc7a4db1d 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.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 @@ -117,7 +117,7 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize ) { USHORT nSizeTwips; ScSizeMode eMode = SC_SIZE_DIRECT; - if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel) + if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel) if ( nNewSize == HDR_SIZE_OPTIMUM ) { @@ -128,7 +128,7 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize ) nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTX() ); ScMarkData& rMark = pViewData->GetMarkData(); -// SCTAB nTab = pViewData->GetTabNo(); +// SCTAB nTab = pViewData->GetTabNo(); SCCOLROW* pRanges = new SCCOLROW[MAXCOL+1]; SCCOL nRangeCnt = 0; @@ -187,19 +187,19 @@ void ScColBar::SelectWindow() { ScTabViewShell* pViewSh = pViewData->GetViewShell(); - pViewSh->SetActive(); // Appear und SetViewFrame + pViewSh->SetActive(); // Appear und SetViewFrame pViewSh->DrawDeselectAll(); ScSplitPos eActive = pViewData->GetActivePart(); if (eWhich==SC_SPLIT_LEFT) { - if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_TOPLEFT; - if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_BOTTOMLEFT; + if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_TOPLEFT; + if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_BOTTOMLEFT; } else { - if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_TOPRIGHT; - if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_BOTTOMRIGHT; + if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_TOPRIGHT; + if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_BOTTOMRIGHT; } pViewSh->ActivatePart( eActive ); @@ -235,7 +235,7 @@ String ScColBar::GetDragHelp( long nVal ) return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_WIDTH) ); } -BOOL ScColBar::IsLayoutRTL() // overloaded only for columns +BOOL ScColBar::IsLayoutRTL() // overloaded only for columns { return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } @@ -283,7 +283,7 @@ void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize ) { USHORT nSizeTwips; ScSizeMode eMode = SC_SIZE_DIRECT; - if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel) + if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel) if ( nNewSize == HDR_SIZE_OPTIMUM ) { @@ -294,7 +294,7 @@ void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize ) nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTY() ); ScMarkData& rMark = pViewData->GetMarkData(); -// SCTAB nTab = pViewData->GetTabNo(); +// SCTAB nTab = pViewData->GetTabNo(); SCCOLROW* pRanges = new SCCOLROW[MAXROW+1]; SCROW nRangeCnt = 0; @@ -353,19 +353,19 @@ void ScRowBar::SelectWindow() { ScTabViewShell* pViewSh = pViewData->GetViewShell(); - pViewSh->SetActive(); // Appear und SetViewFrame + pViewSh->SetActive(); // Appear und SetViewFrame pViewSh->DrawDeselectAll(); ScSplitPos eActive = pViewData->GetActivePart(); if (eWhich==SC_SPLIT_TOP) { - if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_TOPLEFT; - if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_TOPRIGHT; + if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_TOPLEFT; + if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_TOPRIGHT; } else { - if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_BOTTOMLEFT; - if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_BOTTOMRIGHT; + if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_BOTTOMLEFT; + if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_BOTTOMRIGHT; } pViewSh->ActivatePart( eActive ); @@ -401,7 +401,7 @@ String ScRowBar::GetDragHelp( long nVal ) return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_HEIGHT) ); } -// GetHiddenCount ist nur fuer Zeilen ueberladen +// GetHiddenCount ist nur fuer Zeilen ueberladen SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo ) { @@ -410,7 +410,7 @@ SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo ) return pDoc->GetHiddenRowCount( nEntryNo, nTab ); } -BOOL ScRowBar::IsMirrored() // overloaded only for rows +BOOL ScRowBar::IsMirrored() // overloaded only for rows { return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 6b95b3b4ff8c..f9e854e3467d 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.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 @@ -63,7 +63,7 @@ ScDBFunc::~ScDBFunc() } // -// Hilfsfunktionen +// Hilfsfunktionen // void ScDBFunc::GotoDBArea( const String& rDBName ) @@ -89,7 +89,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName ) SetTabNo( nTab ); MoveCursorAbs( nStartCol, nStartRow, ScFollowMode( SC_FOLLOW_JUMP ), - FALSE, FALSE ); // bShift,bControl + FALSE, FALSE ); // bShift,bControl DoneBlockMode(); InitBlockMode( nStartCol, nStartRow, nTab ); MarkCursor( nEndCol, nEndRow, nTab ); @@ -98,7 +98,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName ) } } -// aktuellen Datenbereich fuer Sortieren / Filtern suchen +// aktuellen Datenbereich fuer Sortieren / Filtern suchen ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection eSel, bool /*bShrinkToData*/, bool bExpandRows ) { @@ -111,20 +111,20 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e bool bShrinkColumnsOnly = false; if (eSel == SC_DBSEL_ROW_DOWN) { - // Don't alter row range, additional rows may have been selected on + // Don't alter row range, additional rows may have been selected on // purpose to append data, or to have a fake header row. bShrinkColumnsOnly = true; - // Select further rows only if only one row or a portion thereof is + // Select further rows only if only one row or a portion thereof is // selected. if (aRange.aStart.Row() != aRange.aEnd.Row()) { - // If an area is selected shrink that to the actual used + // If an area is selected shrink that to the actual used // columns, don't draw filter buttons for empty columns. eSel = SC_DBSEL_SHRINK_TO_USED_DATA; } else if (aRange.aStart.Col() == aRange.aEnd.Col()) { - // One cell only, if it is not marked obtain entire used data + // One cell only, if it is not marked obtain entire used data // area. const ScMarkData& rMarkData = GetViewData()->GetMarkData(); if (!(rMarkData.IsMarked() || rMarkData.IsMultiMarked())) @@ -155,10 +155,7 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e ScDocument* pDoc = pDocSh->GetDocument(); SCCOL nCol1 = aRange.aStart.Col(), nCol2 = aRange.aEnd.Col(); SCROW nRow1 = aRange.aStart.Row(), nRow2 = aRange.aEnd.Row(); - bool bShrunk; - pDoc->ShrinkToUsedDataArea( bShrunk, aRange.aStart.Tab(), - nCol1, nRow1, nCol2, nRow2, bShrinkColumnsOnly); - if (bShrunk) + if (pDoc->ShrinkToUsedDataArea( aRange.aStart.Tab(), nCol1, nRow1, nCol2, nRow2, bShrinkColumnsOnly)) { aRange.aStart.SetCol(nCol1); aRange.aEnd.SetCol(nCol2); @@ -196,7 +193,7 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e return pData; } -// Datenbankbereiche aendern (Dialog) +// Datenbankbereiche aendern (Dialog) void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList ) { @@ -222,18 +219,18 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() ); - // Targets am SBA abmelden nicht mehr noetig + // Targets am SBA abmelden nicht mehr noetig } } if (bRecord) pUndoColl = new ScDBCollection( *pOldColl ); - // neue Targets am SBA anmelden nicht mehr noetig + // neue Targets am SBA anmelden nicht mehr noetig - pDoc->CompileDBFormula( TRUE ); // CreateFormulaString + pDoc->CompileDBFormula( TRUE ); // CreateFormulaString pDoc->SetDBCollection( new ScDBCollection( rNewColl ) ); - pDoc->CompileDBFormula( FALSE ); // CompileFormulaString + pDoc->CompileDBFormula( FALSE ); // CompileFormulaString pOldColl = NULL; pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID ); aModificator.SetDocumentModified(); @@ -248,7 +245,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& } // -// wirkliche Funktionen +// wirkliche Funktionen // // Sortieren @@ -270,13 +267,13 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, BOOL bRecord ) pDBData->GetSubTotalParam( aSubTotalParam ); if (aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly) { - // Subtotals wiederholen, mit neuer Sortierung + // Subtotals wiederholen, mit neuer Sortierung DoSubTotals( aSubTotalParam, bRecord, &rSortParam ); } else { - Sort( rSortParam, bRecord ); // nur sortieren + Sort( rSortParam, bRecord ); // nur sortieren } } @@ -288,7 +285,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint ) BOOL bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, FALSE ); if ( bSuccess && !rSortParam.bInplace ) { - // Ziel markieren + // Ziel markieren ScRange aDestRange( rSortParam.nDestCol, rSortParam.nDestRow, rSortParam.nDestTab, rSortParam.nDestCol + rSortParam.nCol2 - rSortParam.nCol1, rSortParam.nDestRow + rSortParam.nRow2 - rSortParam.nRow1, @@ -297,7 +294,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint ) } } -// Filtern +// Filtern void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, BOOL bRecord ) { @@ -311,7 +308,7 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource BOOL bCopy = !rQueryParam.bInplace; if (bCopy) { - // Zielbereich markieren (DB-Bereich wurde ggf. angelegt) + // Zielbereich markieren (DB-Bereich wurde ggf. angelegt) ScDocument* pDoc = pDocSh->GetDocument(); ScDBData* pDestData = pDoc->GetDBAtCursor( rQueryParam.nDestCol, rQueryParam.nDestRow, @@ -334,18 +331,18 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource } } -// Autofilter-Knoepfe ein-/ausblenden +// Autofilter-Knoepfe ein-/ausblenden void ScDBFunc::ToggleAutoFilter() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDocShellModificator aModificator( *pDocSh ); - ScQueryParam aParam; - ScDocument* pDoc = GetViewData()->GetDocument(); - ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, false, true); + ScQueryParam aParam; + ScDocument* pDoc = GetViewData()->GetDocument(); + ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, false, true); - pDBData->SetByRow( TRUE ); //! Undo, vorher abfragen ?? + pDBData->SetByRow( TRUE ); //! Undo, vorher abfragen ?? pDBData->GetQueryParam( aParam ); @@ -353,11 +350,11 @@ void ScDBFunc::ToggleAutoFilter() SCROW nRow = aParam.nRow1; SCTAB nTab = GetViewData()->GetTabNo(); INT16 nFlag; - BOOL bHasAuto = TRUE; - BOOL bHeader = pDBData->HasHeader(); - BOOL bPaint = FALSE; + BOOL bHasAuto = TRUE; + BOOL bHeader = pDBData->HasHeader(); + BOOL bPaint = FALSE; - //! stattdessen aus DB-Bereich abfragen? + //! stattdessen aus DB-Bereich abfragen? for (nCol=aParam.nCol1; nCol<=aParam.nCol2 && bHasAuto; nCol++) { @@ -368,9 +365,9 @@ void ScDBFunc::ToggleAutoFilter() bHasAuto = FALSE; } - if (bHasAuto) // aufheben + if (bHasAuto) // aufheben { - // Filterknoepfe ausblenden + // Filterknoepfe ausblenden for (nCol=aParam.nCol1; nCol<=aParam.nCol2; nCol++) { @@ -391,7 +388,7 @@ void ScDBFunc::ToggleAutoFilter() pDBData->SetAutoFilter(FALSE); - // Filter aufheben (incl. Paint / Undo) + // Filter aufheben (incl. Paint / Undo) SCSIZE nEC = aParam.GetEntryCount(); for (SCSIZE i=0; i<nEC; i++) @@ -403,7 +400,7 @@ void ScDBFunc::ToggleAutoFilter() bPaint = TRUE; } - else // Filterknoepfe einblenden + else // Filterknoepfe einblenden { if ( !pDoc->IsBlockEmpty( nTab, aParam.nCol1, aParam.nRow1, @@ -412,11 +409,11 @@ void ScDBFunc::ToggleAutoFilter() if (!bHeader) { if ( MessBox( GetViewData()->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), - ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc" - ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile? + ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc" + ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile? ).Execute() == RET_YES ) { - pDBData->SetHeader( TRUE ); //! Undo ?? + pDBData->SetHeader( TRUE ); //! Undo ?? bHeader = TRUE; } } @@ -456,7 +453,7 @@ void ScDBFunc::ToggleAutoFilter() } } -// nur ausblenden, keine Daten veraendern +// nur ausblenden, keine Daten veraendern void ScDBFunc::HideAutoFilter() { @@ -495,7 +492,7 @@ void ScDBFunc::HideAutoFilter() rBindings.Invalidate( SID_AUTOFILTER_HIDE ); } -// Re-Import +// Re-Import BOOL ScDBFunc::ImportData( const ScImportParam& rParam, BOOL bRecord ) { diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx index f789daea996d..15e5f20c7ac4 100644 --- a/sc/source/ui/view/dbfunc2.cxx +++ b/sc/source/ui/view/dbfunc2.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/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 2c2df72120fa..7381e3599561 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.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 @@ -108,10 +108,10 @@ using ::std::hash_set; //================================================================== // -// Outliner +// Outliner // -// Outline-Gruppierung erzeugen +// Outline-Gruppierung erzeugen void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord ) { @@ -126,7 +126,7 @@ void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// Outline-Gruppierung loeschen +// Outline-Gruppierung loeschen void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord ) { @@ -141,7 +141,7 @@ void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// Menue-Status: Outlines loeschen +// Menue-Status: Outlines loeschen void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow ) { @@ -165,9 +165,9 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow ) BOOL bColMarked = ( nStartRow == 0 && nEndRow == MAXROW ); BOOL bRowMarked = ( nStartCol == 0 && nEndCol == MAXCOL ); - // Spalten + // Spalten - if ( !bRowMarked || bColMarked ) // nicht wenn ganze Zeilen markiert + if ( !bRowMarked || bColMarked ) // nicht wenn ganze Zeilen markiert { pArray = pTable->GetColArray(); ScSubOutlineIterator aColIter( pArray ); @@ -180,9 +180,9 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow ) } } - // Zeilen + // Zeilen - if ( !bColMarked || bRowMarked ) // nicht wenn ganze Spalten markiert + if ( !bColMarked || bRowMarked ) // nicht wenn ganze Spalten markiert { pArray = pTable->GetRowArray(); ScSubOutlineIterator aRowIter( pArray ); @@ -215,12 +215,12 @@ void ScDBFunc::RemoveAllOutlines( BOOL bRecord ) UpdateScrollBars(); } -// Auto-Outlines +// Auto-Outlines void ScDBFunc::AutoOutline( BOOL bRecord ) { SCTAB nTab = GetViewData()->GetTabNo(); - ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab ); // ganze Tabelle, wenn nichts markiert + ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab ); // ganze Tabelle, wenn nichts markiert ScMarkData& rMark = GetViewData()->GetMarkData(); if ( rMark.IsMarked() || rMark.IsMultiMarked() ) { @@ -233,7 +233,7 @@ void ScDBFunc::AutoOutline( BOOL bRecord ) aFunc.AutoOutline( aRange, bRecord, FALSE ); } -// Outline-Ebene auswaehlen +// Outline-Ebene auswaehlen void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPaint ) { @@ -249,7 +249,7 @@ void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPa UpdateScrollBars(); } -// einzelne Outline-Gruppe einblenden +// einzelne Outline-Gruppe einblenden void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint ) { @@ -265,7 +265,7 @@ void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR UpdateScrollBars(); } -// einzelne Outline-Gruppe ausblenden +// einzelne Outline-Gruppe ausblenden void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint ) { @@ -281,7 +281,7 @@ void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR UpdateScrollBars(); } -// Menue-Status: markierten Bereich ein-/ausblenden +// Menue-Status: markierten Bereich ein-/ausblenden BOOL ScDBFunc::OutlinePossible(BOOL bHide) { @@ -306,7 +306,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide) SCCOLROW nStart; SCCOLROW nEnd; - // Spalten + // Spalten pArray = pTable->GetColArray(); ScSubOutlineIterator aColIter( pArray ); @@ -328,7 +328,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide) } } - // Zeilen + // Zeilen pArray = pTable->GetRowArray(); ScSubOutlineIterator aRowIter( pArray ); @@ -355,7 +355,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide) return bEnable; } -// markierten Bereich einblenden +// markierten Bereich einblenden void ScDBFunc::ShowMarkedOutlines( BOOL bRecord ) { @@ -374,7 +374,7 @@ void ScDBFunc::ShowMarkedOutlines( BOOL bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// markierten Bereich ausblenden +// markierten Bereich ausblenden void ScDBFunc::HideMarkedOutlines( BOOL bRecord ) { @@ -393,16 +393,16 @@ void ScDBFunc::HideMarkedOutlines( BOOL bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- // -// Teilergebnisse +// Teilergebnisse // void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, const ScSortParam* pForceNewSort ) { - BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen + BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); @@ -429,7 +429,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, if (pDoc->HasAttrib( rParam.nCol1, rParam.nRow1+1, nTab, rParam.nCol2, rParam.nRow2, nTab, HASATTR_MERGED | HASATTR_OVERLAPPED )) { - ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen + ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen return; } @@ -451,14 +451,14 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, { ScDocShellModificator aModificator( *pDocSh ); - ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert - ScDocument* pUndoDoc = NULL; - ScOutlineTable* pUndoTab = NULL; - ScRangeName* pUndoRange = NULL; + ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert + ScDocument* pUndoDoc = NULL; + ScOutlineTable* pUndoTab = NULL; + ScRangeName* pUndoRange = NULL; ScDBCollection* pUndoDB = NULL; - SCTAB nTabCount = 0; // fuer Referenz-Undo + SCTAB nTabCount = 0; // fuer Referenz-Undo - if (bRecord) // alte Daten sichern + if (bRecord) // alte Daten sichern { BOOL bOldFilter = bDo && rParam.bDoSort; @@ -469,7 +469,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, { pUndoTab = new ScOutlineTable( *pTable ); - SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus + SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus SCCOLROW nOutStartRow; SCCOLROW nOutEndCol; SCCOLROW nOutEndRow; @@ -483,15 +483,15 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, else pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter ); - // Datenbereich sichern - incl. Filter-Ergebnis + // Datenbereich sichern - incl. Filter-Ergebnis pDoc->CopyToDocument( 0,rParam.nRow1+1,nTab, MAXCOL,rParam.nRow2,nTab, IDF_ALL, FALSE, pUndoDoc ); - // alle Formeln wegen Referenzen + // alle Formeln wegen Referenzen pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc ); - // DB- und andere Bereiche + // DB- und andere Bereiche ScRangeName* pDocRange = pDoc->GetRangeName(); if (pDocRange->GetCount()) pUndoRange = new ScRangeName( *pDocRange ); @@ -500,10 +500,10 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, pUndoDB = new ScDBCollection( *pDocDB ); } -// pDoc->SetOutlineTable( nTab, NULL ); - ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab ); +// pDoc->SetOutlineTable( nTab, NULL ); + ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab ); if (pOut) - pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen + pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen if (rParam.bReplace) pDoc->RemoveSubTotals( nTab, aNewParam ); @@ -515,8 +515,8 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, { pDBData->SetArea( nTab, aNewParam.nCol1,aNewParam.nRow1, aNewParam.nCol2,aNewParam.nRow2 ); - // Teilergebnis-Felder vor die Sortierung setzen - // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden) + // Teilergebnis-Felder vor die Sortierung setzen + // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden) ScSortParam aOldSort; pDBData->GetSortParam( aOldSort ); @@ -532,7 +532,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, if (bRecord) { -// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL; +// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL; pDocSh->GetUndoManager()->AddUndoAction( new ScUndoSubTotals( pDocSh, nTab, rParam, aNewParam.nRow2, @@ -567,7 +567,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, } // -// Consolidate +// Consolidate // void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, BOOL bRecord ) @@ -578,7 +578,7 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, BOOL bRecord ) } // -// Pivot +// Pivot // String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber ) @@ -591,8 +591,8 @@ String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber ) bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, BOOL bNewTable, const ScDPObject& rSource, BOOL bApi ) { - // #70096# error message if no fields are set - // this must be removed when drag&drop of fields from a toolbox is available + // #70096# error message if no fields are set + // this must be removed when drag&drop of fields from a toolbox is available if ( rData.IsEmpty() && !bApi ) { @@ -600,8 +600,8 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, return false; } - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = GetViewData()->GetDocument(); BOOL bUndo(pDoc->IsUndoEnabled()); ScRange aDestRange = rDest; @@ -658,12 +658,12 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, else aObj.SetSaveData( rData ); - BOOL bAllowMove = ( pDPObj != NULL ); // allow re-positioning when editing existing table + BOOL bAllowMove = ( pDPObj != NULL ); // allow re-positioning when editing existing table ScDBDocFunc aFunc( *pDocSh ); bool bSuccess = aFunc.DataPilotUpdate( pDPObj, &aObj, TRUE, FALSE, bAllowMove ); - CursorPosChanged(); // shells may be switched + CursorPosChanged(); // shells may be switched if ( bNewTable ) { @@ -676,16 +676,16 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, void ScDBFunc::DeletePivotTable() { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); - ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(), + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); + ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); if ( pDPObj ) { ScDBDocFunc aFunc( *pDocSh ); aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, FALSE ); - CursorPosChanged(); // shells may be switched + CursorPosChanged(); // shells may be switched } else ErrorMessage(STR_PIVOT_NOTFOUND); @@ -718,9 +718,9 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, ScDBDocFunc aFunc( * pDocSh ); if ( !aFunc.DataPilotUpdate( (*pDPCollection)[i], (*pDPCollection)[i], bRecord, bApi ) ) break; - } + } } - + return nErrId; } @@ -730,11 +730,11 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, ULONG ScDBFunc::RecalcPivotTable() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); - // old pivot not used any more + // old pivot not used any more - ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(), + ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); if ( pDPObj ) @@ -1519,7 +1519,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString ) if (rString.Len()) { if (rString.EqualsIgnoreCaseAscii(aDimName)) - { + { pDim->RemoveLayoutName(); bChange = true; } @@ -1765,7 +1765,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 // We need to run this to get all members later. if ( pUserListId ) pDPObj->BuildAllDimensionMembers(); - + USHORT nOrientation; long nDimIndex = pDPObj->GetHeaderDim(rPos, nOrientation); if (nDimIndex < 0) @@ -1814,13 +1814,13 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 ScUserList* pUserList = ScGlobal::GetUserList(); if (!pUserList) return false; - + { sal_uInt16 n = pUserList->GetCount(); if (!n || *pUserListId >= n) return false; } - + ScUserListData* pData = static_cast<ScUserListData*>((*pUserList)[*pUserListId]); if (pData) { @@ -1841,7 +1841,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 vector<OUString> aRankedNames(nMemberCount); sal_uInt16 nCurStrId = 0; - for (list<OUString>::const_iterator itr = aMembers.begin(), itrEnd = aMembers.end(); + for (list<OUString>::const_iterator itr = aMembers.begin(), itrEnd = aMembers.end(); itr != itrEnd; ++itr) { OUString aName = *itr; @@ -2201,7 +2201,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet } // -// DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen +// DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen // void ScDBFunc::RepeatDB( BOOL bRecord ) @@ -2249,7 +2249,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) SCROW nEndRow; pDBData->GetArea( nDummy, nStartCol, nStartRow, nEndCol, nEndRow ); - //! Undo nur benoetigte Daten ? + //! Undo nur benoetigte Daten ? ScDocument* pUndoDoc = NULL; ScOutlineTable* pUndoTab = NULL; @@ -2265,7 +2265,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) { pUndoTab = new ScOutlineTable( *pTable ); - SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus + SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus SCCOLROW nOutStartRow; SCCOLROW nOutEndCol; SCCOLROW nOutEndRow; @@ -2279,13 +2279,13 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) else pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE ); - // Datenbereich sichern - incl. Filter-Ergebnis + // Datenbereich sichern - incl. Filter-Ergebnis pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc ); - // alle Formeln wegen Referenzen + // alle Formeln wegen Referenzen pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc ); - // DB- und andere Bereiche + // DB- und andere Bereiche ScRangeName* pDocRange = pDoc->GetRangeName(); if (pDocRange->GetCount()) pUndoRange = new ScRangeName( *pDocRange ); @@ -2296,20 +2296,20 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) if (bSort && bSubTotal) { - // Sortieren ohne SubTotals + // Sortieren ohne SubTotals - aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt + aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt DoSubTotals( aSubTotalParam, FALSE ); } if (bSort) { - pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben + pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben Sort( aSortParam, FALSE, FALSE); } if (bQuery) { - pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben + pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben ScRange aAdvSource; if (pDBData->GetAdvancedQuerySource(aAdvSource)) { @@ -2318,17 +2318,17 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) aAdvSource.aEnd.Col(), aAdvSource.aEnd.Row(), aAdvSource.aStart.Tab(), aQueryParam ); Query( aQueryParam, &aAdvSource, FALSE ); - } + } else Query( aQueryParam, NULL, FALSE ); - // bei nicht-inplace kann die Tabelle umgestellt worden sein + // bei nicht-inplace kann die Tabelle umgestellt worden sein if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab ) SetTabNo( nTab ); } if (bSubTotal) { - pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben + pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben aSubTotalParam.bRemoveOnly = FALSE; DoSubTotals( aSubTotalParam, FALSE ); } @@ -2367,7 +2367,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) GetViewData()->GetDocShell()->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE ); } - else // "Keine Operationen auszufuehren" + else // "Keine Operationen auszufuehren" ErrorMessage(STR_MSSG_REPEATDB_0); } diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index a96dc2970875..c8ecbbc76382 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.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/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index 36615b14525d..d85c0ccbbb70 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.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/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index 4270170e099a..82fae44d1e4c 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.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 @@ -72,7 +72,7 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, { SCROW nLastRow = nRow; if (pDoc->RowHidden(nRow, nTab, NULL, &nLastRow)) - { + { nRow = nLastRow; continue; } @@ -85,8 +85,8 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, MapMode aHMMMode( MAP_100TH_MM, Point(), rZoomX, rZoomY ); Point aPixelLog = pDev->PixelToLogic( Point( nPixelX,nPixelY ), aHMMMode ); - // Fraction(double) ctor can be used here (and avoid overflows of PixelLog * Zoom) - // because ReduceInaccurate is called later anyway. + // Fraction(double) ctor can be used here (and avoid overflows of PixelLog * Zoom) + // because ReduceInaccurate is called later anyway. if ( aPixelLog.X() && nTwipsX ) rScaleX = Fraction( ((double)aPixelLog.X()) * @@ -106,8 +106,8 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, else rScaleY = Fraction( 1, 1 ); - // 25 bits of accuracy are needed to always hit the right part of - // cells in the last rows (was 17 before 1M rows). + // 25 bits of accuracy are needed to always hit the right part of + // cells in the last rows (was 17 before 1M rows). rScaleX.ReduceInaccurate( 25 ); rScaleY.ReduceInaccurate( 25 ); } diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index c047fcdbd6fe..0f44641f33ca 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.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,17 +44,17 @@ void ScDrawView::UpdateBrowser() { - // VC's und den Browser dazu gibts nicht mehr... + // VC's und den Browser dazu gibts nicht mehr... } void ScDrawView::VCAddWin( Window* /* pWin */ ) { - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden + // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } void ScDrawView::VCRemoveWin( Window* /* pWin */ ) { - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden + // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 3ef141f2c526..3c9fb33522e0 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.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 @@ -48,7 +48,7 @@ #include "docsh.hxx" void ScIMapDlgSet( const Graphic& rGraphic, const ImageMap* pImageMap, - const TargetList* pTargetList, void* pEditingObj ); // imapwrap + const TargetList* pTargetList, void* pEditingObj ); // imapwrap USHORT ScIMapChildWindowId(); // STATIC DATA ----------------------------------------------------------- @@ -121,7 +121,7 @@ ScAnchorType ScDrawView::GetAnchor() const void __EXPORT ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { - if (rHint.ISA(ScTabDeletedHint)) // Tabelle geloescht + if (rHint.ISA(ScTabDeletedHint)) // Tabelle geloescht { SCTAB nDelTab = ((ScTabDeletedHint&)rHint).GetTab(); if (ValidTab(nDelTab)) @@ -131,7 +131,7 @@ void __EXPORT ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) HideSdrPage(); } } - else if (rHint.ISA(ScTabSizeChangedHint)) // Groesse geaendert + else if (rHint.ISA(ScTabSizeChangedHint)) // Groesse geaendert { if ( nTab == ((ScTabSizeChangedHint&)rHint).GetTab() ) UpdateWorkArea(); @@ -146,8 +146,8 @@ void ScDrawView::UpdateIMap( SdrObject* pObj ) pViewData->GetViewShell()->GetViewFrame()->HasChildWindow( ScIMapChildWindowId() ) && pObj && ( pObj->ISA(SdrGrafObj) || pObj->ISA(SdrOle2Obj) ) ) { - Graphic aGraphic; - TargetList aTargetList; + Graphic aGraphic; + TargetList aTargetList; ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo( pObj ); const ImageMap* pImageMap = NULL; if ( pIMapInfo ) @@ -166,7 +166,7 @@ void ScDrawView::UpdateIMap( SdrObject* pObj ) aGraphic = *pGraphic; } - ScIMapDlgSet( aGraphic, pImageMap, &aTargetList, pObj ); // aus imapwrap + ScIMapDlgSet( aGraphic, pImageMap, &aTargetList, pObj ); // aus imapwrap // TargetListe kann von uns wieder geloescht werden String* pEntry = aTargetList.First(); diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 128ca94be950..8a848fbc341c 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.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,7 +50,7 @@ #include "document.hxx" #include "docsh.hxx" #include "drwtrans.hxx" -#include "transobj.hxx" // SetDrawClipDoc +#include "transobj.hxx" // SetDrawClipDoc #include "drawutil.hxx" #include "scmod.hxx" #include "globstr.hrc" @@ -64,7 +64,7 @@ Point aDragStartDiff; // ----------------------------------------------------------------------- -//! welche Funktionen aus drawview/drawvie4 muessen wirklich ohne Optimierung sein? +//! welche Funktionen aus drawview/drawvie4 muessen wirklich ohne Optimierung sein? #ifdef _MSC_VER #pragma optimize ( "", off ) @@ -125,17 +125,17 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos ) ScDocShellRef aDragShellRef; if (bAnyOle) { - aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately + aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately aDragShellRef->DoInitNew(NULL); } ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); SdrModel* pModel = GetAllMarkedModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); - // Charts now always copy their data in addition to the source reference, so - // there's no need to call SchDLL::Update for the charts in the clipboard doc. - // Update with the data (including NumberFormatter) from the live document would - // also store the NumberFormatter in the clipboard chart (#88749#) + // Charts now always copy their data in addition to the source reference, so + // there's no need to call SchDLL::Update for the charts in the clipboard doc. + // Update with the data (including NumberFormatter) from the live document would + // also store the NumberFormatter in the clipboard chart (#88749#) // lcl_RefreshChartData( pModel, pViewData->GetDocument() ); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -149,9 +149,9 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos ) uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); pTransferObj->SetDrawPersist( &aDragShellRef ); // keep persist for ole objects alive - pTransferObj->SetDragSource( this ); // copies selection + pTransferObj->SetDragSource( this ); // copies selection - SC_MOD()->SetDragObject( NULL, pTransferObj ); // for internal D&D + SC_MOD()->SetDragObject( NULL, pTransferObj ); // for internal D&D pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } @@ -169,10 +169,10 @@ void ScDrawView::DoCopy() SdrModel* pModel = GetAllMarkedModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); - // Charts now always copy their data in addition to the source reference, so - // there's no need to call SchDLL::Update for the charts in the clipboard doc. - // Update with the data (including NumberFormatter) from the live document would - // also store the NumberFormatter in the clipboard chart (#88749#) + // Charts now always copy their data in addition to the source reference, so + // there's no need to call SchDLL::Update for the charts in the clipboard doc. + // Update with the data (including NumberFormatter) from the live document would + // also store the NumberFormatter in the clipboard chart (#88749#) // lcl_RefreshChartData( pModel, pViewData->GetDocument() ); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -190,8 +190,8 @@ void ScDrawView::DoCopy() pTransferObj->SetDrawPersist( &(*ScGlobal::pDrawClipDocShellRef) ); // keep persist for ole objects alive } - pTransferObj->CopyToClipboard( pViewData->GetActiveWin() ); // system clipboard - SC_MOD()->SetClipObject( NULL, pTransferObj ); // internal clipboard + pTransferObj->CopyToClipboard( pViewData->GetActiveWin() ); // system clipboard + SC_MOD()->SetClipObject( NULL, pTransferObj ); // internal clipboard } uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() @@ -205,10 +205,10 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() SdrModel* pModel = GetAllMarkedModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); - // Charts now always copy their data in addition to the source reference, so - // there's no need to call SchDLL::Update for the charts in the clipboard doc. - // Update with the data (including NumberFormatter) from the live document would - // also store the NumberFormatter in the clipboard chart (#88749#) + // Charts now always copy their data in addition to the source reference, so + // there's no need to call SchDLL::Update for the charts in the clipboard doc. + // Update with the data (including NumberFormatter) from the live document would + // also store the NumberFormatter in the clipboard chart (#88749#) // lcl_RefreshChartData( pModel, pViewData->GetDocument() ); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -229,7 +229,7 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() return xTransferable; } -// Korrektur fuer 100% berechnen, unabhaengig von momentanen Einstellungen +// Korrektur fuer 100% berechnen, unabhaengig von momentanen Einstellungen void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const { @@ -306,7 +306,7 @@ void ScDrawView::SetMarkedOriginalSize() MapMode aDestMap( MAP_100TH_MM ); if (aSourceMap.GetMapUnit() == MAP_PIXEL) { - // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt + // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt Fraction aNormScaleX, aNormScaleY; CalcNormScale( aNormScaleX, aNormScaleY ); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 14b2c02fae00..8a8211442b65 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.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 @@ -71,8 +71,8 @@ using namespace com::sun::star; // ----------------------------------------------------------------------- -#define SC_HANDLESIZE_BIG 9 -#define SC_HANDLESIZE_SMALL 7 +#define SC_HANDLESIZE_BIG 9 +#define SC_HANDLESIZE_SMALL 7 // ----------------------------------------------------------------------- @@ -88,7 +88,7 @@ void ScDrawView::Construct() EnableExtendedCommandEventDispatcher(FALSE); SetFrameDragSingles(TRUE); -// SetSolidMarkHdl(TRUE); // einstellbar -> UpdateUserViewOptions +// SetSolidMarkHdl(TRUE); // einstellbar -> UpdateUserViewOptions SetMinMoveDistancePixel( 2 ); SetHitTolerancePixel( 2 ); @@ -114,7 +114,7 @@ void ScDrawView::Construct() if (pLayer) { SetLayerLocked( pLayer->GetName(), bProt ); - SetActiveLayer( pLayer->GetName() ); // FRONT als aktiven Layer setzen + SetActiveLayer( pLayer->GetName() ); // FRONT als aktiven Layer setzen } pLayer = rAdmin.GetLayerPerID(SC_LAYER_CONTROLS); if (pLayer) @@ -172,7 +172,7 @@ void ScDrawView::AddCustomHdl() if (bNegativePage) { aPos = aBoundRect.TopRight(); - aPos.X() = -aPos.X(); // so the loop below is the same + aPos.X() = -aPos.X(); // so the loop below is the same } else aPos = aBoundRect.TopLeft(); @@ -214,8 +214,8 @@ void ScDrawView::InvalidateDrawTextAttrs() if (!pViewData) return; SfxBindings& rBindings = pViewData->GetBindings(); - // cjk/ctl font items have no configured slots, - // need no invalidate + // cjk/ctl font items have no configured slots, + // need no invalidate rBindings.Invalidate( SID_ATTR_CHAR_FONT ); rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); @@ -250,24 +250,24 @@ void ScDrawView::InvalidateDrawTextAttrs() //void ScDrawView::DrawMarks( OutputDevice* pOut ) const //{ -// DBG_ASSERT(pOut, "ScDrawView::DrawMarks: No OutputDevice (!)"); -// SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut); +// DBG_ASSERT(pOut, "ScDrawView::DrawMarks: No OutputDevice (!)"); +// SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut); // -// if(pPaintWindow) -// { -// if(pPaintWindow->isXorVisible()) -// { -// ToggleShownXor(pOut, 0L); -// } -// } +// if(pPaintWindow) +// { +// if(pPaintWindow->isXorVisible()) +// { +// ToggleShownXor(pOut, 0L); +// } +// } //} void ScDrawView::SetMarkedToLayer( BYTE nLayerNo ) { if (AreObjectsMarked()) { - // #i11702# use SdrUndoObjectLayerChange for undo - // STR_UNDO_SELATTR is "Attributes" - should use a different text later + // #i11702# use SdrUndoObjectLayerChange for undo + // STR_UNDO_SELATTR is "Attributes" - should use a different text later BegUndo( ScGlobal::GetRscString( STR_UNDO_SELATTR ) ); const SdrMarkList& rMark = GetMarkedObjectList(); @@ -284,11 +284,11 @@ void ScDrawView::SetMarkedToLayer( BYTE nLayerNo ) EndUndo(); - // repaint is done in SetLayer + // repaint is done in SetLayer pViewData->GetDocShell()->SetDrawModified(); - // #84073# check mark list now instead of later in a timer + // #84073# check mark list now instead of later in a timer CheckMarked(); MarkListHasChanged(); } @@ -323,7 +323,7 @@ void ScDrawView::UpdateWorkArea() Rectangle aNewArea( aPos, aPageSize ); if ( aPageSize.Width() < 0 ) { - // RTL: from max.negative (left) to zero (right) + // RTL: from max.negative (left) to zero (right) aNewArea.Right() = 0; aNewArea.Left() = aPageSize.Width() + 1; } @@ -339,7 +339,7 @@ void ScDrawView::DoCut() { DoCopy(); BegUndo( ScGlobal::GetRscString( STR_UNDO_CUT ) ); - DeleteMarked(); // auf dieser View - von der 505f Umstellung nicht betroffen + DeleteMarked(); // auf dieser View - von der 505f Umstellung nicht betroffen EndUndo(); } @@ -403,11 +403,11 @@ void ScDrawView::MarkListHasChanged() { pViewSh->Unmark(); // remove cell selection - // #65379# end cell edit mode if drawing objects are selected + // #65379# end cell edit mode if drawing objects are selected SC_MOD()->InputEnterHandler(); } - // IP deaktivieren + // IP deaktivieren ScModule* pScMod = SC_MOD(); bool bUnoRefDialog = pScMod->IsRefDialogOpen() && pScMod->GetCurRefDlgId() == WID_SIMPLE_REF; @@ -415,14 +415,14 @@ void ScDrawView::MarkListHasChanged() ScClient* pClient = (ScClient*) pViewSh->GetIPClient(); if ( pClient && pClient->IsObjectInPlaceActive() && !bUnoRefDialog ) { - // #41730# beim ViewShell::Activate aus dem Reset2Open nicht die Handles anzeigen + // #41730# beim ViewShell::Activate aus dem Reset2Open nicht die Handles anzeigen //HMHbDisableHdl = TRUE; pClient->DeactivateObject(); //HMHbDisableHdl = FALSE; - // Image-Ole wieder durch Grafik ersetzen passiert jetzt in ScClient::UIActivate + // Image-Ole wieder durch Grafik ersetzen passiert jetzt in ScClient::UIActivate } - // Ole-Objekt selektiert? + // Ole-Objekt selektiert? SdrOle2Obj* pOle2Obj = NULL; SdrGrafObj* pGrafObj = NULL; @@ -433,7 +433,7 @@ void ScDrawView::MarkListHasChanged() if ( nMarkCount == 0 && !pViewData->GetViewShell()->IsDrawSelMode() && !bInConstruct ) { - // relock layers that may have been unlocked before + // relock layers that may have been unlocked before LockBackgroundLayer(); LockInternalLayer(); } @@ -464,9 +464,9 @@ void ScDrawView::MarkListHasChanged() bSubShellSet = TRUE; } else if (pObj->GetObjIdentifier() != OBJ_TEXT // Verhindern, das beim Anlegen - || !pViewSh->IsDrawTextShell()) // eines TextObjekts auf die - { // DrawShell umgeschaltet wird. - pViewSh->SetDrawShell(TRUE); //@#70206# + || !pViewSh->IsDrawTextShell()) // eines TextObjekts auf die + { // DrawShell umgeschaltet wird. + pViewSh->SetDrawShell(TRUE); //@#70206# } } @@ -483,8 +483,8 @@ void ScDrawView::MarkListHasChanged() ULONG nListCount = pLst->GetObjCount(); if ( nListCount == 0 ) { - // #104156# An empty group (may occur during Undo) is no control or graphics object. - // Creating the form shell during undo would lead to problems with the undo manager. + // #104156# An empty group (may occur during Undo) is no control or graphics object. + // Creating the form shell during undo would lead to problems with the undo manager. bOnlyControls = FALSE; bOnlyGraf = FALSE; } @@ -513,7 +513,7 @@ void ScDrawView::MarkListHasChanged() if(bOnlyControls) { - pViewSh->SetDrawFormShell(TRUE); // jetzt UNO-Controls + pViewSh->SetDrawFormShell(TRUE); // jetzt UNO-Controls } else if(bOnlyGraf) { @@ -527,7 +527,7 @@ void ScDrawView::MarkListHasChanged() - // Verben anpassen + // Verben anpassen SfxViewFrame* pViewFrame = pViewSh->GetViewFrame(); BOOL bOle = pViewSh->GetViewFrame()->GetFrame().IsInPlace(); @@ -545,14 +545,14 @@ void ScDrawView::MarkListHasChanged() else pViewSh->SetVerbs( 0 ); - // Image-Map Editor + // Image-Map Editor if ( pOle2Obj ) UpdateIMap( pOle2Obj ); else if ( pGrafObj ) UpdateIMap( pGrafObj ); - InvalidateAttribs(); // nach dem IMap-Editor Update + InvalidateAttribs(); // nach dem IMap-Editor Update InvalidateDrawTextAttrs(); for(sal_uInt32 a(0L); a < PaintWindowCount(); a++) @@ -566,8 +566,8 @@ void ScDrawView::MarkListHasChanged() } } - // uno object for view returns drawing objects as selection, - // so it must notify its SelectionChangeListeners + // uno object for view returns drawing objects as selection, + // so it must notify its SelectionChangeListeners if (pViewFrame) { @@ -581,7 +581,7 @@ void ScDrawView::MarkListHasChanged() } } - // update selection transfer object + // update selection transfer object pViewSh->CheckSelectionTransfer(); @@ -592,10 +592,10 @@ void __EXPORT ScDrawView::ModelHasChanged() SdrObject* pEditObj = GetTextEditObject(); if ( pEditObj && !pEditObj->IsInserted() && pViewData ) { - // #111700# SdrObjEditView::ModelHasChanged will end text edit in this case, - // so make sure the EditEngine's undo manager is no longer used. + // #111700# SdrObjEditView::ModelHasChanged will end text edit in this case, + // so make sure the EditEngine's undo manager is no longer used. pViewData->GetViewShell()->SetDrawTextUndo(NULL); - SetCreateMode(); // don't leave FuText in a funny state + SetCreateMode(); // don't leave FuText in a funny state } FmFormView::ModelHasChanged(); @@ -605,8 +605,8 @@ void __EXPORT ScDrawView::UpdateUserViewOptions() { if (pViewData) { - const ScViewOptions& rOpt = pViewData->GetOptions(); - const ScGridOptions& rGrid = rOpt.GetGridOptions(); + const ScViewOptions& rOpt = pViewData->GetOptions(); + const ScGridOptions& rGrid = rOpt.GetGridOptions(); BOOL bBigHdl = rOpt.GetOption( VOPT_BIGHANDLES ); @@ -618,8 +618,8 @@ void __EXPORT ScDrawView::UpdateUserViewOptions() SetSnapEnabled( rGrid.GetUseGridSnap() ); SetGridSnap( rGrid.GetUseGridSnap() ); - // Snap from grid options is no longer used -// SetSnapGrid( Size( rGrid.GetFldSnapX(), rGrid.GetFldSnapY() ) ); + // Snap from grid options is no longer used +// SetSnapGrid( Size( rGrid.GetFldSnapX(), rGrid.GetFldSnapY() ) ); Fraction aFractX( rGrid.GetFldDrawX(), rGrid.GetFldDivisionX() + 1 ); Fraction aFractY( rGrid.GetFldDrawY(), rGrid.GetFldDivisionY() + 1 ); @@ -642,7 +642,7 @@ BOOL ScDrawView::SelectObject( const String& rName ) SCTAB nObjectTab = 0; SdrObject* pFound = NULL; - SfxObjectShell* pShell = pDoc->GetDocumentShell(); + SfxObjectShell* pShell = pDoc->GetDocumentShell(); if (pShell) { SdrModel* pDrawLayer = GetModel(); @@ -671,7 +671,7 @@ BOOL ScDrawView::SelectObject( const String& rName ) if ( pFound ) { ScTabView* pView = pViewData->GetView(); - if ( nObjectTab != nTab ) // Tabelle umschalten + if ( nObjectTab != nTab ) // Tabelle umschalten pView->SetTabNo( nObjectTab ); DBG_ASSERT( nTab == nObjectTab, "Tabellen umschalten hat nicht geklappt" ); @@ -699,8 +699,8 @@ BOOL ScDrawView::SelectObject( const String& rName ) bool ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions) { - // Markierung nicht aendern, wenn Ole-Objekt aktiv - // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!) + // Markierung nicht aendern, wenn Ole-Objekt aktiv + // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!) if (pViewData) { @@ -736,8 +736,8 @@ void ScDrawView::LockCalcLayer( SdrLayerID nLayer, bool bLock ) void __EXPORT ScDrawView::MakeVisible( const Rectangle& rRect, Window& rWin ) { - //! rWin richtig auswerten - //! ggf Zoom aendern + //! rWin richtig auswerten + //! ggf Zoom aendern if ( pViewData && pViewData->GetActiveWin() == &rWin ) pViewData->GetView()->MakeVisible( rRect ); @@ -788,7 +788,7 @@ SdrEndTextEditKind ScDrawView::ScEndTextEdit() SdrEndTextEditKind eKind = SdrEndTextEdit(); if ( bIsTextEdit && pViewData ) - pViewData->GetViewShell()->SetDrawTextUndo(NULL); // "normaler" Undo-Manager + pViewData->GetViewShell()->SetDrawTextUndo(NULL); // "normaler" Undo-Manager return eKind; } diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 01e5b5a9a3b1..bc038a01e449 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.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 @@ -107,11 +107,11 @@ SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL)) ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) : - pEditView (pView), - pViewData (pData), - pClipEvtLstnr (NULL), - bPastePossible (FALSE), - bIsInsertMode (TRUE) + pEditView (pView), + pViewData (pData), + pClipEvtLstnr (NULL), + bPastePossible (FALSE), + bIsInsertMode (TRUE) { SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() ); SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() ); @@ -156,7 +156,7 @@ void lcl_RemoveAttribs( EditView& rEditView ) pEngine->GetUndoManager().EnterListAction( aName, aName ); rEditView.RemoveAttribs(TRUE); - pEngine->RepeatDefaults(); // #97226# paragraph attributes from cell formats must be preserved + pEngine->RepeatDefaults(); // #97226# paragraph attributes from cell formats must be preserved pEngine->GetUndoManager().LeaveListAction(); @@ -174,14 +174,14 @@ void lclInsertCharacter( EditView* pTableView, EditView* pTopView, sal_Unicode c void ScEditShell::Execute( SfxRequest& rReq ) { - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); - SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); + SfxBindings& rBindings = pViewData->GetBindings(); ScInputHandler* pHdl = GetMyInputHdl(); DBG_ASSERT(pHdl,"kein ScInputHandler"); - EditView* pTopView = pHdl->GetTopView(); // hat Eingabezeile den Focus? + EditView* pTopView = pHdl->GetTopView(); // hat Eingabezeile den Focus? EditView* pTableView = pHdl->GetTableView(); DBG_ASSERT(pTableView,"no EditView :-("); @@ -230,7 +230,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ReplaceTextWithSynonym( *pEditView, aReplaceText ); } break; - + case SID_COPY: pTableView->Copy(); break; @@ -253,7 +253,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) pTopView->DeleteSelected(); break; - case SID_CELL_FORMAT_RESET: // "Standard" + case SID_CELL_FORMAT_RESET: // "Standard" lcl_RemoveAttribs( *pTableView ); if ( pTopView ) lcl_RemoveAttribs( *pTopView ); @@ -384,7 +384,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) if ( aString.Len() ) { - // if string contains WEAK characters, set all fonts + // if string contains WEAK characters, set all fonts BYTE nSetScript; ScDocument* pDoc = pViewData->GetDocument(); if ( pDoc->HasStringWeakCharacters( aString ) ) @@ -397,7 +397,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) aSetItem.PutItemForScriptType( nSetScript, aNewItem ); aSet.Put( aSetItem.GetItemSet(), FALSE ); - // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist + // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist pTableView->GetEditEngine()->QuickSetAttribs( aSet, pTableView->GetSelection() ); pTableView->InsertText(aString); if (pTopView) @@ -419,7 +419,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) case FID_INSERT_NAME: { - ScDocument* pDoc = pViewData->GetDocument(); + ScDocument* pDoc = pViewData->GetDocument(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); @@ -488,7 +488,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) if (pEngine->GetParagraphCount() == 1) { String aText = pEngine->GetText(); - ESelection aSel = pEditView->GetSelection(); // aktuelle View + ESelection aSel = pEditView->GetSelection(); // aktuelle View ScRefFinder aFinder( aText, pViewData->GetDocument() ); aFinder.ToggleRel( aSel.nStartPos, aSel.nEndPos ); @@ -505,7 +505,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) } bOk = TRUE; - // Referenz wird selektiert -> beim Tippen nicht ueberschreiben + // Referenz wird selektiert -> beim Tippen nicht ueberschreiben bSetSelIsRef = TRUE; } } @@ -521,9 +521,9 @@ void ScEditShell::Execute( SfxRequest& rReq ) if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; - const String& rName = pHyper->GetName(); - const String& rURL = pHyper->GetURL(); - const String& rTarget = pHyper->GetTargetFrame(); + const String& rName = pHyper->GetName(); + const String& rURL = pHyper->GetURL(); + const String& rTarget = pHyper->GetTargetFrame(); SvxLinkInsertMode eMode = pHyper->GetInsertMode(); BOOL bDone = FALSE; @@ -532,7 +532,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) const SvxURLField* pURLField = GetURLField(); if ( pURLField ) { - // altes Feld selektieren + // altes Feld selektieren ESelection aSel = pTableView->GetSelection(); aSel.Adjust(); @@ -540,15 +540,15 @@ void ScEditShell::Execute( SfxRequest& rReq ) aSel.nEndPos = aSel.nStartPos + 1; pTableView->SetSelection( aSel ); - // neues Feld einfuegen + // neues Feld einfuegen SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR ); aURLField.SetTargetFrame( rTarget ); SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD ); pTableView->InsertField( aURLItem ); - pTableView->SetSelection( aSel ); // select inserted field + pTableView->SetSelection( aSel ); // select inserted field - // #57254# jetzt doch auch Felder in der Top-View + // #57254# jetzt doch auch Felder in der Top-View if ( pTopView ) { @@ -557,7 +557,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) aSel.nEndPos = aSel.nStartPos + 1; pTopView->SetSelection( aSel ); pTopView->InsertField( aURLItem ); - pTopView->SetSelection( aSel ); // select inserted field + pTopView->SetSelection( aSel ); // select inserted field } bDone = TRUE; @@ -569,8 +569,8 @@ void ScEditShell::Execute( SfxRequest& rReq ) pViewData->GetViewShell()-> InsertURL( rName, rURL, rTarget, (USHORT) eMode ); - // InsertURL an der ViewShell schaltet bei "Button" - // die EditShell ab, darum sofort return + // InsertURL an der ViewShell schaltet bei "Button" + // die EditShell ab, darum sofort return return; } @@ -637,7 +637,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) return; } - ScInputHandler* pHdl = GetMyInputHdl(); + ScInputHandler* pHdl = GetMyInputHdl(); EditView* pActiveView = pHdl ? pHdl->GetActiveView() : pEditView; SfxWhichIter aIter( rSet ); @@ -646,7 +646,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) { switch (nWhich) { - case SID_ATTR_INSERT: // Statuszeile + case SID_ATTR_INSERT: // Statuszeile { if ( pActiveView ) rSet.Put( SfxBoolItem( nWhich, pActiveView->IsInsertMode() ) ); @@ -708,7 +708,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) rSet.DisableItem( SID_THES ); } break; - + } nWhich = aIter.NextWhich(); @@ -717,11 +717,11 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) const SvxURLField* ScEditShell::GetURLField() { - ScInputHandler* pHdl = GetMyInputHdl(); + ScInputHandler* pHdl = GetMyInputHdl(); EditView* pActiveView = pHdl ? pHdl->GetActiveView() : pEditView; if ( pActiveView ) { - const SvxFieldItem* pFieldItem = pActiveView->GetFieldAtSelection(); + const SvxFieldItem* pFieldItem = pActiveView->GetFieldAtSelection(); if (pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); @@ -806,10 +806,10 @@ void lcl_InvalidateUnder( SfxBindings& rBindings ) void ScEditShell::ExecuteAttr(SfxRequest& rReq) { - SfxItemSet aSet( pEditView->GetEmptyItemSet() ); - SfxBindings& rBindings = pViewData->GetBindings(); - const SfxItemSet* pArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + SfxItemSet aSet( pEditView->GetEmptyItemSet() ); + SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); switch ( nSlot ) { @@ -846,7 +846,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) } break; - // Toggles + // Toggles case SID_ATTR_CHAR_WEIGHT: { @@ -899,7 +899,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) lcl_InvalidateUnder( rBindings ); break; - case SID_ATTR_CHAR_UNDERLINE: // Toggles + case SID_ATTR_CHAR_UNDERLINE: // Toggles case SID_ULINE_VAL_SINGLE: case SID_ULINE_VAL_DOUBLE: case SID_ULINE_VAL_DOTTED: @@ -987,7 +987,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) } // - // anwenden + // anwenden // EditEngine* pEngine = pEditView->GetEditEngine(); @@ -1016,7 +1016,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) SfxItemSet aAttribs = pEditView->GetAttribs(); rSet.Put( aAttribs ); - // choose font info according to selection script type + // choose font info according to selection script type USHORT nScript = pEditView->GetSelectedScriptType(); if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); @@ -1040,7 +1040,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) if ( rSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN ) ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_ITALIC, nScript ); - // Unterstreichung + // Unterstreichung SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, TRUE ); if ( eState == SFX_ITEM_DONTCARE ) @@ -1057,19 +1057,19 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) USHORT nId = SID_ULINE_VAL_NONE; switch (eUnderline) { - case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; - case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; - case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; + case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; + case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; + case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; default: break; } rSet.Put( SfxBoolItem( nId, TRUE ) ); } - //! Testen, ob Klammer-Hervorhebung aktiv ist !!!! + //! Testen, ob Klammer-Hervorhebung aktiv ist !!!! ScInputHandler* pHdl = GetMyInputHdl(); if ( pHdl && pHdl->IsFormulaMode() ) - rSet.ClearItem( EE_CHAR_WEIGHT ); // hervorgehobene Klammern hier nicht + rSet.ClearItem( EE_CHAR_WEIGHT ); // hervorgehobene Klammern hier nicht } String ScEditShell::GetSelectionText( BOOL bWholeWord ) @@ -1099,11 +1099,11 @@ String ScEditShell::GetSelectionText( BOOL bWholeWord ) void ScEditShell::ExecuteUndo(SfxRequest& rReq) { - // #81733# Undo must be handled here because it's called for both EditViews + // #81733# Undo must be handled here because it's called for both EditViews ScInputHandler* pHdl = GetMyInputHdl(); DBG_ASSERT(pHdl,"no ScInputHandler"); - EditView* pTopView = pHdl->GetTopView(); + EditView* pTopView = pHdl->GetTopView(); EditView* pTableView = pHdl->GetTableView(); DBG_ASSERT(pTableView,"no EditView"); @@ -1148,7 +1148,7 @@ void ScEditShell::ExecuteUndo(SfxRequest& rReq) void ScEditShell::GetUndoState(SfxItemSet &rSet) { - // Undo state is taken from normal ViewFrame state function + // Undo state is taken from normal ViewFrame state function SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); if ( pViewFrm && GetUndoManager() ) @@ -1162,7 +1162,7 @@ void ScEditShell::GetUndoState(SfxItemSet &rSet) } } - // disable if no action in input line EditView + // disable if no action in input line EditView ScInputHandler* pHdl = GetMyInputHdl(); DBG_ASSERT(pHdl,"no ScInputHandler"); @@ -1185,7 +1185,7 @@ void ScEditShell::ExecuteTrans( SfxRequest& rReq ) ScInputHandler* pHdl = GetMyInputHdl(); DBG_ASSERT( pHdl, "no ScInputHandler" ); - EditView* pTopView = pHdl->GetTopView(); + EditView* pTopView = pHdl->GetTopView(); EditView* pTableView = pHdl->GetTableView(); DBG_ASSERT( pTableView, "no EditView" ); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 6b71dbc61514..599e800762ce 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.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 @@ -103,7 +103,7 @@ #define ScFormatShell -#define TableFont +#define TableFont #define FormatForSelection #include "scslots.hxx" @@ -160,7 +160,7 @@ ScFormatShell::ScFormatShell(ScViewData* pData) : SfxShell(pData->GetViewShell()), pViewData(pData) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); SetPool( &pTabViewShell->GetPool() ); SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); @@ -181,19 +181,19 @@ ScFormatShell::~ScFormatShell() void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet ) { - ScDocument* pDoc = GetViewData()->GetDocument(); - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); + ScDocument* pDoc = GetViewData()->GetDocument(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); BOOL bProtected = FALSE; SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB i=0; i<nTabCount; i++) - if (pDoc->IsTabProtected(i)) // ueberhaupt eine Tabelle geschuetzt? + if (pDoc->IsTabProtected(i)) // ueberhaupt eine Tabelle geschuetzt? bProtected = TRUE; - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); - USHORT nSlotId = 0; + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); + USHORT nSlotId = 0; while ( nWhich ) { @@ -208,7 +208,7 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet ) rSet.DisableItem( nSlotId ); break; - case SID_STYLE_FAMILY2: // Zellvorlagen + case SID_STYLE_FAMILY2: // Zellvorlagen { SfxStyleSheet* pStyleSheet = (SfxStyleSheet*) pTabViewShell->GetStyleSheetFromMarked(); @@ -220,11 +220,11 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet ) } break; - case SID_STYLE_FAMILY4: // Seitenvorlagen + case SID_STYLE_FAMILY4: // Seitenvorlagen { - SCTAB nCurTab = GetViewData()->GetTabNo(); - String aPageStyle = pDoc->GetPageStyle( nCurTab ); - SfxStyleSheet* pStyleSheet = (SfxStyleSheet*)pStylePool-> + SCTAB nCurTab = GetViewData()->GetTabNo(); + String aPageStyle = pDoc->GetPageStyle( nCurTab ); + SfxStyleSheet* pStyleSheet = (SfxStyleSheet*)pStylePool-> Find( aPageStyle, SFX_STYLE_FAMILY_PAGE ); if ( pStyleSheet ) @@ -283,17 +283,17 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } //-------------------------------------------------------------------- - SfxBindings& rBindings = pViewData->GetBindings(); - const SfxItemSet* pArgs = rReq.GetArgs(); - const USHORT nSlotId = rReq.GetSlot(); - const SCTAB nCurTab = GetViewData()->GetTabNo(); - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScTabViewShell* pTabViewShell= GetViewData()->GetViewShell(); - ScDocument* pDoc = pDocSh->GetDocument(); - ScMarkData& rMark = GetViewData()->GetMarkData(); - ScModule* pScMod = SC_MOD(); - String aRefName; - BOOL bUndo = pDoc->IsUndoEnabled(); + SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pArgs = rReq.GetArgs(); + const USHORT nSlotId = rReq.GetSlot(); + const SCTAB nCurTab = GetViewData()->GetTabNo(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScTabViewShell* pTabViewShell= GetViewData()->GetViewShell(); + ScDocument* pDoc = pDocSh->GetDocument(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + ScModule* pScMod = SC_MOD(); + String aRefName; + BOOL bUndo = pDoc->IsUndoEnabled(); if ( (nSlotId == SID_STYLE_NEW) || (nSlotId == SID_STYLE_EDIT) @@ -304,13 +304,13 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) || (nSlotId == SID_STYLE_NEW_BY_EXAMPLE) || (nSlotId == SID_STYLE_UPDATE_BY_EXAMPLE) ) { - SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSheet = NULL; BOOL bStyleToMarked = FALSE; BOOL bListAction = FALSE; - BOOL bAddUndo = FALSE; // add ScUndoModifyStyle (style modified) - ScStyleSaveData aOldData; // for undo/redo + BOOL bAddUndo = FALSE; // add ScUndoModifyStyle (style modified) + ScStyleSaveData aOldData; // for undo/redo ScStyleSaveData aNewData; SfxStyleFamily eFamily = SFX_STYLE_FAMILY_PARA; @@ -493,18 +493,18 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) // muss noch darauf geachtet werden, Items aus Vorlagen nicht // zu uebernehmen (GetSelectionPattern sammelt auch Items aus // Vorlagen zusammen) (#44748#) - // pAttrItem = GetSelectionPattern(); + // pAttrItem = GetSelectionPattern(); // ScViewData* pViewData = GetViewData(); - SCCOL nCol = pViewData->GetCurX(); - SCROW nRow = pViewData->GetCurY(); + SCCOL nCol = pViewData->GetCurX(); + SCROW nRow = pViewData->GetCurY(); pAttrItem = pDoc->GetPattern( nCol, nRow, nCurTab ); SfxItemSet aAttrSet = pAttrItem->GetItemSet(); aAttrSet.ClearItem( ATTR_MERGE ); aAttrSet.ClearItem( ATTR_MERGE_FLAG ); - // bedingte Formatierung und Gueltigkeit nicht uebernehmen, - // weil sie in der Vorlage nicht editiert werden koennen + // bedingte Formatierung und Gueltigkeit nicht uebernehmen, + // weil sie in der Vorlage nicht editiert werden koennen aAttrSet.ClearItem( ATTR_VALIDDATA ); aAttrSet.ClearItem( ATTR_CONDITIONAL ); @@ -517,8 +517,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) bListAction = TRUE; } - BOOL bConvertBack = FALSE; - SfxStyleSheet* pSheetInUse = (SfxStyleSheet*) + BOOL bConvertBack = FALSE; + SfxStyleSheet* pSheetInUse = (SfxStyleSheet*) pTabViewShell->GetStyleSheetFromMarked(); // wenn neuer Style vorhanden und in der Selektion @@ -560,8 +560,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pStyleSheet->GetItemSet().Put( aAttrSet ); pTabViewShell->UpdateStyleSheetInUse( (SfxStyleSheet*)pStyleSheet ); - // call SetStyleSheetToMarked after adding the ScUndoModifyStyle - // (pStyleSheet pointer is used!) + // call SetStyleSheetToMarked after adding the ScUndoModifyStyle + // (pStyleSheet pointer is used!) bStyleToMarked = TRUE; } else // ( nSlotId == SID_STYLE_UPDATE_BY_EXAMPLE ) @@ -582,8 +582,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pStyleSheet->GetItemSet().Put( aAttrSet ); pTabViewShell->UpdateStyleSheetInUse( (SfxStyleSheet*)pStyleSheet ); - // call SetStyleSheetToMarked after adding the ScUndoModifyStyle - // (pStyleSheet pointer is used!) + // call SetStyleSheetToMarked after adding the ScUndoModifyStyle + // (pStyleSheet pointer is used!) bStyleToMarked = TRUE; } } @@ -664,10 +664,10 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( rStrCurStyle != aStyleName ) { - SfxStyleSheetBase* pCurStyle = pStylePool->Find( rStrCurStyle, eFamily ); - SfxItemSet aAttrSet = pCurStyle->GetItemSet(); - SCTAB nInTab; - BOOL bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab ); + SfxStyleSheetBase* pCurStyle = pStylePool->Find( rStrCurStyle, eFamily ); + SfxItemSet aAttrSet = pCurStyle->GetItemSet(); + SCTAB nInTab; + BOOL bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab ); // wenn bereits vorhanden, erstmal entfernen... if ( pStyleSheet ) @@ -710,11 +710,11 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { SvxNumberInfoItem* pNumberInfoItem = NULL; - SfxStyleFamily eFam = pStyleSheet->GetFamily(); + SfxStyleFamily eFam = pStyleSheet->GetFamily(); SfxAbstractTabDialog* pDlg = NULL; - USHORT nRsc = 0; + USHORT nRsc = 0; - // #37034#/#37245# alte Items aus der Vorlage merken + // #37034#/#37245# alte Items aus der Vorlage merken SfxItemSet aOldSet = pStyleSheet->GetItemSet(); String aOldName = pStyleSheet->GetName(); @@ -756,14 +756,14 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pDocSh->PutItem( *pNumberInfoItem ); nRsc = RID_SCDLG_STYLES_PAR; - // auf jeden Fall ein SvxBoxInfoItem mit Table = FALSE im Set: - // (wenn gar kein Item da ist, loescht der Dialog auch das - // BORDER_OUTER SvxBoxItem aus dem Vorlagen-Set) + // auf jeden Fall ein SvxBoxInfoItem mit Table = FALSE im Set: + // (wenn gar kein Item da ist, loescht der Dialog auch das + // BORDER_OUTER SvxBoxItem aus dem Vorlagen-Set) if ( rSet.GetItemState( ATTR_BORDER_INNER, FALSE ) != SFX_ITEM_SET ) { SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER ); - aBoxInfoItem.SetTable(FALSE); // keine inneren Linien + aBoxInfoItem.SetTable(FALSE); // keine inneren Linien aBoxInfoItem.SetDist(TRUE); aBoxInfoItem.SetMinDist(FALSE); rSet.Put( aBoxInfoItem ); @@ -772,18 +772,18 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) break; } - // If GetDefDialogParent is a dialog, it must be used - // (style catalog) + // If GetDefDialogParent is a dialog, it must be used + // (style catalog) Window* pParent = Application::GetDefDialogParent(); if ( !pParent || !pParent->IsDialog() ) { - // #107256# GetDefDialogParent currently doesn't return the window - // that was set with SetDefDialogParent (but dynamically finds the - // topmost parent of the focus window), so IsDialog above is FALSE - // even if called from the style catalog. - // -> Use NULL if a modal dialog is open, to enable the Dialog's - // default parent handling. + // #107256# GetDefDialogParent currently doesn't return the window + // that was set with SetDefDialogParent (but dynamically finds the + // topmost parent of the focus window), so IsDialog above is FALSE + // even if called from the style catalog. + // -> Use NULL if a modal dialog is open, to enable the Dialog's + // default parent handling. if ( Application::IsInModalMode() ) pParent = NULL; else @@ -808,12 +808,12 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { nRetMask = pStyleSheet->GetMask(); - // #37034#/#37245# Attribut-Vergleiche (frueher in ModifyStyleSheet) - // jetzt hier mit den alten Werten (Style ist schon veraendert) + // #37034#/#37245# Attribut-Vergleiche (frueher in ModifyStyleSheet) + // jetzt hier mit den alten Werten (Style ist schon veraendert) if ( SFX_STYLE_FAMILY_PARA == eFam ) { -// pDoc->CellStyleChanged( *pStyleSheet, aOldSet ); +// pDoc->CellStyleChanged( *pStyleSheet, aOldSet ); SfxItemSet& rNewSet = pStyleSheet->GetItemSet(); BOOL bNumFormatChanged; @@ -844,7 +844,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } else { - //! auch fuer Seitenvorlagen die Abfragen hier + //! auch fuer Seitenvorlagen die Abfragen hier String aNewName = pStyleSheet->GetName(); if ( aNewName != aOldName && @@ -880,8 +880,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pStylePool->Remove( pStyleSheet ); else { - // falls zwischendurch etwas mit dem temporaer geaenderten - // ItemSet gepainted wurde: + // falls zwischendurch etwas mit dem temporaer geaenderten + // ItemSet gepainted wurde: pDocSh->PostPaintGridAll(); } } @@ -889,7 +889,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } } -// if ( nRetMask != 0xffff )// Irgendein Wert MUSS geliefert werden JN +// if ( nRetMask != 0xffff )// Irgendein Wert MUSS geliefert werden JN rReq.SetReturnValue( SfxUInt16Item( nSlotId, nRetMask ) ); // #96983# only stylist sends focus to sheet @@ -902,8 +902,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( bStyleToMarked ) { - // call SetStyleSheetToMarked after adding the ScUndoModifyStyle, - // so redo will find the modified style + // call SetStyleSheetToMarked after adding the ScUndoModifyStyle, + // so redo will find the modified style pTabViewShell->SetStyleSheetToMarked( (SfxStyleSheet*)pStyleSheet ); pTabViewShell->InvalidateAttribs(); } @@ -919,13 +919,13 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) { - ScModule* pScMod = SC_MOD(); - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + ScModule* pScMod = SC_MOD(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox // Eingabe beenden if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) ) @@ -961,7 +961,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) switch ( nSlot ) { case SID_NUMBER_TWODEC: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 4 ); // Standard+4 = #.##0,00 + pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 4 ); // Standard+4 = #.##0,00 rReq.Done(); break; case SID_NUMBER_SCIENTIFIC: @@ -1063,7 +1063,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) //------------------------------------------------------------------ #define APPLY_HOR_JUSTIFY(j) \ - { \ + { \ if ( !pHorJustify || (eHorJustify != (j) ) ) \ pTabViewShell->ApplyAttr( SvxHorJustifyItem( (j) ) ); \ else \ @@ -1071,7 +1071,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) } #define APPLY_VER_JUSTIFY(j) \ - { \ + { \ if ( !pVerJustify || (eVerJustify != (j) ) ) \ pTabViewShell->ApplyAttr( SvxVerJustifyItem( (j) ) ); \ else \ @@ -1080,12 +1080,12 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pViewData->GetBindings(); - const SfxItemSet* pSet = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pSet = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox switch( nSlot ) { @@ -1170,14 +1170,14 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pViewData->GetBindings(); - const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern(); - const SfxItemSet* pSet = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); - SfxAllItemSet* pNewSet = 0; + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pViewData->GetBindings(); + const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern(); + const SfxItemSet* pSet = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); + SfxAllItemSet* pNewSet = 0; - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox if ( (nSlot == SID_ATTR_CHAR_WEIGHT) ||(nSlot == SID_ATTR_CHAR_POSTURE) @@ -1202,7 +1202,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) aSetItem.PutItemForScriptType( nScript, pSet->Get( ATTR_FONT_WEIGHT ) ); else { - // toggle manually + // toggle manually FontWeight eWeight = WEIGHT_BOLD; SvxScriptSetItem aOldSetItem( nSlot, rPool ); @@ -1229,7 +1229,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) aSetItem.PutItemForScriptType( nScript, pSet->Get( ATTR_FONT_POSTURE ) ); else { - // toggle manually + // toggle manually FontItalic eItalic = ITALIC_NORMAL; SvxScriptSetItem aOldSetItem( nSlot, rPool ); @@ -1277,7 +1277,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) case SID_ULINE_VAL_NONE: pTabViewShell->ApplyAttr( SvxUnderlineItem( UNDERLINE_NONE, ATTR_FONT_UNDERLINE ) ); break; - case SID_ULINE_VAL_SINGLE: // Toggles + case SID_ULINE_VAL_SINGLE: // Toggles case SID_ULINE_VAL_DOUBLE: case SID_ULINE_VAL_DOTTED: { @@ -1313,7 +1313,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) * Button ist gedrueckt */ - const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); + const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); const SfxPoolItem* pItem = NULL; const SvxHorJustifyItem* pHorJustify = NULL; const SvxVerJustifyItem* pVerJustify = NULL; @@ -1340,7 +1340,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_HOR_JUSTIFY_LEFT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_LEFT ); +// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_LEFT ); //break; case SID_ALIGNRIGHT: @@ -1350,7 +1350,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_RIGHT ); +// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_RIGHT ); //break; case SID_ALIGNCENTERHOR: @@ -1360,7 +1360,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_HOR_JUSTIFY_CENTER : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_CENTER ); +// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_CENTER ); //break; case SID_ALIGNBLOCK: @@ -1370,7 +1370,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_HOR_JUSTIFY_BLOCK : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_BLOCK ); +// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_BLOCK ); //break; case SID_ALIGNTOP: @@ -1380,7 +1380,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_VER_JUSTIFY_TOP : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_TOP ); +// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_TOP ); //break; case SID_ALIGNBOTTOM: @@ -1390,7 +1390,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_VER_JUSTIFY_BOTTOM : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_BOTTOM ); +// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_BOTTOM ); //break; case SID_ALIGNCENTERVER: @@ -1400,7 +1400,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_VER_JUSTIFY_CENTER : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_CENTER ); +// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_CENTER ); //break; default: @@ -1410,7 +1410,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) } rBindings.Update(); -// rReq.Done(); +// rReq.Done(); if( pNewSet ) { @@ -1431,11 +1431,11 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pViewData->GetBindings(); - const SfxItemSet* pNewAttrs = rReq.GetArgs(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pNewAttrs = rReq.GetArgs(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox if ( !pNewAttrs ) { @@ -1445,10 +1445,10 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) { case SID_ATTR_CHAR_FONT: case SID_ATTR_CHAR_FONTHEIGHT: - pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT ); // wenn ToolBar vertikal + pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT ); // wenn ToolBar vertikal break; - case SID_ATTR_ALIGN_LINEBREAK: // ohne Parameter als Toggle + case SID_ATTR_ALIGN_LINEBREAK: // ohne Parameter als Toggle { const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern(); BOOL bOld = ((const SfxBoolItem&)pAttrs->GetItem(ATTR_LINEBREAK)).GetValue(); @@ -1465,7 +1465,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) case SID_BACKGROUND_COLOR: { - // SID_BACKGROUND_COLOR without arguments -> set transparent background + // SID_BACKGROUND_COLOR without arguments -> set transparent background SvxBrushItem aBrushItem( (const SvxBrushItem&) pTabViewShell->GetSelectionPattern()-> @@ -1602,11 +1602,11 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) if ( pNewAttrs->GetItemState( ATTR_BORDER, TRUE, &pItem ) == SFX_ITEM_SET ) { - // #100959# The SvxFrameToolBoxControl toolbox controller uses a default - // SvxBorderLine (all widths 0) to mark the lines that should be set. - // Macro recording uses a SvxBoxItem with the real values (OutWidth > 0) - // or NULL pointers for no lines. - // -> Substitute existing lines with pDefLine only if widths are 0. + // #100959# The SvxFrameToolBoxControl toolbox controller uses a default + // SvxBorderLine (all widths 0) to mark the lines that should be set. + // Macro recording uses a SvxBoxItem with the real values (OutWidth > 0) + // or NULL pointers for no lines. + // -> Substitute existing lines with pDefLine only if widths are 0. SvxBoxItem aBoxItem ( *(const SvxBoxItem*)pItem ); if ( aBoxItem.GetTop() && aBoxItem.GetTop()->GetOutWidth() == 0 ) aBoxItem.SetLine( pDefLine, BOX_LINE_TOP ); @@ -1696,8 +1696,8 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) void ScFormatShell::GetAttrState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); const SvxBorderLine* pLine = pTabViewShell->GetDefaultFrameLine(); const SvxBrushItem& rBrushItem = (const SvxBrushItem&)rAttrSet.Get( ATTR_BACKGROUND ); SfxWhichIter aIter( rSet ); @@ -1705,8 +1705,8 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( rAttrSet, FALSE ); - // choose font info according to selection script type - BYTE nScript = 0; // GetSelectionScriptType never returns 0 + // choose font info according to selection script type + BYTE nScript = 0; // GetSelectionScriptType never returns 0 if ( rSet.GetItemState( ATTR_FONT ) != SFX_ITEM_UNKNOWN ) { if (!nScript) nScript = pTabViewShell->GetSelectionScriptType(); @@ -1737,7 +1737,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( rBrushItem, GetPool().GetWhich(nWhich) ); } break; -/* case SID_ATTR_ALIGN_LINEBREAK: +/* case SID_ATTR_ALIGN_LINEBREAK: { const SfxBoolItem& rBreakItem = (const SfxBoolItem&)rAttrSet.Get( ATTR_LINEBREAK ); rSet.Put( rBreakItem, GetPool().GetWhich(nWhich) ); @@ -1753,12 +1753,12 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); rSet.Put( rAttrSet, FALSE ); // ItemStates mitkopieren - // choose font info according to selection script type - BYTE nScript = 0; // GetSelectionScriptType never returns 0 + // choose font info according to selection script type + BYTE nScript = 0; // GetSelectionScriptType never returns 0 if ( rSet.GetItemState( ATTR_FONT_WEIGHT ) != SFX_ITEM_UNKNOWN ) { if (!nScript) nScript = pTabViewShell->GetSelectionScriptType(); @@ -1771,7 +1771,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) } SfxItemState eState; -// const SfxPoolItem* pItem; +// const SfxPoolItem* pItem; //-------------------------------------------------------------------- // eigene Kontrolle ueber RadioButton-Funktionalitaet: @@ -1794,9 +1794,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) USHORT nId = SID_ULINE_VAL_NONE; switch (eUnderline) { - case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; - case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; - case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; + case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; + case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; + case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; default: break; } @@ -1811,11 +1811,11 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) const SvxVerJustifyItem* pVerJustify = NULL; SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD; SvxCellVerJustify eVerJustify = SVX_VER_JUSTIFY_STANDARD; - USHORT nWhich = 0; - BOOL bJustifyStd = FALSE; - SfxBoolItem aBoolItem ( 0, TRUE ); + USHORT nWhich = 0; + BOOL bJustifyStd = FALSE; + SfxBoolItem aBoolItem ( 0, TRUE ); - eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, TRUE, + eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, TRUE, (const SfxPoolItem**)&pHorJustify ); switch ( eState ) { @@ -1872,10 +1872,10 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) else if ( bJustifyStd ) { aBoolItem.SetValue( FALSE ); - aBoolItem.SetWhich( SID_ALIGNLEFT ); rSet.Put( aBoolItem ); - aBoolItem.SetWhich( SID_ALIGNRIGHT ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNLEFT ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNRIGHT ); rSet.Put( aBoolItem ); aBoolItem.SetWhich( SID_ALIGNCENTERHOR ); rSet.Put( aBoolItem ); - aBoolItem.SetWhich( SID_ALIGNBLOCK ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNBLOCK ); rSet.Put( aBoolItem ); bJustifyStd = FALSE; } @@ -1936,8 +1936,8 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) else if ( bJustifyStd ) { aBoolItem.SetValue( FALSE ); - aBoolItem.SetWhich( SID_ALIGNTOP ); rSet.Put( aBoolItem ); - aBoolItem.SetWhich( SID_ALIGNBOTTOM ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNTOP ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNBOTTOM ); rSet.Put( aBoolItem ); aBoolItem.SetWhich( SID_ALIGNCENTERVER ); rSet.Put( aBoolItem ); } } @@ -1947,9 +1947,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) void ScFormatShell::GetBorderState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SvxBoxItem aBoxItem( ATTR_BORDER ); - SvxBoxInfoItem aInfoItem( ATTR_BORDER_INNER ); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SvxBoxItem aBoxItem( ATTR_BORDER ); + SvxBoxInfoItem aInfoItem( ATTR_BORDER_INNER ); pTabViewShell->GetSelectionFrame( aBoxItem, aInfoItem ); @@ -1963,10 +1963,10 @@ void ScFormatShell::GetBorderState( SfxItemSet& rSet ) void ScFormatShell::GetAlignState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); SvxCellHorJustify eHAlign = SVX_HOR_JUSTIFY_STANDARD; bool bHasHAlign = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY ) != SFX_ITEM_DONTCARE; @@ -2012,7 +2012,7 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet ) void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); ScDocument* pDoc = pViewData->GetDocument(); short nType = GetCurrentNumberFormatType(); @@ -2024,7 +2024,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) { case SID_NUMBER_FORMAT: { - String aFormatCode; // bleibt leer, wenn dont-care + String aFormatCode; // bleibt leer, wenn dont-care const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) != SFX_ITEM_DONTCARE ) @@ -2127,7 +2127,7 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet ) eBidiDir = EE_HTEXTDIR_L2R; } - SvtLanguageOptions aLangOpt; + SvtLanguageOptions aLangOpt; BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled(); BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); diff --git a/sc/source/ui/view/galwrap.cxx b/sc/source/ui/view/galwrap.cxx index 2e5f8f831bad..ea36d2430d43 100644 --- a/sc/source/ui/view/galwrap.cxx +++ b/sc/source/ui/view/galwrap.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 @@ -63,7 +63,7 @@ String GalleryGetFullPath() { GalleryExplorer* pGal = SVX_GALLERY(); DBG_ASSERT( pGal, "Wo ist die Gallery?" ); -// return pGal->GetPath().GetFull(); +// return pGal->GetPath().GetFull(); return pGal->GetURL().GetMainURL(INetURLObject::NO_DECODE); // URL as stored in GraphicLink must be encoded } diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx index 31dba191b2fd..2481d4fc18be 100644 --- a/sc/source/ui/view/gridmerg.cxx +++ b/sc/source/ui/view/gridmerg.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,8 +44,8 @@ ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePix nCount( 0 ), bVertical( FALSE ) { - // optimize (DrawGrid) only for pixel MapMode, - // to avoid rounding errors + // optimize (DrawGrid) only for pixel MapMode, + // to avoid rounding errors bOptimize = ( pDev->GetMapMode().GetMapUnit() == MAP_PIXEL ); } @@ -59,8 +59,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) { if ( nCount ) { - // not first line - test fix position - // more than one previous line - test distance + // not first line - test fix position + // more than one previous line - test distance if ( nStart != nFixStart || nEnd != nFixEnd ) { @@ -68,8 +68,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) ( nStart == nFixEnd || nStart == nFixEnd + ( bVertical ? nOneY : nOneX ) ) ) { - // additional optimization: extend connected lines - // keep nCount at 1 + // additional optimization: extend connected lines + // keep nCount at 1 nFixEnd = nEnd; } else @@ -80,7 +80,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) nVarDiff = nPos - nVarStart; ++nCount; } - else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd? + else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd? Flush(); else ++nCount; @@ -88,7 +88,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) if ( !nCount ) { - // first line (or flushed above) - just store + // first line (or flushed above) - just store nFixStart = nStart; nFixEnd = nEnd; @@ -141,9 +141,9 @@ void ScGridMerger::Flush() long nVarEnd = nVarStart + ( nCount - 1 ) * nVarDiff; if ( nVarDiff < 0 ) { - // nVarDiff is negative in RTL layout mode - // Change the positions so DrawGrid is called with a positive distance - // (nVarStart / nVarDiff can be modified, aren't used after Flush) + // nVarDiff is negative in RTL layout mode + // Change the positions so DrawGrid is called with a positive distance + // (nVarStart / nVarDiff can be modified, aren't used after Flush) nVarDiff = -nVarDiff; long nTemp = nVarStart; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index f0fc67c22b76..e765ebf0997f 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.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 @@ -56,8 +56,8 @@ #include <sot/formats.hxx> #include <sot/clsids.hxx> -#include <svx/svdview.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) -#include <editeng/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) +#include <svx/svdview.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) +#include <editeng/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) #include <svx/svditer.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> @@ -92,10 +92,10 @@ #include "editutil.hxx" #include "scresid.hxx" #include "inputhdl.hxx" -#include "uiitems.hxx" // Filter-Dialog - auslagern !!! +#include "uiitems.hxx" // Filter-Dialog - auslagern !!! #include "filtdlg.hxx" -#include "impex.hxx" // Sylk-ID fuer CB -#include "cell.hxx" // fuer Edit-Felder +#include "impex.hxx" // Sylk-ID fuer CB +#include "cell.hxx" // fuer Edit-Felder #include "patattr.hxx" #include "notemark.hxx" #include "rfindlst.hxx" @@ -142,13 +142,13 @@ const BYTE SC_NESTEDBUTTON_NONE = 0; const BYTE SC_NESTEDBUTTON_DOWN = 1; const BYTE SC_NESTEDBUTTON_UP = 2; -#define SC_AUTOFILTER_ALL 0 -#define SC_AUTOFILTER_TOP10 1 -#define SC_AUTOFILTER_CUSTOM 2 +#define SC_AUTOFILTER_ALL 0 +#define SC_AUTOFILTER_TOP10 1 +#define SC_AUTOFILTER_CUSTOM 2 #define SC_AUTOFILTER_EMPTY 3 #define SC_AUTOFILTER_NOTEMPTY 4 -// Modi fuer die FilterListBox +// Modi fuer die FilterListBox enum ScFilterBoxMode { SC_FILTERBOX_FILTER, @@ -157,11 +157,11 @@ enum ScFilterBoxMode SC_FILTERBOX_PAGEFIELD }; -extern SfxViewShell* pScActiveViewShell; // global.cxx -extern USHORT nScClickMouseModifier; // global.cxx -extern USHORT nScFillModeMouseModifier; // global.cxx +extern SfxViewShell* pScActiveViewShell; // global.cxx +extern USHORT nScClickMouseModifier; // global.cxx +extern USHORT nScFillModeMouseModifier; // global.cxx -#define SC_FILTERLISTBOX_LINES 12 +#define SC_FILTERLISTBOX_LINES 12 // ============================================================================ @@ -180,36 +180,36 @@ bool ScGridWindow::VisibleRange::isInside(SCCOL nCol, SCROW nRow) const class ScFilterListBox : public ListBox { private: - ScGridWindow* pGridWin; - SCCOL nCol; - SCROW nRow; - BOOL bButtonDown; - BOOL bInit; - BOOL bCancelled; + ScGridWindow* pGridWin; + SCCOL nCol; + SCROW nRow; + BOOL bButtonDown; + BOOL bInit; + BOOL bCancelled; BOOL bInSelect; bool mbListHasDates; - ULONG nSel; - ScFilterBoxMode eMode; + ULONG nSel; + ScFilterBoxMode eMode; protected: - virtual void LoseFocus(); - void SelectHdl(); + virtual void LoseFocus(); + void SelectHdl(); public: ScFilterListBox( Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ); ~ScFilterListBox(); - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void Select(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void Select(); - SCCOL GetCol() const { return nCol; } - SCROW GetRow() const { return nRow; } - ScFilterBoxMode GetMode() const { return eMode; } - BOOL IsDataSelect() const { return (eMode == SC_FILTERBOX_DATASELECT); } - void EndInit(); + SCCOL GetCol() const { return nCol; } + SCROW GetRow() const { return nRow; } + ScFilterBoxMode GetMode() const { return eMode; } + BOOL IsDataSelect() const { return (eMode == SC_FILTERBOX_DATASELECT); } + void EndInit(); BOOL IsInInit() const { return bInit; } - void SetCancelled() { bCancelled = TRUE; } + void SetCancelled() { bCancelled = TRUE; } BOOL IsInSelect() const { return bInSelect; } void SetListHasDates(bool b) { mbListHasDates = b; } bool HasDates() const { return mbListHasDates; } @@ -217,7 +217,7 @@ public: //------------------------------------------------------------------- -// ListBox in einem FloatingWindow (pParent) +// ListBox in einem FloatingWindow (pParent) ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ) : ListBox( pParent, WB_AUTOHSCROLL ), @@ -267,17 +267,17 @@ long ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) { KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); KeyCode aCode = aKeyEvt.GetKeyCode(); - if ( !aCode.GetModifier() ) // ohne alle Modifiers + if ( !aCode.GetModifier() ) // ohne alle Modifiers { USHORT nKey = aCode.GetCode(); if ( nKey == KEY_RETURN ) { - SelectHdl(); // auswaehlen + SelectHdl(); // auswaehlen nDone = 1; } else if ( nKey == KEY_ESCAPE ) { - pGridWin->ClickExtern(); // loescht die List-Box !!! + pGridWin->ClickExtern(); // loescht die List-Box !!! nDone = 1; } } @@ -342,9 +342,9 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() BOOL lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) { - // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle - // mit Origin links oben liegt, enthaelt der Bereich genau die Matrix. - //! Direkt die MatrixEdges Funktionen von der Column herausreichen ??? + // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle + // mit Origin links oben liegt, enthaelt der Bereich genau die Matrix. + //! Direkt die MatrixEdges Funktionen von der Column herausreichen ??? if ( !pDoc->IsBlockEditable( rRange.aStart.Tab(), rRange.aStart.Col(),rRange.aStart.Row(), rRange.aEnd.Col(),rRange.aEnd.Row() ) ) @@ -385,9 +385,9 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA if ( !rpCell || rpCell->GetCellType() == CELLTYPE_NOTE ) { if ( rPosX <= 0 ) - return FALSE; // alles leer bis links + return FALSE; // alles leer bis links else - --rPosX; // weitersuchen + --rPosX; // weitersuchen } else if ( rpCell->GetCellType() == CELLTYPE_EDIT) bFound = TRUE; @@ -395,7 +395,7 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA static_cast<ScFormulaCell*>(rpCell)->IsHyperLinkCell()) bFound = TRUE; else - return FALSE; // andere Zelle + return FALSE; // andere Zelle } while ( !bFound ); @@ -403,9 +403,9 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA } // --------------------------------------------------------------------------- -// WB_DIALOGCONTROL noetig fuer UNO-Controls +// WB_DIALOGCONTROL noetig fuer UNO-Controls ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) -: Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), +: Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), DropTargetHelper( this ), DragSourceHelper( this ), mpOOCursors( NULL ), @@ -422,7 +422,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic pFilterBox( NULL ), pFilterFloat( NULL ), mpDPFieldPopup(NULL), - mpFilterButton(NULL), + mpFilterButton(NULL), nCursorHideCount( 0 ), bMarking( FALSE ), nButtonDown( 0 ), @@ -475,7 +475,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic SetBackground(); SetMapMode(pViewData->GetLogicMode(eWhich)); -// EnableDrop(); +// EnableDrop(); EnableChildTransparentMode(); SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS ); @@ -498,7 +498,7 @@ __EXPORT ScGridWindow::~ScGridWindow() void __EXPORT ScGridWindow::Resize( const Size& ) { - // gar nix + // gar nix } void ScGridWindow::ClickExtern() @@ -512,7 +512,7 @@ void ScGridWindow::ClickExtern() { break; } - + DELETEZ(pFilterBox); DELETEZ(pFilterFloat); } @@ -528,7 +528,7 @@ void ScGridWindow::ClickExtern() IMPL_LINK( ScGridWindow, PopupModeEndHdl, FloatingWindow*, EMPTYARG ) { if (pFilterBox) - pFilterBox->SetCancelled(); // nicht mehr auswaehlen + pFilterBox->SetCancelled(); // nicht mehr auswaehlen GrabFocus(); return 0; } @@ -542,11 +542,11 @@ IMPL_LINK( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo*, pInfo ) void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr ) { - //! gridwin2 ? + //! gridwin2 ? ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); + ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); if ( pDPObj && nCol > 0 ) { // look for the dimension header left of the drop-down arrow @@ -571,7 +571,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti aNewObj.SetSaveData( aSaveData ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE ); - pViewData->GetView()->CursorPosChanged(); // shells may be switched + pViewData->GetView()->CursorPosChanged(); // shells may be switched } } } @@ -579,7 +579,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) { - //! merge position/size handling with DoAutoFilterMenue + //! merge position/size handling with DoAutoFilterMenue delete pFilterBox; delete pFilterFloat; @@ -602,7 +602,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) aPos.X() -= 1; aPos.Y() += nSizeY - 1; - pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // not resizable etc. + pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // not resizable etc. pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) ); pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, SC_FILTERBOX_PAGEFIELD ); if ( bLayoutRTL ) @@ -611,7 +611,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) nSizeX += 1; { - Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); + Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL ); nHeight = GetTextHeight(); @@ -621,14 +621,14 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) SetFont( aOldFont ); } - // SetSize comes later + // SetSize comes later TypedScStrCollection aStrings( 128, 128 ); - // get list box entries and selection + // get list box entries and selection BOOL bHasCurrentPage = FALSE; String aCurrentPage; - ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); + ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); if ( pDPObj && nCol > 0 ) { // look for the dimension header left of the drop-down arrow @@ -655,7 +655,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) } } - // include all entry widths for the size of the drop-down + // include all entry widths for the size of the drop-down long nMaxText = 0; USHORT nCount = aStrings.GetCount(); for (i=0; i<nCount; i++) @@ -666,17 +666,17 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) nMaxText = nTextWidth; } - // add scrollbar width if needed (string entries are counted here) - // (scrollbar is shown if the box is exactly full?) + // add scrollbar width if needed (string entries are counted here) + // (scrollbar is shown if the box is exactly full?) if ( nCount >= SC_FILTERLISTBOX_LINES ) nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize(); - nMaxText += 4; // for borders + nMaxText += 4; // for borders if ( nMaxText > nSizeX ) - nSizeX = nMaxText; // just modify width - starting position is unchanged + nSizeX = nMaxText; // just modify width - starting position is unchanged - // adjust position and size to window + // adjust position and size to window Size aParentSize = GetParent()->GetOutputSizePixel(); Size aSize( nSizeX, nHeight ); @@ -687,13 +687,13 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) aPos.Y() = aParentSize.Height() - aSize.Height(); pFilterBox->SetSizePixel( aSize ); - pFilterBox->Show(); // Show must be called before SetUpdateMode + pFilterBox->Show(); // Show must be called before SetUpdateMode pFilterBox->SetUpdateMode(FALSE); pFilterFloat->SetOutputSizePixel( aSize ); pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS); - // fill the list box + // fill the list box BOOL bWait = ( nCount > 100 ); if (bWait) @@ -718,7 +718,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) pFilterBox->GrabFocus(); - // call Select after GrabFocus, so the focus rectangle ends up in the right position + // call Select after GrabFocus, so the focus rectangle ends up in the right position if ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) pFilterBox->SelectEntryPos( nSelPos ); @@ -749,13 +749,13 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) delete pFilterBox; delete pFilterFloat; - SCCOL nCol = rScenRange.aEnd.Col(); // Zelle unterhalb des Buttons + SCCOL nCol = rScenRange.aEnd.Col(); // Zelle unterhalb des Buttons SCROW nRow = rScenRange.aStart.Row(); if (nRow == 0) { - nRow = rScenRange.aEnd.Row() + 1; // Bereich ganz oben -> Button unterhalb + nRow = rScenRange.aEnd.Row() + 1; // Bereich ganz oben -> Button unterhalb if (nRow>MAXROW) nRow = MAXROW; - //! Texthoehe addieren (wenn sie an der View gespeichert ist...) + //! Texthoehe addieren (wenn sie an der View gespeichert ist...) } ScDocument* pDoc = pViewData->GetDocument(); @@ -772,10 +772,10 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) Rectangle aCellRect( OutputToScreenPixel(aPos), Size(nSizeX,nSizeY) ); aCellRect.Top() -= nSizeY; aCellRect.Bottom() -= nSizeY - 1; - // Die ListBox direkt unter der schwarzen Linie auf dem Zellgitter - // (wenn die Linie verdeckt wird, sieht es komisch aus...) + // Die ListBox direkt unter der schwarzen Linie auf dem Zellgitter + // (wenn die Linie verdeckt wird, sieht es komisch aus...) - pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. + pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) ); pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, SC_FILTERBOX_SCENARIO ); if ( bLayoutRTL ) @@ -784,7 +784,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) nSizeX += 1; { - Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); + Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL ); nHeight = GetTextHeight(); @@ -794,22 +794,22 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) SetFont( aOldFont ); } - // SetSize spaeter + // SetSize spaeter /* pFilterBox->SetSelectionMode( SINGLE_SELECTION ); pFilterBox->SetTabs( nFilterBoxTabs, MapUnit( MAP_APPFONT )); pFilterBox->SetTabJustify( 1, bLayoutRTL ? AdjustRight : AdjustLeft ); */ - // ParentSize Abfrage fehlt + // ParentSize Abfrage fehlt Size aSize( nSizeX, nHeight ); pFilterBox->SetSizePixel( aSize ); - pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!! + pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!! pFilterBox->SetUpdateMode(FALSE); - // SetOutputSizePixel/StartPopupMode erst unten, wenn die Groesse feststeht + // SetOutputSizePixel/StartPopupMode erst unten, wenn die Groesse feststeht - // Listbox fuellen + // Listbox fuellen long nMaxText = 0; String aCurrent; @@ -832,11 +832,11 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) } if (nEntryCount > SC_FILTERLISTBOX_LINES) nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize(); - nMaxText += 4; // fuer Rand + nMaxText += 4; // fuer Rand if ( nMaxText > 300 ) - nMaxText = 300; // auch nicht uebertreiben (Pixel) + nMaxText = 300; // auch nicht uebertreiben (Pixel) - if (nMaxText > nSizeX) // Groesse auf benoetigte Groesse anpassen + if (nMaxText > nSizeX) // Groesse auf benoetigte Groesse anpassen { long nDiff = nMaxText - nSizeX; aSize = Size( nMaxText, nHeight ); @@ -845,7 +845,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) if ( !bLayoutRTL ) { - // also move popup position + // also move popup position long nNewX = aCellRect.Left() - nDiff; if ( nNewX < 0 ) nNewX = 0; @@ -859,24 +859,24 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) pFilterBox->SetUpdateMode(TRUE); pFilterBox->GrabFocus(); - // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet -//! SvLBoxEntry* pSelect = NULL; + // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet +//! SvLBoxEntry* pSelect = NULL; USHORT nPos = LISTBOX_ENTRY_NOTFOUND; if (aCurrent.Len()) { nPos = pFilterBox->GetEntryPos( aCurrent ); -//! pSelect = pFilterBox->GetEntry( nPos ); +//! pSelect = pFilterBox->GetEntry( nPos ); } if (/*!pSelect*/ LISTBOX_ENTRY_NOTFOUND == nPos && pFilterBox->GetEntryCount() > 0 ) nPos = 0; -//! pSelect = pFilterBox->GetEntry(0); // einer sollte immer selektiert sein +//! pSelect = pFilterBox->GetEntry(0); // einer sollte immer selektiert sein if (/*pSelect*/ LISTBOX_ENTRY_NOTFOUND != nPos ) pFilterBox->SelectEntryPos(nPos); pFilterBox->EndInit(); // Szenario-Auswahl kommt aus MouseButtonDown: - // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown + // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown nMouseStatus = SC_GM_FILTER; CaptureMouse(); @@ -905,7 +905,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) aPos.X() -= 1; aPos.Y() += nSizeY - 1; - pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. + pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) ); pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, bDataSelect ? SC_FILTERBOX_DATASELECT : SC_FILTERBOX_FILTER ); @@ -915,7 +915,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) nSizeX += 1; { - Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); + Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL ); nHeight = GetTextHeight(); @@ -925,7 +925,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) SetFont( aOldFont ); } - // SetSize spaeter + // SetSize spaeter /* pFilterBox->SetSelectionMode( SINGLE_SELECTION ); pFilterBox->SetTabs( nFilterBoxTabs, MapUnit( MAP_APPFONT )); @@ -934,24 +934,24 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) BOOL bEmpty = FALSE; TypedScStrCollection aStrings( 128, 128 ); - if ( bDataSelect ) // Auswahl-Liste + if ( bDataSelect ) // Auswahl-Liste { - // Liste fuellen + // Liste fuellen aStrings.SetCaseSensitive( TRUE ); pDoc->GetDataEntries( nCol, nRow, nTab, aStrings ); if ( aStrings.GetCount() == 0 ) bEmpty = TRUE; } - else // AutoFilter + else // AutoFilter { - //! wird der Titel ueberhaupt ausgewertet ??? + //! wird der Titel ueberhaupt ausgewertet ??? String aString; pDoc->GetString( nCol, nRow, nTab, aString ); pFilterBox->SetText( aString ); long nMaxText = 0; - // default entries + // default entries static const USHORT nDefIDs[] = { SCSTR_ALLFILTER, SCSTR_TOP10FILTER, SCSTR_STDFILTER, SCSTR_EMPTY, SCSTR_NOTEMPTY }; const USHORT nDefCount = sizeof(nDefIDs) / sizeof(USHORT); for (i=0; i<nDefCount; i++) @@ -964,18 +964,18 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) } pFilterBox->SetSeparatorPos( nDefCount - 1 ); - // get list entries + // get list entries bool bHasDates = false; pDoc->GetFilterEntries( nCol, nRow, nTab, true, aStrings, bHasDates); pFilterBox->SetListHasDates(bHasDates); - // check widths of numerical entries (string entries are not included) - // so all numbers are completely visible + // check widths of numerical entries (string entries are not included) + // so all numbers are completely visible USHORT nCount = aStrings.GetCount(); for (i=0; i<nCount; i++) { TypedStrData* pData = aStrings[i]; - if ( !pData->IsStrData() ) // only numerical entries + if ( !pData->IsStrData() ) // only numerical entries { long nTextWidth = pFilterBox->GetTextWidth( pData->GetString() ); if ( nTextWidth > nMaxText ) @@ -983,21 +983,21 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) } } - // add scrollbar width if needed (string entries are counted here) - // (scrollbar is shown if the box is exactly full?) + // add scrollbar width if needed (string entries are counted here) + // (scrollbar is shown if the box is exactly full?) if ( nCount + nDefCount >= SC_FILTERLISTBOX_LINES ) nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize(); - nMaxText += 4; // for borders + nMaxText += 4; // for borders if ( nMaxText > nSizeX ) - nSizeX = nMaxText; // just modify width - starting position is unchanged + nSizeX = nMaxText; // just modify width - starting position is unchanged } if (!bEmpty) { - // Position und Groesse an Fenster anpassen - //! vorher Abfrage, ob die Eintraege hineinpassen (Breite) + // Position und Groesse an Fenster anpassen + //! vorher Abfrage, ob die Eintraege hineinpassen (Breite) Size aParentSize = GetParent()->GetOutputSizePixel(); Size aSize( nSizeX, nHeight ); @@ -1008,13 +1008,13 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) aPos.Y() = aParentSize.Height() - aSize.Height(); pFilterBox->SetSizePixel( aSize ); - pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!! + pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!! pFilterBox->SetUpdateMode(FALSE); pFilterFloat->SetOutputSizePixel( aSize ); pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS); - // Listbox fuellen + // Listbox fuellen USHORT nCount = aStrings.GetCount(); BOOL bWait = ( nCount > 100 ); @@ -1030,22 +1030,22 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) pFilterBox->SetUpdateMode(TRUE); } -//! SvLBoxEntry* pSelect = NULL; +//! SvLBoxEntry* pSelect = NULL; USHORT nSelPos = LISTBOX_ENTRY_NOTFOUND; - if (!bDataSelect) // AutoFilter: aktiven Eintrag selektieren + if (!bDataSelect) // AutoFilter: aktiven Eintrag selektieren { ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab ); if (pDBData) { ScQueryParam aParam; - pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben + pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben BOOL bValid = TRUE; - for (SCSIZE j=0; j<MAXQUERY && bValid; j++) // bisherige Filter-Einstellungen + for (SCSIZE j=0; j<MAXQUERY && bValid; j++) // bisherige Filter-Einstellungen if (aParam.GetEntry(j).bDoQuery) { - //! Abfrage mit DrawButtons zusammenfassen! + //! Abfrage mit DrawButtons zusammenfassen! ScQueryEntry& rEntry = aParam.GetEntry(j); if (j>0) @@ -1059,7 +1059,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) if (pStr) { nSelPos = pFilterBox->GetEntryPos( *pStr ); -//! pSelect = pFilterBox->GetEntry( nPos ); +//! pSelect = pFilterBox->GetEntry( nPos ); } } else if (rEntry.eOp == SC_TOPVAL && rEntry.pStr && @@ -1081,7 +1081,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) nCol, nRow, nTab, ATTR_VALIDDATA ))->GetValue(); if ( nIndex ) { - const ScValidationData* pData = pDoc->GetValidationEntry( nIndex ); + const ScValidationData* pData = pDoc->GetValidationEntry( nIndex ); if (pData) { TypedStrData* pNew = NULL; @@ -1107,7 +1107,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) USHORT nCount = aStrings.GetCount(); for (i = 0; ((i < nCount) && ( LISTBOX_ENTRY_NOTFOUND == nSelPos)); i++) { - if ( aStrings.Compare(aStrings[i], pNew)==0 ) + if ( aStrings.Compare(aStrings[i], pNew)==0 ) nSelPos = i; } } @@ -1116,24 +1116,24 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) } } - // neu (309): irgendwas muss immer selektiert sein: + // neu (309): irgendwas muss immer selektiert sein: if ( LISTBOX_ENTRY_NOTFOUND == nSelPos && pFilterBox->GetEntryCount() > 0 && !bDataSelect) nSelPos = 0; - // keine leere Auswahl-Liste anzeigen: + // keine leere Auswahl-Liste anzeigen: if ( bEmpty ) { - DELETEZ(pFilterBox); // war nix + DELETEZ(pFilterBox); // war nix DELETEZ(pFilterFloat); - Sound::Beep(); // bemerkbar machen + Sound::Beep(); // bemerkbar machen } else { -// pFilterBox->Show(); // schon vorne +// pFilterBox->Show(); // schon vorne pFilterBox->GrabFocus(); - // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet + // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet if ( LISTBOX_ENTRY_NOTFOUND != nSelPos ) pFilterBox->SelectEntryPos( nSelPos ); else @@ -1147,7 +1147,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) if (!bDataSelect) { // AutoFilter (aus MouseButtonDown): - // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown + // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown nMouseStatus = SC_GM_FILTER; CaptureMouse(); @@ -1191,7 +1191,7 @@ void ScGridWindow::FilterSelect( ULONG nSel ) if (pFilterFloat) pFilterFloat->EndPopupMode(); - GrabFocus(); // unter OS/2 stimmt der Focus sonst nicht + GrabFocus(); // unter OS/2 stimmt der Focus sonst nicht } void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr ) @@ -1219,7 +1219,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, if (pDBData) { ScQueryParam aParam; - pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben + pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben if (SC_AUTOFILTER_CUSTOM == nSel) { @@ -1230,7 +1230,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, SCROW nEndRow; pDBData->GetArea( nAreaTab, nStartCol,nStartRow,nEndCol,nEndRow ); pViewData->GetView()->MarkRange( ScRange( nStartCol,nStartRow,nAreaTab,nEndCol,nEndRow,nAreaTab)); - pViewData->GetView()->SetCursor(nCol,nRow); //! auch ueber Slot ?? + pViewData->GetView()->SetCursor(nCol,nRow); //! auch ueber Slot ?? pViewData->GetDispatcher().Execute( SID_FILTER, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); } else @@ -1242,10 +1242,10 @@ void ScGridWindow::ExecFilter( ULONG nSel, bDeleteOld = TRUE; if (aParam.bRegExp) bDeleteOld = TRUE; - for (SCSIZE i=0; i<MAXQUERY && !bDeleteOld; i++) // bisherige Filter-Einstellungen + for (SCSIZE i=0; i<MAXQUERY && !bDeleteOld; i++) // bisherige Filter-Einstellungen if (aParam.GetEntry(i).bDoQuery) { - //! Abfrage mit DrawButtons zusammenfassen! + //! Abfrage mit DrawButtons zusammenfassen! ScQueryEntry& rEntry = aParam.GetEntry(i); if (i>0) @@ -1254,7 +1254,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, if (rEntry.nField == nCol) { - if (bFound) // diese Spalte zweimal? + if (bFound) // diese Spalte zweimal? bDeleteOld = TRUE; nQueryPos = i; bFound = TRUE; @@ -1273,40 +1273,40 @@ void ScGridWindow::ExecFilter( ULONG nSel, aParam.bRegExp = FALSE; } - if ( nQueryPos < MAXQUERY || SC_AUTOFILTER_ALL == nSel ) // loeschen geht immer + if ( nQueryPos < MAXQUERY || SC_AUTOFILTER_ALL == nSel ) // loeschen geht immer { if (nSel) { ScQueryEntry& rNewEntry = aParam.GetEntry(nQueryPos); - rNewEntry.bDoQuery = TRUE; + rNewEntry.bDoQuery = TRUE; rNewEntry.bQueryByString = TRUE; - rNewEntry.nField = nCol; + rNewEntry.nField = nCol; rNewEntry.bQueryByDate = bCheckForDates; if ( nSel == SC_AUTOFILTER_TOP10 ) { - rNewEntry.eOp = SC_TOPVAL; - *rNewEntry.pStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("10")); + rNewEntry.eOp = SC_TOPVAL; + *rNewEntry.pStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("10")); } else if (nSel == SC_AUTOFILTER_EMPTY) { rNewEntry.pStr->Erase(); rNewEntry.bQueryByString = FALSE; - rNewEntry.eOp = SC_EQUAL; - rNewEntry.nVal = SC_EMPTYFIELDS; + rNewEntry.eOp = SC_EQUAL; + rNewEntry.nVal = SC_EMPTYFIELDS; } else if (nSel == SC_AUTOFILTER_NOTEMPTY) { rNewEntry.pStr->Erase(); rNewEntry.bQueryByString = FALSE; - rNewEntry.eOp = SC_EQUAL; - rNewEntry.nVal = SC_NONEMPTYFIELDS; + rNewEntry.eOp = SC_EQUAL; + rNewEntry.nVal = SC_NONEMPTYFIELDS; } else { - rNewEntry.eOp = SC_EQUAL; - *rNewEntry.pStr = aValue; + rNewEntry.eOp = SC_EQUAL; + *rNewEntry.pStr = aValue; } if (nQueryPos > 0) rNewEntry.eConnect = SC_AND; @@ -1317,7 +1317,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, aParam.DeleteQuery(nQueryPos); } - // #100597# end edit mode - like in ScCellShell::ExecuteDB + // #100597# end edit mode - like in ScCellShell::ExecuteDB if ( pViewData->HasEditView( pViewData->GetActivePart() ) ) { SC_MOD()->InputEnterHandler(); @@ -1326,9 +1326,9 @@ void ScGridWindow::ExecFilter( ULONG nSel, aParam.bUseDynamicRange = true; pViewData->GetView()->Query( aParam, NULL, TRUE ); - pDBData->SetQueryParam( aParam ); // speichern + pDBData->SetQueryParam( aParam ); // speichern } - else // "Zuviele Bedingungen" + else // "Zuviele Bedingungen" pViewData->GetView()->ErrorMessage( STR_FILTER_TOOMANY ); } } @@ -1375,10 +1375,10 @@ void ScGridWindow::MoveMouseStatus( ScGridWindow& rDestWin ) BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) { - // MouseEvent buttons must only be checked if bAction==TRUE - // to allow changing the mouse pointer in MouseMove, - // but not start AutoFill with right button (#74229#). - // with bAction==TRUE, SetFillMode / SetDragMode is called + // MouseEvent buttons must only be checked if bAction==TRUE + // to allow changing the mouse pointer in MouseMove, + // but not start AutoFill with right button (#74229#). + // with bAction==TRUE, SetFillMode / SetDragMode is called if ( bAction && !rMEvt.IsLeft() ) return FALSE; @@ -1394,7 +1394,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) SCTAB nTab = pViewData->GetTabNo(); BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - // Auto-Fill + // Auto-Fill ScRange aMarkRange; if (pViewData->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE) @@ -1417,8 +1417,8 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) pViewData->SetFillMode( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), nX, nY ); - // #108266# The simple selection must also be recognized when dragging, - // where the Marking flag is set and MarkToSimple won't work anymore. + // #108266# The simple selection must also be recognized when dragging, + // where the Marking flag is set and MarkToSimple won't work anymore. pViewData->GetMarkData().MarkToSimple(); } bNewPointer = TRUE; @@ -1426,7 +1426,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) } } - // Embedded-Rechteck + // Embedded-Rechteck if (pDoc->IsEmbedded()) { @@ -1464,7 +1464,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) if (!bNewPointer && bAction) { -// SetPointer( POINTER_ARROW ); // in Fu... +// SetPointer( POINTER_ARROW ); // in Fu... pViewData->ResetFillMode(); } @@ -1510,11 +1510,11 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) aCurMousePos = rMEvt.GetPosPixel(); - // Filter-Popup beendet sich mit eigenem Mausklick, nicht erst beim Klick - // in das GridWindow, darum ist die folgende Abfrage nicht mehr noetig: - ClickExtern(); // loescht FilterBox, wenn vorhanden + // Filter-Popup beendet sich mit eigenem Mausklick, nicht erst beim Klick + // in das GridWindow, darum ist die folgende Abfrage nicht mehr noetig: + ClickExtern(); // loescht FilterBox, wenn vorhanden - HideNoteMarker(); // Notiz-Anzeige + HideNoteMarker(); // Notiz-Anzeige bEEMouse = FALSE; @@ -1525,24 +1525,24 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) return; } - pScActiveViewShell = pViewData->GetViewShell(); // falls auf Link geklickt wird - nScClickMouseModifier = rMEvt.GetModifier(); // um Control-Klick immer zu erkennen + pScActiveViewShell = pViewData->GetViewShell(); // falls auf Link geklickt wird + nScClickMouseModifier = rMEvt.GetModifier(); // um Control-Klick immer zu erkennen BOOL bDetective = pViewData->GetViewShell()->IsAuditShell(); - BOOL bRefMode = pViewData->IsRefMode(); // Referenz angefangen - BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz - BOOL bEditMode = pViewData->HasEditView(eWhich); // auch bei Mode==SC_INPUT_TYPE + BOOL bRefMode = pViewData->IsRefMode(); // Referenz angefangen + BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz + BOOL bEditMode = pViewData->HasEditView(eWhich); // auch bei Mode==SC_INPUT_TYPE BOOL bDouble = (rMEvt.GetClicks() == 2); - // DeactivateIP passiert nur noch bei MarkListHasChanged + // DeactivateIP passiert nur noch bei MarkListHasChanged - // im GrabFocus Aufruf kann eine Fehlermeldung hochkommen - // (z.B. beim Umbenennen von Tabellen per Tab-Reiter) + // im GrabFocus Aufruf kann eine Fehlermeldung hochkommen + // (z.B. beim Umbenennen von Tabellen per Tab-Reiter) if ( !nButtonDown || !bDouble ) // single (first) click is always valid nButtonDown = rMEvt.GetButtons(); // set nButtonDown first, so StopMarking works -// pViewData->GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); +// pViewData->GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); if ( ( bEditMode && pViewData->GetActivePart() == eWhich ) || !bFormulaMode ) GrabFocus(); @@ -1555,13 +1555,13 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) return; } - if ( bDetective ) // Detektiv-Fuell-Modus + if ( bDetective ) // Detektiv-Fuell-Modus { if ( rMEvt.IsLeft() && !rMEvt.GetModifier() ) { - Point aPos = rMEvt.GetPosPixel(); - SCsCOL nPosX; - SCsROW nPosY; + Point aPos = rMEvt.GetPosPixel(); + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); SfxInt16Item aPosXItem( SID_RANGE_COL, nPosX ); @@ -1593,14 +1593,14 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if (bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo())) { - Point aPos = rMEvt.GetPosPixel(); - SCsCOL nPosX; - SCsROW nPosY; + Point aPos = rMEvt.GetPosPixel(); + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); SCCOL nEndCol = pViewData->GetEditEndCol(); SCROW nEndRow = pViewData->GetEditEndRow(); @@ -1608,8 +1608,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if ( nPosX >= (SCsCOL) nEditCol && nPosX <= (SCsCOL) nEndCol && nPosY >= (SCsROW) nEditRow && nPosY <= (SCsROW) nEndRow ) { - // #53966# beim Klick in die Tabellen-EditView immer den Focus umsetzen - if (bFormulaMode) // sonst ist es oben schon passiert + // #53966# beim Klick in die Tabellen-EditView immer den Focus umsetzen + if (bFormulaMode) // sonst ist es oben schon passiert GrabFocus(); pScMod->SetInputMode( SC_INPUT_TABLE ); @@ -1621,7 +1621,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if (pScMod->GetIsWaterCan()) { - //! was is mit'm Mac ??? + //! was is mit'm Mac ??? if ( rMEvt.GetModifier() + rMEvt.GetButtons() == MOUSE_RIGHT ) { nMouseStatus = SC_GM_WATERUNDO; @@ -1630,14 +1630,14 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) } // Reihenfolge passend zum angezeigten Cursor: - // RangeFinder, AutoFill, PageBreak, Drawing + // RangeFinder, AutoFill, PageBreak, Drawing if ( HitRangeFinder( rMEvt.GetPosPixel(), bRFSize, &nRFIndex, &nRFAddX, &nRFAddY ) ) { - bRFMouse = TRUE; // die anderen Variablen sind oben initialisiert + bRFMouse = TRUE; // die anderen Variablen sind oben initialisiert if ( pViewData->GetActivePart() != eWhich ) - pViewData->GetView()->ActivatePart( eWhich ); //! schon oben immer ??? + pViewData->GetView()->ActivatePart( eWhich ); //! schon oben immer ??? // CaptureMouse(); StartTracking(); @@ -1650,7 +1650,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if ( bDouble ) pViewData->GetView()->FillCrossDblClick(); else - pScMod->InputEnterHandler(); // Autofill etc. + pScMod->InputEnterHandler(); // Autofill etc. } if ( !bCrossPointer ) @@ -1672,13 +1672,13 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if ( !bCrossPointer && DrawMouseButtonDown(rMEvt) ) { //if (DrawHasMarkedObj()) - // pViewData->GetViewShell()->SetDrawShellOrSub(); // Draw-Objekt selektiert + // pViewData->GetViewShell()->SetDrawShellOrSub(); // Draw-Objekt selektiert return; } - pViewData->GetViewShell()->SetDrawShell( FALSE ); // kein Draw-Objekt selektiert + pViewData->GetViewShell()->SetDrawShell( FALSE ); // kein Draw-Objekt selektiert - // TestMouse schon oben passiert + // TestMouse schon oben passiert } Point aPos = rMEvt.GetPosPixel(); @@ -1704,7 +1704,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) } if (pAttr->HasButton()) { - DoPushButton( nPosX, nPosY, rMEvt ); // setzt evtl. bPivotMouse / bDPMouse + DoPushButton( nPosX, nPosY, rMEvt ); // setzt evtl. bPivotMouse / bDPMouse return; } @@ -1736,7 +1736,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) } // - // Doppelklick angefangen ? + // Doppelklick angefangen ? // // StopMarking kann aus DrawMouseButtonDown gerufen werden @@ -1753,20 +1753,20 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) } // - // Links in Edit-Zellen + // Links in Edit-Zellen // BOOL bAlt = rMEvt.IsMod2(); if ( !bAlt && rMEvt.IsLeft() && - GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen + GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen { SetPointer( Pointer( POINTER_REFHAND ) ); - nMouseStatus = SC_GM_URLDOWN; // auch nur dann beim ButtonUp ausfuehren + nMouseStatus = SC_GM_URLDOWN; // auch nur dann beim ButtonUp ausfuehren return; } // - // Gridwin - SelectionEngine + // Gridwin - SelectionEngine // if ( rMEvt.IsLeft() ) @@ -1776,13 +1776,13 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) pSelEng->SetWhich(eWhich); pSelEng->SetVisibleArea( Rectangle(Point(), GetOutputSizePixel()) ); - // SelMouseButtonDown an der View setzt noch das bMoveIsShift Flag + // SelMouseButtonDown an der View setzt noch das bMoveIsShift Flag if ( pViewData->GetView()->SelMouseButtonDown( rMEvt ) ) { if (IsMouseCaptured()) { - // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann - //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! + // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann + //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! ReleaseMouse(); StartTracking(); } @@ -1805,7 +1805,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) nNestedButtonState = SC_NESTEDBUTTON_UP; if (nButtonDown != rMEvt.GetButtons()) - nMouseStatus = SC_GM_IGNORE; // reset und return + nMouseStatus = SC_GM_IGNORE; // reset und return nButtonDown = 0; @@ -1821,7 +1821,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pViewData->ResetFillMode(); } StopMarking(); - DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen + DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen ReleaseMouse(); return; } @@ -1844,7 +1844,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } nMouseStatus = SC_GM_NONE; ReleaseMouse(); - return; // da muss nix mehr passieren + return; // da muss nix mehr passieren } ScModule* pScMod = SC_MOD(); @@ -1854,20 +1854,20 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) SfxBindings& rBindings = pViewData->GetBindings(); if (bEEMouse && pViewData->HasEditView( eWhich )) { - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); pEditView->MouseButtonUp( rMEvt ); if ( rMEvt.IsMiddle() && GetSettings().GetMouseSettings().GetMiddleButtonAction() == MOUSE_MIDDLE_PASTESELECTION ) { - // EditView may have pasted from selection + // EditView may have pasted from selection pScMod->InputChanged( pEditView ); } else - pScMod->InputSelection( pEditView ); // parentheses etc. + pScMod->InputSelection( pEditView ); // parentheses etc. pViewData->GetView()->InvalidateAttribs(); rBindings.Invalidate( SID_HYPERLINK_GETLINK ); @@ -1877,13 +1877,13 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) if (bDPMouse) { - DPMouseButtonUp( rMEvt ); // resets bDPMouse + DPMouseButtonUp( rMEvt ); // resets bDPMouse return; } if (bRFMouse) { - RFMouseMove( rMEvt, TRUE ); // Range wieder richtigherum + RFMouseMove( rMEvt, TRUE ); // Range wieder richtigherum bRFMouse = FALSE; SetPointer( Pointer( POINTER_ARROW ) ); ReleaseMouse(); @@ -1899,7 +1899,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) return; } - if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus + if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus { SfxUndoManager* pMgr = pViewData->GetDocShell()->GetUndoManager(); if ( pMgr->GetUndoActionCount() && pMgr->GetUndoActionId() == STR_UNDO_APPLYCELLSTYLE ) @@ -1925,15 +1925,15 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) SCCOL nEndCol; SCROW nEndRow; pViewData->GetFillData( nStartCol, nStartRow, nEndCol, nEndRow ); -// DBG_ASSERT( nStartCol==pViewData->GetRefStartX() && nStartRow==pViewData->GetRefStartY(), -// "Block falsch fuer AutoFill" ); +// DBG_ASSERT( nStartCol==pViewData->GetRefStartX() && nStartRow==pViewData->GetRefStartY(), +// "Block falsch fuer AutoFill" ); ScRange aDelRange; BOOL bIsDel = pViewData->GetDelMark( aDelRange ); ScViewFunc* pView = pViewData->GetView(); pView->StopRefMode(); pViewData->ResetFillMode(); - pView->GetFunctionSet()->SetAnchorFlag( FALSE ); // #i5819# don't use AutoFill anchor flag for selection + pView->GetFunctionSet()->SetAnchorFlag( FALSE ); // #i5819# don't use AutoFill anchor flag for selection if ( bIsDel ) { @@ -1987,17 +1987,17 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pViewData->GetDocShell()->UpdateOle(pViewData); } - BOOL bRefMode = pViewData->IsRefMode(); + BOOL bRefMode = pViewData->IsRefMode(); if (bRefMode) pScMod->EndReference(); // - // Giesskannen-Modus (Gestalter) + // Giesskannen-Modus (Gestalter) // if (pScMod->GetIsWaterCan()) { - // Abfrage auf Undo schon oben + // Abfrage auf Undo schon oben ScStyleSheetPool* pStylePool = (ScStyleSheetPool*) (pViewData->GetDocument()-> @@ -2046,19 +2046,19 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } // - // double click (only left button) + // double click (only left button) // BOOL bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() ); if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() ) { - // data pilot table + // data pilot table Point aPos = rMEvt.GetPosPixel(); SCsCOL nPosX; SCsROW nPosY; SCTAB nTab = pViewData->GetTabNo(); pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); - ScDPObject* pDPObj = pDoc->GetDPAtCursor( nPosX, nPosY, nTab ); + ScDPObject* pDPObj = pDoc->GetDPAtCursor( nPosX, nPosY, nTab ); if ( pDPObj && pDPObj->GetSaveData()->GetDrillDown() ) { ScAddress aCellPos( nPosX, nPosY, pViewData->GetTabNo() ); @@ -2133,20 +2133,20 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } // - // Links in edit cells + // Links in edit cells // BOOL bAlt = rMEvt.IsMod2(); if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN ) { - // beim ButtonUp nur ausfuehren, wenn ButtonDown auch ueber einer URL war + // beim ButtonUp nur ausfuehren, wenn ButtonDown auch ueber einer URL war String aName, aUrl, aTarget; if ( GetEditUrl( rMEvt.GetPosPixel(), &aName, &aUrl, &aTarget ) ) { - nMouseStatus = SC_GM_NONE; // keinen Doppelklick anfangen + nMouseStatus = SC_GM_NONE; // keinen Doppelklick anfangen ScGlobal::OpenURL( aUrl, aTarget ); - + // fire worksheet_followhyperlink event uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents = pDoc->GetVbaEventProcessor(); if( xVbaEvents.is() ) try @@ -2175,48 +2175,48 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } // - // Gridwin - SelectionEngine + // Gridwin - SelectionEngine // - // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return - // TRUE for any call, so IsLeft must be checked here, too. + // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return + // TRUE for any call, so IsLeft must be checked here, too. if ( rMEvt.IsLeft() && pViewData->GetView()->GetSelEngine()->SelMouseButtonUp( rMEvt ) ) { -// rMark.MarkToSimple(); +// rMark.MarkToSimple(); pViewData->GetView()->SelectionChanged(); SfxDispatcher* pDisp = pViewData->GetViewShell()->GetDispatcher(); BOOL bFormulaMode = pScMod->IsFormulaMode(); DBG_ASSERT( pDisp || bFormulaMode, "Cursor auf nicht aktiver View bewegen ?" ); - // #i14927# execute SID_CURRENTCELL (for macro recording) only if there is no - // multiple selection, so the argument string completely describes the selection, - // and executing the slot won't change the existing selection (executing the slot - // here and from a recorded macro is treated equally) + // #i14927# execute SID_CURRENTCELL (for macro recording) only if there is no + // multiple selection, so the argument string completely describes the selection, + // and executing the slot won't change the existing selection (executing the slot + // here and from a recorded macro is treated equally) if ( pDisp && !bFormulaMode && !rMark.IsMultiMarked() ) { - String aAddr; // CurrentCell + String aAddr; // CurrentCell if( rMark.IsMarked() ) { -// BOOL bKeep = rMark.IsMultiMarked(); //! wohin damit ??? +// BOOL bKeep = rMark.IsMultiMarked(); //! wohin damit ??? ScRange aScRange; rMark.GetMarkArea( aScRange ); aScRange.Format( aAddr, SCR_ABS ); if ( aScRange.aStart == aScRange.aEnd ) { - // make sure there is a range selection string even for a single cell + // make sure there is a range selection string even for a single cell String aSingle = aAddr; aAddr.Append( (sal_Char) ':' ); aAddr.Append( aSingle ); } - //! SID_MARKAREA gibts nicht mehr ??? - //! was passiert beim Markieren mit dem Cursor ??? + //! SID_MARKAREA gibts nicht mehr ??? + //! was passiert beim Markieren mit dem Cursor ??? } - else // nur Cursor bewegen + else // nur Cursor bewegen { ScAddress aScAddress( pViewData->GetCurX(), pViewData->GetCurY(), 0 ); aScAddress.Format( aAddr, SCA_ABS ); @@ -2240,7 +2240,7 @@ void ScGridWindow::FakeButtonUp() { if ( nButtonDown ) { - MouseEvent aEvent( aCurMousePos ); // nButtons = 0 -> ignore + MouseEvent aEvent( aCurMousePos ); // nButtons = 0 -> ignore MouseButtonUp( aEvent ); } } @@ -2256,8 +2256,8 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) if (pScMod->IsModalMode(pViewData->GetSfxDocShell())) return; - // Ob aus dem Edit-Modus Drag&Drop gestartet wurde, bekommt man leider - // nicht anders mit: + // Ob aus dem Edit-Modus Drag&Drop gestartet wurde, bekommt man leider + // nicht anders mit: if (bEEMouse && nButtonDown && !rMEvt.GetButtons()) { @@ -2270,10 +2270,10 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) if (nMouseStatus == SC_GM_IGNORE) return; - if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus -> nur auf Up warten + if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus -> nur auf Up warten return; - if ( pViewData->GetViewShell()->IsAuditShell() ) // Detektiv-Fuell-Modus + if ( pViewData->GetViewShell()->IsAuditShell() ) // Detektiv-Fuell-Modus { SetPointer( Pointer( POINTER_FILL ) ); return; @@ -2303,13 +2303,13 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) } } - BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz + BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz if (bEEMouse && pViewData->HasEditView( eWhich )) { - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); pEditView->MouseMove( rMEvt ); return; @@ -2333,21 +2333,21 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) return; } - // anderen Mauszeiger anzeigen? + // anderen Mauszeiger anzeigen? BOOL bEditMode = pViewData->HasEditView(eWhich); //! Testen ob RefMode-Dragging !!! if ( bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo()) ) { - Point aPos = rMEvt.GetPosPixel(); - SCsCOL nPosX; - SCsROW nPosY; + Point aPos = rMEvt.GetPosPixel(); + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); SCCOL nEndCol = pViewData->GetEditEndCol(); SCROW nEndRow = pViewData->GetEditEndRow(); @@ -2355,7 +2355,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) if ( nPosX >= (SCsCOL) nEditCol && nPosX <= (SCsCOL) nEndCol && nPosY >= (SCsROW) nEditRow && nPosY <= (SCsROW) nEndRow ) { - // Field can only be URL field + // Field can only be URL field BOOL bAlt = rMEvt.IsMod2(); if ( !bAlt && !nButtonDown && pEditView && pEditView->GetFieldUnderMousePointer() ) SetPointer( Pointer( POINTER_REFHAND ) ); @@ -2375,7 +2375,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) { BOOL bCross = FALSE; - // Range-Finder + // Range-Finder BOOL bCorner; if ( HitRangeFinder( rMEvt.GetPosPixel(), bCorner ) ) @@ -2387,7 +2387,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) bCross = TRUE; } - // Page-Break-Modus + // Page-Break-Modus USHORT nBreakType; if ( !nButtonDown && pViewData->IsPagebreakMode() && @@ -2419,7 +2419,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) bCross = TRUE; } - // Fill-Cursor anzeigen ? + // Fill-Cursor anzeigen ? if ( !bFormulaMode && !nButtonDown ) if (TestMouse( rMEvt, FALSE )) @@ -2429,19 +2429,19 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) { SetPointer( Pointer( POINTER_CROSS ) ); bCross = TRUE; - nScFillModeMouseModifier = rMEvt.GetModifier(); // ausgewertet bei AutoFill und Matrix + nScFillModeMouseModifier = rMEvt.GetModifier(); // ausgewertet bei AutoFill und Matrix } if (!bCross) { BOOL bAlt = rMEvt.IsMod2(); - if (bEditMode) // Edit-Mode muss zuerst kommen! + if (bEditMode) // Edit-Mode muss zuerst kommen! SetPointer( Pointer( POINTER_ARROW ) ); else if ( !bAlt && !nButtonDown && GetEditUrl(rMEvt.GetPosPixel()) ) SetPointer( Pointer( POINTER_REFHAND ) ); - else if ( DrawMouseMove(rMEvt) ) // setzt Pointer um + else if ( DrawMouseMove(rMEvt) ) // setzt Pointer um return; } } @@ -2528,17 +2528,17 @@ long ScGridWindow::PreNotify( NotifyEvent& rNEvt ) void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) { - // Weil die SelectionEngine kein Tracking kennt, die Events nur auf - // die verschiedenen MouseHandler verteilen... + // Weil die SelectionEngine kein Tracking kennt, die Events nur auf + // die verschiedenen MouseHandler verteilen... const MouseEvent& rMEvt = rTEvt.GetMouseEvent(); - if ( rTEvt.IsTrackingCanceled() ) // alles abbrechen... + if ( rTEvt.IsTrackingCanceled() ) // alles abbrechen... { if (!pViewData->GetView()->IsInActivatePart()) { if (bDPMouse) - bDPMouse = FALSE; // gezeichnet wird per bDragRect + bDPMouse = FALSE; // gezeichnet wird per bDragRect if (bDragRect) { // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); @@ -2547,14 +2547,14 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) } if (bRFMouse) { - RFMouseMove( rMEvt, TRUE ); // richtig abbrechen geht dabei nicht... + RFMouseMove( rMEvt, TRUE ); // richtig abbrechen geht dabei nicht... bRFMouse = FALSE; } if (nPagebreakMouse) { // if (bPagebreakDrawn) - // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), - // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); + // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), + // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); bPagebreakDrawn = FALSE; UpdateDragRectOverlay(); nPagebreakMouse = SC_PD_NONE; @@ -2562,18 +2562,18 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) SetPointer( Pointer( POINTER_ARROW ) ); StopMarking(); - MouseButtonUp( rMEvt ); // mit Status SC_GM_IGNORE aus StopMarking + MouseButtonUp( rMEvt ); // mit Status SC_GM_IGNORE aus StopMarking - BOOL bRefMode = pViewData->IsRefMode(); + BOOL bRefMode = pViewData->IsRefMode(); if (bRefMode) - SC_MOD()->EndReference(); // #63148# Dialog nicht verkleinert lassen + SC_MOD()->EndReference(); // #63148# Dialog nicht verkleinert lassen } } else if ( rTEvt.IsTrackingEnded() ) { - // MouseButtonUp immer mit passenden Buttons (z.B. wegen Testtool, #63148#) - // Schliesslich behauptet der Tracking-Event ja, dass normal beendet und nicht - // abgebrochen wurde. + // MouseButtonUp immer mit passenden Buttons (z.B. wegen Testtool, #63148#) + // Schliesslich behauptet der Tracking-Event ja, dass normal beendet und nicht + // abgebrochen wurde. MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(), rMEvt.GetMode(), nButtonDown, rMEvt.GetModifier() ); @@ -2594,9 +2594,9 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) if (bEEMouse && pViewData->HasEditView( eWhich )) { - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); // #63263# don't remove the edit view while switching views @@ -2610,13 +2610,13 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) pHdl->DataChanged(); pScMod->SetInEditCommand( FALSE ); - if (!pViewData->IsActive()) // dropped to different view? + if (!pViewData->IsActive()) // dropped to different view? { ScInputHandler* pViewHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); if ( pViewHdl && pViewData->HasEditView( eWhich ) ) { pViewHdl->CancelHandler(); - ShowCursor(); // missing from KillEditView + ShowCursor(); // missing from KillEditView } } } @@ -2664,7 +2664,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) BOOL bEditView = pViewData->HasEditView( eWhich ); if (!bEditView) { - // only if no cell editview is active, look at drawview + // only if no cell editview is active, look at drawview SdrView* pSdrView = pViewData->GetView()->GetSdrView(); if ( pSdrView ) { @@ -2672,17 +2672,17 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( pOlView && pOlView->GetWindow() == this ) { pOlView->Command( rCEvt ); - return; // done + return; // done } } } if ( nCmd == COMMAND_CURSORPOS && !bEditView ) { - // #88458# CURSORPOS may be called without following text input, - // to set the input method window position - // -> input mode must not be started, - // manually calculate text insert position if not in input mode + // #88458# CURSORPOS may be called without following text input, + // to set the input method window position + // -> input mode must not be started, + // manually calculate text insert position if not in input mode lcl_SetTextCursorPos( pViewData, eWhich, this ); return; @@ -2692,7 +2692,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( pHdl ) { pHdl->InputCommand( rCEvt, TRUE ); - return; // done + return; // done } Window::Command( rCEvt ); @@ -2701,17 +2701,17 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( nCmd == COMMAND_VOICE ) { - // Der Handler wird nur gerufen, wenn ein Text-Cursor aktiv ist, - // also muss es eine EditView oder ein editiertes Zeichenobjekt geben + // Der Handler wird nur gerufen, wenn ein Text-Cursor aktiv ist, + // also muss es eine EditView oder ein editiertes Zeichenobjekt geben ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); if ( pHdl && pViewData->HasEditView( eWhich ) ) { - EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0 + EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0 pHdl->DataChanging(); pEditView->Command( rCEvt ); pHdl->DataChanged(); - return; // erledigt + return; // erledigt } SdrView* pSdrView = pViewData->GetView()->GetSdrView(); if ( pSdrView ) @@ -2720,10 +2720,10 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( pOlView && pOlView->GetWindow() == this ) { pOlView->Command( rCEvt ); - return; // erledigt + return; // erledigt } } - Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern... + Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern... return; } @@ -2731,8 +2731,8 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) { if ( bEEMouse ) { - // EditEngine handles selection in MouseButtonUp - no action - // needed in command handler + // EditEngine handles selection in MouseButtonUp - no action + // needed in command handler } else { @@ -2807,8 +2807,8 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) // Selecting this cell is not allowed, neither is context menu. return; - // #i18735# First select the item under the mouse pointer. - // This can change the selection, and the view state (edit mode, etc). + // #i18735# First select the item under the mouse pointer. + // This can change the selection, and the view state (edit mode, etc). SelectForContextMenu( aPosPixel, nCellX, nCellY ); } @@ -2819,17 +2819,17 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) // Edit-Zelle mit Spelling-Errors ? if ( bMouse && GetEditUrlOrError( TRUE, aPosPixel ) ) { - // GetEditUrlOrError hat den Cursor schon bewegt + // GetEditUrlOrError hat den Cursor schon bewegt pScMod->SetInputMode( SC_INPUT_TABLE ); - bEdit = pViewData->HasEditView(eWhich); // hat's geklappt ? + bEdit = pViewData->HasEditView(eWhich); // hat's geklappt ? DBG_ASSERT( bEdit, "kann nicht in Edit-Modus schalten" ); } } if ( bEdit ) { - EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0 + EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0 if ( !bMouse ) { @@ -2837,25 +2837,25 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( pCur ) { Point aLogicPos = pCur->GetPos(); - // use the position right of the cursor (spell popup is opened if - // the cursor is before the word, but not if behind it) + // use the position right of the cursor (spell popup is opened if + // the cursor is before the word, but not if behind it) aLogicPos.X() += pCur->GetWidth(); - aLogicPos.Y() += pCur->GetHeight() / 2; // center vertically + aLogicPos.Y() += pCur->GetHeight() / 2; // center vertically aMenuPos = LogicToPixel( aLogicPos ); } } - // if edit mode was just started above, online spelling may be incomplete + // if edit mode was just started above, online spelling may be incomplete pEditView->GetEditEngine()->CompleteOnlineSpelling(); - // IsCursorAtWrongSpelledWord could be used for !bMouse - // if there was a corresponding ExecuteSpellPopup call + // IsCursorAtWrongSpelledWord could be used for !bMouse + // if there was a corresponding ExecuteSpellPopup call if( pEditView->IsWrongSpelledWordAtPos( aMenuPos ) ) { - // Wenn man unter OS/2 neben das Popupmenue klickt, kommt MouseButtonDown - // vor dem Ende des Menue-Execute, darum muss SetModified vorher kommen - // (Bug #40968#) + // Wenn man unter OS/2 neben das Popupmenue klickt, kommt MouseButtonDown + // vor dem Ende des Menue-Execute, darum muss SetModified vorher kommen + // (Bug #40968#) ScInputHandler* pHdl = pScMod->GetInputHdl(); if (pHdl) pHdl->SetModified(); @@ -2868,7 +2868,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) } else if ( !bMouse ) { - // non-edit menu by keyboard -> use lower right of cell cursor position + // non-edit menu by keyboard -> use lower right of cell cursor position SCCOL nCurX = pViewData->GetCurX(); SCROW nCurY = pViewData->GetCurY(); @@ -2884,7 +2884,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) ScTabViewShell* pViewSh = pViewData->GetViewShell(); if (pViewSh) { - // Is a draw object selected? + // Is a draw object selected? SdrView* pDrawView = pViewSh->GetSdrView(); if (pDrawView && pDrawView->AreObjectsMarked()) @@ -3124,8 +3124,8 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) pViewData->SetPasteMode( SC_PASTE_NONE ); UpdateCopySourceOverlay(); } - // query for existing note marker before calling ViewShell's keyboard handling - // which may remove the marker + // query for existing note marker before calling ViewShell's keyboard handling + // which may remove the marker BOOL bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() ); ScTabViewShell* pViewSh = pViewData->GetViewShell(); @@ -3135,13 +3135,13 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) if (DrawKeyInput(rKEvt)) return; - if (!pViewData->GetView()->IsDrawSelMode() && !DrawHasMarkedObj()) // keine Eingaben im Zeichenmodus - { //! DrawShell abfragen !!! + if (!pViewData->GetView()->IsDrawSelMode() && !DrawHasMarkedObj()) // keine Eingaben im Zeichenmodus + { //! DrawShell abfragen !!! if (pViewSh->TabKeyInput(rKEvt)) return; } else - if (pViewSh->SfxViewShell::KeyInput(rKEvt)) // von SfxViewShell + if (pViewSh->SfxViewShell::KeyInput(rKEvt)) // von SfxViewShell return; KeyCode aCode = rKEvt.GetKeyCode(); @@ -3155,11 +3155,11 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) } if ( aCode.GetCode() == KEY_F1 && aCode.GetModifier() == KEY_MOD1 ) { - // ctrl-F1 shows or hides the note or redlining info for the cursor position - // (hard-coded because F1 can't be configured) + // ctrl-F1 shows or hides the note or redlining info for the cursor position + // (hard-coded because F1 can't be configured) if ( bHadKeyMarker ) - HideNoteMarker(); // hide when previously visible + HideNoteMarker(); // hide when previously visible else ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), TRUE ); return; @@ -3182,7 +3182,7 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) void ScGridWindow::StopMarking() { - DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen + DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen if (nButtonDown) { @@ -3196,8 +3196,8 @@ void ScGridWindow::UpdateInputContext() BOOL bReadOnly = pViewData->GetDocShell()->IsReadOnly(); ULONG nOptions = bReadOnly ? 0 : ( INPUTCONTEXT_TEXT | INPUTCONTEXT_EXTTEXTINPUT ); - // when font from InputContext is used, - // it must be taken from the cursor position's cell attributes + // when font from InputContext is used, + // it must be taken from the cursor position's cell attributes InputContext aContext; aContext.SetOptions( nOptions ); @@ -3211,7 +3211,7 @@ void ScGridWindow::UpdateInputContext() BOOL ScGridWindow::DropScroll( const Point& rMousePos ) { -/* doch auch auf nicht aktiven Views... +/* doch auch auf nicht aktiven Views... if ( !pViewData->IsActive() ) return FALSE; */ @@ -3238,16 +3238,16 @@ BOOL ScGridWindow::DropScroll( const Point& rMousePos ) if ( nDx != 0 || nDy != 0 ) { -// if (bDragRect) -// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); +// if (bDragRect) +// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); if ( nDx != 0 ) pViewData->GetView()->ScrollX( nDx, WhichH(eWhich) ); if ( nDy != 0 ) pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) ); -// if (bDragRect) -// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); +// if (bDragRect) +// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); } return FALSE; @@ -3255,7 +3255,7 @@ BOOL ScGridWindow::DropScroll( const Point& rMousePos ) BOOL lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange) { - // Testet, ob bei eingeschalteten RedLining, + // Testet, ob bei eingeschalteten RedLining, // bei einem Drop ein Scenario betroffen ist. BOOL bReturn = FALSE; @@ -3305,8 +3305,8 @@ ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const ScRange& //-------------------------------------------------------- -extern BOOL bPasteIsDrop; // viewfun4 -> move to header -extern BOOL bPasteIsMove; // viewfun7 -> move to header +extern BOOL bPasteIsDrop; // viewfun4 -> move to header +extern BOOL bPasteIsMove; // viewfun7 -> move to header //-------------------------------------------------------- @@ -3315,7 +3315,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) if ( rEvt.mbLeaving ) { // if (bDragRect) - // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); + // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); bDragRect = FALSE; UpdateDragRectOverlay(); return rEvt.mnAction; @@ -3343,34 +3343,34 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) { if ( pThisDoc->HasChartAtPoint(pViewData->GetTabNo(), PixelToLogic(aPos)) ) { - if (bDragRect) // Rechteck loeschen + if (bDragRect) // Rechteck loeschen { // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); bDragRect = FALSE; UpdateDragRectOverlay(); } - //! highlight chart? (selection border?) + //! highlight chart? (selection border?) sal_Int8 nRet = rEvt.mnAction; -//! if ( rEvt.GetAction() == DROP_LINK ) -//! bOk = rEvt.SetAction( DROP_COPY ); // can't link onto chart +//! if ( rEvt.GetAction() == DROP_LINK ) +//! bOk = rEvt.SetAction( DROP_COPY ); // can't link onto chart return nRet; } } -//! else -//! if ( rEvt.GetAction() == DROP_MOVE ) -//! rEvt.SetAction( DROP_COPY ); // different doc: default=COPY +//! else +//! if ( rEvt.GetAction() == DROP_MOVE ) +//! rEvt.SetAction( DROP_COPY ); // different doc: default=COPY - if ( rData.pCellTransfer->GetDragSourceFlags() & SC_DROP_TABLE ) // whole sheet? + if ( rData.pCellTransfer->GetDragSourceFlags() & SC_DROP_TABLE ) // whole sheet? { BOOL bOk = pThisDoc->IsDocEditable(); - return bOk ? rEvt.mnAction : 0; // don't draw selection frame + return bOk ? rEvt.mnAction : 0; // don't draw selection frame } - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); ScRange aSourceRange = rData.pCellTransfer->GetRange(); @@ -3382,7 +3382,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) SCROW nSizeY = nSourceEndY - nSourceStartY + 1; if ( rEvt.mnAction != DND_ACTION_MOVE ) - nSizeY = rData.pCellTransfer->GetNonFilteredRows(); // copy/link: no filtered rows + nSizeY = rData.pCellTransfer->GetNonFilteredRows(); // copy/link: no filtered rows SCsCOL nNewDragX = nPosX - rData.pCellTransfer->GetDragHandleX(); if (nNewDragX<0) nNewDragX=0; @@ -3393,7 +3393,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) if (nNewDragY+(nSizeY-1) > MAXROW) nNewDragY = MAXROW-(nSizeY-1); - // don't break scenario ranges, don't drop on filtered + // don't break scenario ranges, don't drop on filtered SCTAB nTab = pViewData->GetTabNo(); ScRange aDropRange = lcl_MakeDropRange( nNewDragX, nNewDragY, nTab, aSourceRange ); if ( lcl_TestScenarioRedliningDrop( pThisDoc, aDropRange ) || @@ -3521,7 +3521,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) !bDragRect || eDragInsertMode != meDragInsertMode ) { // if (bDragRect) - // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); + // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); nDragStartX = nNewDragX; nDragStartY = nNewDragY; @@ -3546,7 +3546,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { DrawMarkDropObj( NULL ); if ( rData.pCellTransfer ) - return AcceptPrivateDrop( rEvt ); // hide drop marker for internal D&D + return AcceptPrivateDrop( rEvt ); // hide drop marker for internal D&D else return rEvt.mnAction; } @@ -3580,8 +3580,8 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) } else if (rData.aJumpTarget.Len()) { - // internal bookmarks (from Navigator) - // local jumps from an unnamed document are possible only within a document + // internal bookmarks (from Navigator) + // local jumps from an unnamed document are possible only within a document if ( !rData.pJumpLocalDoc || rData.pJumpLocalDoc == pViewData->GetDocument() ) nRet = rEvt.mnAction; @@ -3591,7 +3591,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 nMyAction = rEvt.mnAction; if ( !rData.pDrawTransfer || - !IsMyModel(rData.pDrawTransfer->GetDragSourceView()) ) // drawing within the document + !IsMyModel(rData.pDrawTransfer->GetDragSourceView()) ) // drawing within the document if ( rEvt.mbDefault && nMyAction == DND_ACTION_MOVE ) nMyAction = DND_ACTION_COPY; @@ -3604,7 +3604,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) || IsDropFormatSupported(SOT_FORMAT_GDIMETAFILE) || IsDropFormatSupported(SOT_FORMAT_BITMAP) ) { - // graphic dragged onto drawing object + // graphic dragged onto drawing object DrawMarkDropObj( pHitObj ); nRet = nMyAction; } @@ -3689,7 +3689,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) } } - // scroll only for accepted formats + // scroll only for accepted formats if (nRet) DropScroll( rEvt.maPosPixel ); } @@ -3703,7 +3703,7 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT if ( !aDataHelper.HasFormat( SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) ) { - // use bookmark formats if no sba is present + // use bookmark formats if no sba is present if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SOLK ) ) return SOT_FORMATSTR_ID_SOLK; @@ -3722,7 +3722,7 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT nFormatId = SOT_FORMATSTR_ID_SVXB; else if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ) ) { - // If it's a Writer object, insert RTF instead of OLE + // If it's a Writer object, insert RTF instead of OLE BOOL bDoRtf = FALSE; SotStorageStreamRef xStm; @@ -3814,7 +3814,7 @@ sal_Int8 ScGridWindow::ExecutePrivateDrop( const ExecuteDropEvent& rEvt ) { // hide drop marker // if (bDragRect) - // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); + // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); bDragRect = FALSE; UpdateDragRectOverlay(); @@ -3834,7 +3834,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos ScDocument* pSourceDoc = pTransObj->GetSourceDocument(); ScDocShell* pDocSh = pViewData->GetDocShell(); ScDocument* pThisDoc = pViewData->GetDocument(); - ScViewFunc* pView = pViewData->GetView(); + ScViewFunc* pView = pViewData->GetView(); SCTAB nThisTab = pViewData->GetTabNo(); USHORT nFlags = pTransObj->GetDragSourceFlags(); @@ -3853,8 +3853,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos ScRange aSource = pTransObj->GetRange(); - // only use visible tab from source range - when dragging within one table, - // all selected tables at the time of dropping are used (handled in MoveBlockTo) + // only use visible tab from source range - when dragging within one table, + // all selected tables at the time of dropping are used (handled in MoveBlockTo) SCTAB nSourceTab = pTransObj->GetVisibleTab(); aSource.aStart.SetTab( nSourceTab ); aSource.aEnd.SetTab( nSourceTab ); @@ -3894,17 +3894,17 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos if (!bFiltered && pSourceDoc == pThisDoc) { - if ( nFlags & SC_DROP_TABLE ) // whole sheet? + if ( nFlags & SC_DROP_TABLE ) // whole sheet? { if ( pThisDoc->IsDocEditable() ) { SCTAB nSrcTab = aSource.aStart.Tab(); - pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, TRUE ); // with Undo + pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, TRUE ); // with Undo pView->SetTabNo( nThisTab, TRUE ); bDone = TRUE; } } - else // move/copy block + else // move/copy block { String aChartName; if (pThisDoc->HasChartAtPoint( nThisTab, rLogicPos, &aChartName )) @@ -4018,18 +4018,18 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos pDocSh->GetUndoManager()->LeaveListAction(); if (!bDone) - Sound::Beep(); // instead of error message in drop handler + Sound::Beep(); // instead of error message in drop handler } else - bDone = TRUE; // nothing to do + bDone = TRUE; // nothing to do } if (bDone) - pTransObj->SetDragWasInternal(); // don't delete source in DragFinished + pTransObj->SetDragWasInternal(); // don't delete source in DragFinished } - else if ( !bFiltered && pSourceDoc ) // between documents + else if ( !bFiltered && pSourceDoc ) // between documents { - if ( nFlags & SC_DROP_TABLE ) // copy/link sheets between documents + if ( nFlags & SC_DROP_TABLE ) // copy/link sheets between documents { if ( pThisDoc->IsDocEditable() ) { @@ -4037,9 +4037,9 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos SCTAB nTabs[MAXTABCOUNT]; - ScMarkData aMark = pTransObj->GetSourceMarkData(); - SCTAB nTabCount = pSourceDoc->GetTableCount(); - SCTAB nTabSelCount = 0; + ScMarkData aMark = pTransObj->GetSourceMarkData(); + SCTAB nTabCount = pSourceDoc->GetTableCount(); + SCTAB nTabSelCount = 0; for(SCTAB i=0; i<nTabCount; i++) { @@ -4064,8 +4064,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos } else if ( bIsLink ) { - // as in PasteDDE - // (external references might be used instead?) + // as in PasteDDE + // (external references might be used instead?) SfxObjectShell* pSourceSh = pSourceDoc->GetDocumentShell(); DBG_ASSERT(pSourceSh, "drag document has no shell"); @@ -4128,8 +4128,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos } else { - //! HasSelectedBlockMatrixFragment without selected sheet? - //! or don't start dragging on a part of a matrix + //! HasSelectedBlockMatrixFragment without selected sheet? + //! or don't start dragging on a part of a matrix String aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE : STR_UNDO_COPY ); pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo ); @@ -4160,8 +4160,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos pDocSh->GetUndoManager()->LeaveListAction(); - // no longer call ResetMark here - the inserted block has been selected - // and may have been copied to primary selection + // no longer call ResetMark here - the inserted block has been selected + // and may have been copied to primary selection } } @@ -4171,7 +4171,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - DrawMarkDropObj( NULL ); // drawing layer + DrawMarkDropObj( NULL ); // drawing layer ScModule* pScMod = SC_MOD(); const ScDragData& rData = pScMod->GetDragData(); @@ -4182,7 +4182,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) if ( rData.aLinkDoc.Len() ) { - // try to insert a link + // try to insert a link BOOL bOk = TRUE; String aThisName; @@ -4190,7 +4190,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) if (pDocSh && pDocSh->HasName()) aThisName = pDocSh->GetMedium()->GetName(); - if ( rData.aLinkDoc == aThisName ) // error - no link within a document + if ( rData.aLinkDoc == aThisName ) // error - no link within a document bOk = FALSE; else { @@ -4200,8 +4200,8 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) rData.aLinkTable ); else if ( rData.aLinkArea.Len() ) { - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); pView->MoveCursorAbs( nPosX, nPosY, SC_FOLLOW_NONE, FALSE, FALSE ); @@ -4215,7 +4215,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) } } - return bOk ? rEvt.mnAction : DND_ACTION_NONE; // don't try anything else + return bOk ? rEvt.mnAction : DND_ACTION_NONE; // don't try anything else } Point aLogicPos = PixelToLogic(aPos); @@ -4239,14 +4239,14 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) } - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); if (rData.aJumpTarget.Len()) { - // internal bookmark (from Navigator) - // bookmark clipboard formats are in PasteScDataObject + // internal bookmark (from Navigator) + // bookmark clipboard formats are in PasteScDataObject if ( !rData.pJumpLocalDoc || rData.pJumpLocalDoc == pViewData->GetDocument() ) { @@ -4262,8 +4262,8 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) SdrObject* pHitObj = pThisDoc->GetObjectAtPoint( pViewData->GetTabNo(), PixelToLogic(aPos) ); if ( pHitObj && bIsLink ) { - // dropped on drawing object - // PasteOnDrawObject checks for valid formats + // dropped on drawing object + // PasteOnDrawObject checks for valid formats if ( pViewData->GetView()->PasteOnDrawObject( rEvt.maDropEvent.Transferable, pHitObj, TRUE ) ) return rEvt.mnAction; } @@ -4293,8 +4293,8 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) { Point aLogicPos = PixelToLogic( rPosPixel ); - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( rPosPixel.X(), rPosPixel.Y(), eWhich, nPosX, nPosY ); // If the mouse down was inside a visible note window, ignore it and @@ -4317,7 +4317,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) ScSelectionTransferObj* pOwnSelection = SC_MOD()->GetSelectionTransfer(); if ( pOwnSelection ) { - // within Calc + // within Calc ScTransferObj* pCellTransfer = pOwnSelection->GetCellData(); if ( pCellTransfer ) @@ -4334,8 +4334,8 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) // keep a reference to the data in case the selection is changed during paste uno::Reference<datatransfer::XTransferable> xRef( pDrawTransfer ); - // #96821# bSameDocClipboard argument for PasteDraw is needed - // because only DragData is checked directly inside PasteDraw + // #96821# bSameDocClipboard argument for PasteDraw is needed + // because only DragData is checked directly inside PasteDraw pViewData->GetView()->PasteDraw( aLogicPos, pDrawTransfer->GetModel(), FALSE, pDrawTransfer->GetSourceDocID() == pViewData->GetDocument()->GetDocumentID() ); } @@ -4343,7 +4343,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) } else { - // get selection from system + // get selection from system TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSelection( this ) ); uno::Reference<datatransfer::XTransferable> xTransferable = aDataHelper.GetTransferable(); @@ -4373,7 +4373,7 @@ void ScGridWindow::UpdateEditViewPos() SCCOL nEndCol = pViewData->GetEditEndCol(); SCROW nEndRow = pViewData->GetEditEndRow(); - // hide EditView? + // hide EditView? BOOL bHide = ( nEndCol<pViewData->GetPosX(eHWhich) || nEndRow<pViewData->GetPosY(eVWhich) ); if ( SC_MOD()->IsFormulaMode() ) @@ -4414,7 +4414,7 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY ) SetMapMode(MAP_PIXEL); Scroll( nDifX, nDifY, SCROLL_CHILDREN ); - SetMapMode( GetDrawMapMode() ); // verschobenen MapMode erzeugen + SetMapMode( GetDrawMapMode() ); // verschobenen MapMode erzeugen UpdateEditViewPos(); @@ -4422,7 +4422,7 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY ) bIsInScroll = FALSE; } -// Formeln neu zeichnen ------------------------------------------------- +// Formeln neu zeichnen ------------------------------------------------- void ScGridWindow::UpdateFormulas() { @@ -4431,18 +4431,18 @@ void ScGridWindow::UpdateFormulas() if ( nPaintCount ) { - // nicht anfangen, verschachtelt zu painten - // (dann wuerde zumindest der MapMode nicht mehr stimmen) + // nicht anfangen, verschachtelt zu painten + // (dann wuerde zumindest der MapMode nicht mehr stimmen) - bNeedsRepaint = TRUE; // -> am Ende vom Paint nochmal Invalidate auf alles - aRepaintPixel = Rectangle(); // alles + bNeedsRepaint = TRUE; // -> am Ende vom Paint nochmal Invalidate auf alles + aRepaintPixel = Rectangle(); // alles return; } - SCCOL nX1 = pViewData->GetPosX( eHWhich ); - SCROW nY1 = pViewData->GetPosY( eVWhich ); - SCCOL nX2 = nX1 + pViewData->VisibleCellsX( eHWhich ); - SCROW nY2 = nY1 + pViewData->VisibleCellsY( eVWhich ); + SCCOL nX1 = pViewData->GetPosX( eHWhich ); + SCROW nY1 = pViewData->GetPosY( eVWhich ); + SCCOL nX2 = nX1 + pViewData->VisibleCellsX( eHWhich ); + SCROW nY2 = nY1 + pViewData->VisibleCellsY( eVWhich ); if (nX2 > MAXCOL) nX2 = MAXCOL; if (nY2 > MAXROW) nY2 = MAXROW; @@ -4579,10 +4579,10 @@ void __EXPORT ScGridWindow::GetFocus() if ( !SC_MOD()->IsFormulaMode() ) { pViewShell->UpdateInputHandler(); -// StopMarking(); // falls Dialog (Fehler), weil dann kein ButtonUp +// StopMarking(); // falls Dialog (Fehler), weil dann kein ButtonUp // MO: nur wenn nicht im RefInput-Modus // -> GetFocus/MouseButtonDown-Reihenfolge - // auf dem Mac + // auf dem Mac } pViewData->GetDocShell()->CheckConfigOptions(); @@ -4623,10 +4623,10 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner, SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( rMouse.X(), rMouse.Y(), eWhich, nPosX, nPosY ); - // zusammengefasste (einzeln/Bereich) ??? + // zusammengefasste (einzeln/Bereich) ??? ScAddress aAddr( nPosX, nPosY, nTab ); -// Point aNext = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich ); +// Point aNext = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich ); Point aNext = pViewData->GetScrPos( nPosX, nPosY, eWhich, TRUE ); long nSizeXPix; @@ -4643,19 +4643,19 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner, BOOL bCellCorner = ( bCornerHor && rMouse.Y() >= aNext.Y() - 8 && rMouse.Y() <= aNext.Y() ); - // corner is hit only if the mouse is within the cell + // corner is hit only if the mouse is within the cell USHORT nCount = (USHORT)pRangeFinder->Count(); for (USHORT i=nCount; i;) { - // rueckwaerts suchen, damit der zuletzt gepaintete Rahmen gefunden wird + // rueckwaerts suchen, damit der zuletzt gepaintete Rahmen gefunden wird --i; ScRangeFindData* pData = pRangeFinder->GetObject(i); if ( pData && pData->aRef.In(aAddr) ) { - if (pIndex) *pIndex = i; - if (pAddX) *pAddX = nPosX - pData->aRef.aStart.Col(); - if (pAddY) *pAddY = nPosY - pData->aRef.aStart.Row(); + if (pIndex) *pIndex = i; + if (pAddX) *pAddX = nPosX - pData->aRef.aStart.Col(); + if (pAddY) *pAddY = nPosY - pData->aRef.aStart.Row(); bFound = TRUE; rCorner = ( bCellCorner && aAddr == pData->aRef.aEnd ); break; @@ -4666,15 +4666,15 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner, return bFound; } -#define SCE_TOP 1 -#define SCE_BOTTOM 2 -#define SCE_LEFT 4 -#define SCE_RIGHT 8 -#define SCE_ALL 15 +#define SCE_TOP 1 +#define SCE_BOTTOM 2 +#define SCE_LEFT 4 +#define SCE_RIGHT 8 +#define SCE_ALL 15 void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges ) { - // der Range ist immer richtigherum + // der Range ist immer richtigherum SCCOL nCol1 = rRange.aStart.Col(); SCROW nRow1 = rRange.aStart.Row(); @@ -4715,8 +4715,8 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges if ( nCol2 > nCol1 + 1 && nRow2 > nRow1 + 1 && !bHiddenEdge ) { - // nur an den Raendern entlang - // (die Ecken werden evtl. zweimal getroffen) + // nur an den Raendern entlang + // (die Ecken werden evtl. zweimal getroffen) if ( nEdges & SCE_TOP ) pDocSh->PostPaint( nCol1, nRow1, nTab1, nCol2, nRow1, nTab2, PAINT_MARKS ); @@ -4727,22 +4727,22 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges if ( nEdges & SCE_BOTTOM ) pDocSh->PostPaint( nCol1, nRow2, nTab1, nCol2, nRow2, nTab2, PAINT_MARKS ); } - else // everything in one call + else // everything in one call pDocSh->PostPaint( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, PAINT_MARKS ); } void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRange& rNewUn ) { - // Repaint fuer die Teile des Rahmens in Old, die bei New nicht mehr da sind + // Repaint fuer die Teile des Rahmens in Old, die bei New nicht mehr da sind ScRange aOld = rOldUn; ScRange aNew = rNewUn; aOld.Justify(); aNew.Justify(); - if ( aOld.aStart == aOld.aEnd ) //! Tab ignorieren? + if ( aOld.aStart == aOld.aEnd ) //! Tab ignorieren? pDocSh->GetDocument()->ExtendMerge(aOld); - if ( aNew.aStart == aNew.aEnd ) //! Tab ignorieren? + if ( aNew.aStart == aNew.aEnd ) //! Tab ignorieren? pDocSh->GetDocument()->ExtendMerge(aNew); SCCOL nOldCol1 = aOld.aStart.Col(); @@ -4753,7 +4753,7 @@ void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRan SCROW nNewRow1 = aNew.aStart.Row(); SCCOL nNewCol2 = aNew.aEnd.Col(); SCROW nNewRow2 = aNew.aEnd.Row(); - SCTAB nTab1 = aOld.aStart.Tab(); // Tab aendert sich nicht + SCTAB nTab1 = aOld.aStart.Tab(); // Tab aendert sich nicht SCTAB nTab2 = aOld.aEnd.Tab(); if ( nNewRow2 < nOldRow1 || nNewRow1 > nOldRow2 || @@ -4761,45 +4761,45 @@ void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRan ( nNewCol1 != nOldCol1 && nNewRow1 != nOldRow1 && nNewCol2 != nOldCol2 && nNewRow2 != nOldRow2 ) ) { - // komplett weggeschoben oder alle Seiten veraendert - // (Abfrage <= statt < geht schief bei einzelnen Zeilen/Spalten) + // komplett weggeschoben oder alle Seiten veraendert + // (Abfrage <= statt < geht schief bei einzelnen Zeilen/Spalten) lcl_PaintOneRange( pDocSh, aOld, SCE_ALL ); } - else // alle vier Kanten einzeln testen + else // alle vier Kanten einzeln testen { - // oberer Teil - if ( nNewRow1 < nOldRow1 ) // nur obere Linie loeschen + // oberer Teil + if ( nNewRow1 < nOldRow1 ) // nur obere Linie loeschen lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow1, nTab1, nOldCol2, nOldRow1, nTab2 ), SCE_ALL ); - else if ( nNewRow1 > nOldRow1 ) // den Teil, der oben wegkommt + else if ( nNewRow1 > nOldRow1 ) // den Teil, der oben wegkommt lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow1, nTab1, nOldCol2, nNewRow1-1, nTab2 ), SCE_ALL &~ SCE_BOTTOM ); - // unterer Teil - if ( nNewRow2 > nOldRow2 ) // nur untere Linie loeschen + // unterer Teil + if ( nNewRow2 > nOldRow2 ) // nur untere Linie loeschen lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow2, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL ); - else if ( nNewRow2 < nOldRow2 ) // den Teil, der unten wegkommt + else if ( nNewRow2 < nOldRow2 ) // den Teil, der unten wegkommt lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nNewRow2+1, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL &~ SCE_TOP ); - // linker Teil - if ( nNewCol1 < nOldCol1 ) // nur linke Linie loeschen + // linker Teil + if ( nNewCol1 < nOldCol1 ) // nur linke Linie loeschen lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow1, nTab1, nOldCol1, nOldRow2, nTab2 ), SCE_ALL ); - else if ( nNewCol1 > nOldCol1 ) // den Teil, der links wegkommt + else if ( nNewCol1 > nOldCol1 ) // den Teil, der links wegkommt lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow1, nTab1, nNewCol1-1, nOldRow2, nTab2 ), SCE_ALL &~ SCE_RIGHT ); - // rechter Teil - if ( nNewCol2 > nOldCol2 ) // nur rechte Linie loeschen + // rechter Teil + if ( nNewCol2 > nOldCol2 ) // nur rechte Linie loeschen lcl_PaintOneRange( pDocSh, ScRange( nOldCol2, nOldRow1, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL ); - else if ( nNewCol2 < nOldCol2 ) // den Teil, der rechts wegkommt + else if ( nNewCol2 < nOldCol2 ) // den Teil, der rechts wegkommt lcl_PaintOneRange( pDocSh, ScRange( nNewCol2+1, nOldRow1, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL &~ SCE_LEFT ); @@ -4818,14 +4818,14 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) if (!pData) return; - // Mauszeiger + // Mauszeiger if (bRFSize) SetPointer( Pointer( POINTER_CROSS ) ); else SetPointer( Pointer( POINTER_HAND ) ); - // Scrolling + // Scrolling BOOL bTimer = FALSE; Point aPos = rMEvt.GetPosPixel(); @@ -4845,9 +4845,9 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) bTimer = TRUE; } - // Umschalten bei Fixierung (damit Scrolling funktioniert) + // Umschalten bei Fixierung (damit Scrolling funktioniert) - if ( eWhich == pViewData->GetActivePart() ) //?? + if ( eWhich == pViewData->GetActivePart() ) //?? { if ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ) if ( nDx > 0 ) @@ -4868,10 +4868,10 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) } } - // Verschieben + // Verschieben - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); ScRange aOld = pData->aRef; @@ -4907,7 +4907,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) } if ( bUp ) - aNew.Justify(); // beim ButtonUp wieder richtigherum + aNew.Justify(); // beim ButtonUp wieder richtigherum if ( aNew != aOld ) { @@ -4915,19 +4915,19 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) ScDocShell* pDocSh = pViewData->GetDocShell(); - // nur das neuzeichnen, was sich veraendert hat... + // nur das neuzeichnen, was sich veraendert hat... lcl_PaintRefChanged( pDocSh, aOld, aNew ); - // neuen Rahmen nur drueberzeichnen (synchron) + // neuen Rahmen nur drueberzeichnen (synchron) pDocSh->Broadcast( ScIndexHint( SC_HINT_SHOWRANGEFINDER, nRFIndex ) ); - Update(); // was man bewegt, will man auch sofort sehen + Update(); // was man bewegt, will man auch sofort sehen } - // Timer fuer Scrolling + // Timer fuer Scrolling if (bTimer) - pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen + pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen else pViewData->GetView()->ResetTimer(); } @@ -4943,7 +4943,7 @@ BOOL ScGridWindow::GetEditUrl( const Point& rPos, BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, String* pName, String* pUrl, String* pTarget ) { - //! nPosX/Y mit uebergeben? + //! nPosX/Y mit uebergeben? SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( rPos.X(), rPos.Y(), eWhich, nPosX, nPosY ); @@ -4957,7 +4957,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, if( !bFound ) return FALSE; - ScHideTextCursor aHideCursor( pViewData, eWhich ); // before GetEditArea (MapMode is changed) + ScHideTextCursor aHideCursor( pViewData, eWhich ); // before GetEditArea (MapMode is changed) const ScPatternAttr* pPattern = pDoc->GetPattern( nPosX, nPosY, nTab ); // bForceToTop = FALSE, use the cell's real position @@ -4965,7 +4965,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, if (rPos.Y() < aEditRect.Top()) return FALSE; - // vertikal kann (noch) nicht angeklickt werden: + // vertikal kann (noch) nicht angeklickt werden: if (pPattern->GetCellOrientation() != SVX_ORIENTATION_STANDARD) return FALSE; @@ -4976,7 +4976,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, SvxCellHorJustify eHorJust = (SvxCellHorJustify)((SvxHorJustifyItem&)pPattern-> GetItem(ATTR_HOR_JUSTIFY)).GetValue(); - // EditEngine + // EditEngine ScFieldEditEngine aEngine( pDoc->GetEditPool() ); ScSizeDeviceProvider aProv(pDocSh); @@ -4988,8 +4988,8 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, switch (eHorJust) { case SVX_HOR_JUSTIFY_LEFT: - case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert - case SVX_HOR_JUSTIFY_STANDARD: // always Text if an EditCell type + case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert + case SVX_HOR_JUSTIFY_STANDARD: // always Text if an EditCell type eSvxAdjust = SVX_ADJUST_LEFT; break; case SVX_HOR_JUSTIFY_RIGHT: @@ -5007,7 +5007,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, if (bSpellErr) aEngine.SetControlWord( aEngine.GetControlWord() | EE_CNTRL_ONLINESPELLING ); - MapMode aEditMode = pViewData->GetLogicMode(eWhich); // ohne Drawing-Skalierung + MapMode aEditMode = pViewData->GetLogicMode(eWhich); // ohne Drawing-Skalierung Rectangle aLogicEdit = PixelToLogic( aEditRect, aEditMode ); long nThisColLogic = aLogicEdit.Right() - aLogicEdit.Left() + 1; Size aPaperSize = Size( 1000000, 1000000 ); @@ -5071,23 +5071,23 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, Point aLogicClick = PixelToLogic(rPos,aEditMode); if ( aLogicEdit.IsInside(aLogicClick) ) { -// aEngine.SetUpdateMode(FALSE); +// aEngine.SetUpdateMode(FALSE); EditView aTempView( &aEngine, this ); aTempView.SetOutputArea( aLogicEdit ); BOOL bRet = FALSE; MapMode aOld = GetMapMode(); - SetMapMode(aEditMode); // kein return mehr + SetMapMode(aEditMode); // kein return mehr - if (bSpellErr) // Spelling-Fehler suchen + if (bSpellErr) // Spelling-Fehler suchen { bRet = aTempView.IsWrongSpelledWordAtPos( rPos ); if ( bRet ) - pViewData->GetView()->SetCursor( nPosX, nPosY ); // Cursor setzen + pViewData->GetView()->SetCursor( nPosX, nPosY ); // Cursor setzen } - else // URL suchen + else // URL suchen { - const SvxFieldItem* pFieldItem = aTempView.GetFieldUnderMousePointer(); + const SvxFieldItem* pFieldItem = aTempView.GetFieldUnderMousePointer(); if (pFieldItem) { @@ -5111,7 +5111,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, SetMapMode(aOld); - // text cursor is restored in ScHideTextCursor dtor + // text cursor is restored in ScHideTextCursor dtor return bRet; } @@ -5130,11 +5130,11 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang Size aButSize = pViewData->GetScenButSize(); long nBWidth = aButSize.Width(); if (!nBWidth) - return FALSE; // noch kein Button gezeichnet -> da ist auch keiner + return FALSE; // noch kein Button gezeichnet -> da ist auch keiner long nBHeight = aButSize.Height(); long nHSpace = (long)( SC_SCENARIO_HSPACE * pViewData->GetPPTX() ); - //! Ranges an der Table cachen!!!! + //! Ranges an der Table cachen!!!! ScMarkData aMarks; for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++) @@ -5147,8 +5147,8 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang for (ULONG j=0; j<nRangeCount; j++) { ScRange aRange = *aRanges.GetObject(j); - // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn - // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden + // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn + // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden pDoc->ExtendTotalMerge( aRange ); BOOL bTextBelow = ( aRange.aStart.Row() == 0 ); @@ -5168,7 +5168,7 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang if ( bLayoutRTL ) aButtonPos.X() -= nHSpace - 1; else - aButtonPos.X() -= nBWidth - nHSpace; // same for top or bottom + aButtonPos.X() -= nBWidth - nHSpace; // same for top or bottom Rectangle aButRect( aButtonPos, Size(nBWidth,nBHeight) ); if ( aButRect.IsInside( rPosPixel ) ) @@ -5396,7 +5396,7 @@ void ScGridWindow::UpdateCursorOverlay() aCursorColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor; std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); - + for(sal_uInt32 a(0); a < aPixelRects.size(); a++) { const Rectangle aRA(aPixelRects[a]); @@ -5404,10 +5404,10 @@ void ScGridWindow::UpdateCursorOverlay() aRB.transform(aTransform); aRanges.push_back(aRB); } - + sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_SOLID, - aCursorColor, + sdr::overlay::OVERLAY_SOLID, + aCursorColor, aRanges, false); @@ -5446,7 +5446,7 @@ void ScGridWindow::UpdateSelectionOverlay() { std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); - + for(sal_uInt32 a(0); a < aPixelRects.size(); a++) { const Rectangle aRA(aPixelRects[a]); @@ -5476,8 +5476,8 @@ void ScGridWindow::UpdateSelectionOverlay() } sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_TRANSPARENT, - aHighlight, + sdr::overlay::OVERLAY_TRANSPARENT, + aHighlight, aRanges, true); @@ -5536,7 +5536,7 @@ void ScGridWindow::UpdateAutoFillOverlay() aFillPos.Y() += nSizeYPix; aFillPos.Y() -= 2; mpAutoFillRect.reset(new Rectangle(aFillPos, Size(6, 6))); - + // #i70788# get the OverlayManager safely ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); @@ -5549,13 +5549,13 @@ void ScGridWindow::UpdateAutoFillOverlay() std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); basegfx::B2DRange aRB(mpAutoFillRect->Left(), mpAutoFillRect->Top(), mpAutoFillRect->Right() + 1, mpAutoFillRect->Bottom() + 1); - + aRB.transform(aTransform); aRanges.push_back(aRB); - sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_SOLID, - aHandleColor, + sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( + sdr::overlay::OVERLAY_SOLID, + aHandleColor, aRanges, false); @@ -5676,7 +5676,7 @@ void ScGridWindow::UpdateDragRectOverlay() // Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor(); std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); - + for(sal_uInt32 a(0); a < aPixelRects.size(); a++) { const Rectangle aRA(aPixelRects[a]); @@ -5685,8 +5685,8 @@ void ScGridWindow::UpdateDragRectOverlay() aRanges.push_back(aRB); } - sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_INVERT, + sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( + sdr::overlay::OVERLAY_INVERT, Color(COL_BLACK), aRanges, false); @@ -5727,13 +5727,13 @@ void ScGridWindow::UpdateHeaderOverlay() std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); basegfx::B2DRange aRB(aInvertRect.Left(), aInvertRect.Top(), aInvertRect.Right() + 1, aInvertRect.Bottom() + 1); - + aRB.transform(aTransform); aRanges.push_back(aRB); sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_INVERT, - Color(COL_BLACK), + sdr::overlay::OVERLAY_INVERT, + Color(COL_BLACK), aRanges, false); @@ -5797,13 +5797,13 @@ void ScGridWindow::UpdateShrinkOverlay() std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); basegfx::B2DRange aRB(aPixRect.Left(), aPixRect.Top(), aPixRect.Right() + 1, aPixRect.Bottom() + 1); - + aRB.transform(aTransform); aRanges.push_back(aRB); sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_INVERT, - Color(COL_BLACK), + sdr::overlay::OVERLAY_INVERT, + Color(COL_BLACK), aRanges, false); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index dd19b66fcf25..ccacee30fe30 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.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 @@ #include "pagedata.hxx" #include "dpobject.hxx" #include "dpsave.hxx" -#include "dpoutput.hxx" // ScDPPositionData +#include "dpoutput.hxx" // ScDPPositionData #include "dpshttab.hxx" #include "dbdocfun.hxx" #include "dpcontrol.hxx" @@ -176,7 +176,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); + ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); if (pDPObj) { @@ -190,8 +190,8 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt pDragDPObj = pDPObj; if (DPTestFieldPopupArrow(rMEvt, aPos, pDPObj)) - { - // field name pop up menu has been launched. Don't activate + { + // field name pop up menu has been launched. Don't activate // field move. bDPMouse = false; return; @@ -202,7 +202,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt } else if ( pDPObj->IsFilterButton(aPos) ) { - ReleaseMouse(); // may have been captured in ButtonDown + ReleaseMouse(); // may have been captured in ButtonDown ScQueryParam aQueryParam; SCTAB nSrcTab = 0; @@ -221,7 +221,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); - AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewData->GetViewShell()->GetDialogParent(), + AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewData->GetViewShell()->GetDialogParent(), aArgSet, nSrcTab, RID_SCDLG_PIVOTFILTER); DBG_ASSERT(pDlg, "Dialog create fail!"); @@ -238,7 +238,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt aNewObj.SetSheetDesc( aNewDesc ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE ); - pViewData->GetView()->CursorPosChanged(); // shells may be switched + pViewData->GetView()->CursorPosChanged(); // shells may be switched } delete pDlg; } @@ -253,15 +253,15 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt // ----------------------------------------------------------------------- // -// Data Pilot interaction +// Data Pilot interaction // void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) { DBG_ASSERT(pDragDPObj, "pDragDPObj missing"); - // scroll window if at edges - //! move this to separate method + // scroll window if at edges + //! move this to separate method BOOL bTimer = FALSE; Point aPixel = rMEvt.GetPosPixel(); @@ -289,13 +289,13 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) bTimer = TRUE; } - // --- + // --- - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), eWhich, nPosX, nPosY ); - BOOL bMouseLeft; - BOOL bMouseTop; + BOOL bMouseLeft; + BOOL bMouseTop; pViewData->GetMouseQuadrant( aPixel, eWhich, nPosX, nPosY, bMouseLeft, bMouseTop ); ScAddress aPos( nPosX, nPosY, pViewData->GetTabNo() ); @@ -312,7 +312,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) String aDimName = pDragDPObj->GetDimName( nDPField, bIsDataLayout, &nDimFlags ); bool bAllowed = !bHasRange || ScDPObject::IsOrientationAllowed( nOrient, nDimFlags ); - if (bMove) // set mouse pointer + if (bMove) // set mouse pointer { PointerStyle ePointer = POINTER_PIVOT_DELETE; if ( !bAllowed ) @@ -320,14 +320,14 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) else if ( bHasRange ) switch (nOrient) { - case sheet::DataPilotFieldOrientation_COLUMN: ePointer = POINTER_PIVOT_COL; break; - case sheet::DataPilotFieldOrientation_ROW: ePointer = POINTER_PIVOT_ROW; break; + case sheet::DataPilotFieldOrientation_COLUMN: ePointer = POINTER_PIVOT_COL; break; + case sheet::DataPilotFieldOrientation_ROW: ePointer = POINTER_PIVOT_ROW; break; case sheet::DataPilotFieldOrientation_PAGE: - case sheet::DataPilotFieldOrientation_DATA: ePointer = POINTER_PIVOT_FIELD; break; + case sheet::DataPilotFieldOrientation_DATA: ePointer = POINTER_PIVOT_FIELD; break; } SetPointer( ePointer ); } - else // execute change + else // execute change { if (!bHasRange) nOrient = sheet::DataPilotFieldOrientation_HIDDEN; @@ -335,7 +335,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) if ( bIsDataLayout && ( nOrient != sheet::DataPilotFieldOrientation_COLUMN && nOrient != sheet::DataPilotFieldOrientation_ROW ) ) { - // removing data layout is not allowed + // removing data layout is not allowed pViewData->GetView()->ErrorMessage(STR_PIVOT_MOVENOTALLOWED); } else if ( bAllowed ) @@ -350,19 +350,19 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) pDim->SetOrientation( nOrient ); aSaveData.SetPosition( pDim, nDimPos ); - //! docfunc method with ScDPSaveData as argument? + //! docfunc method with ScDPSaveData as argument? ScDPObject aNewObj( *pDragDPObj ); aNewObj.SetSaveData( aSaveData ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); // when dragging fields, allow re-positioning (bAllowMove) aFunc.DataPilotUpdate( pDragDPObj, &aNewObj, TRUE, FALSE, TRUE ); - pViewData->GetView()->CursorPosChanged(); // shells may be switched + pViewData->GetView()->CursorPosChanged(); // shells may be switched } } if (bTimer && bMove) - pViewData->GetView()->SetTimer( this, rMEvt ); // repeat event + pViewData->GetView()->SetTimer( this, rMEvt ); // repeat event else pViewData->GetView()->ResetTimer(); } @@ -407,7 +407,7 @@ struct DPFieldPopupData : public ScDPFieldPopupWindow::ExtendedData class DPFieldPopupOKAction : public ScMenuFloatingWindow::Action { public: - explicit DPFieldPopupOKAction(ScGridWindow* p) : + explicit DPFieldPopupOKAction(ScGridWindow* p) : mpGridWindow(p) {} virtual void execute() @@ -502,7 +502,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu( // Populate the menus. ScTabViewShell* pViewShell = pViewData->GetViewShell(); mpDPFieldPopup->addMenuItem( - ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_ASC).GetString(), true, + ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_ASC).GetString(), true, new PopupSortAction(rPos, PopupSortAction::ASCENDING, 0, pViewShell)); mpDPFieldPopup->addMenuItem( ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_DESC).GetString(), true, @@ -514,9 +514,9 @@ void ScGridWindow::DPLaunchFieldPopupMenu( { size_t n = aUserSortNames.size(); for (size_t i = 0; i < n; ++i) - { + { pSubMenu->addMenuItem( - aUserSortNames[i], true, + aUserSortNames[i], true, new PopupSortAction(rPos, PopupSortAction::CUSTOM, static_cast<sal_uInt16>(i), pViewShell)); } } @@ -532,7 +532,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu( } else if (rScrSize.getWidth() > rPopupSize.getWidth()) { - // If the cell width is larger than the popup window width, launch it + // If the cell width is larger than the popup window width, launch it // right-aligned with the cell. long nXOffset = rScrSize.getWidth() - rPopupSize.getWidth(); aCellRect.SetPos(Point(rScrPos.X() + nXOffset, rScrPos.Y())); @@ -636,11 +636,11 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect ) if ( bShowRange == bDragRect && nDragStartX == nStartX && nDragEndX == nEndX && nDragStartY == nStartY && nDragEndY == nEndY ) { - return; // everything unchanged + return; // everything unchanged } // if ( bDragRect ) - // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE ); + // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE ); if ( bShowRange ) { nDragStartX = nStartX; @@ -658,12 +658,12 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect ) // ----------------------------------------------------------------------- -// Page-Break-Modus +// Page-Break-Modus USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, SCCOLROW* pBreak, SCCOLROW* pPrev ) { - USHORT nFound = SC_PD_NONE; // 0 + USHORT nFound = SC_PD_NONE; // 0 ScRange aSource; SCCOLROW nBreak = 0; SCCOLROW nPrev = 0; @@ -684,7 +684,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, Point aTL = pViewData->GetScrPos( nPosX, nPosY, eWhich ); Point aBR = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich ); - // Horizontal mehr Toleranz als vertikal, weil mehr Platz ist + // Horizontal mehr Toleranz als vertikal, weil mehr Platz ist if ( nMouseX <= aTL.X() + 4 ) { bHori = TRUE; @@ -693,7 +693,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, else if ( nMouseX >= aBR.X() - 6 ) { bHori = TRUE; - nHitX = nPosX+1; // linker Rand der naechsten Zelle + nHitX = nPosX+1; // linker Rand der naechsten Zelle } if ( nMouseY <= aTL.Y() + 2 ) { @@ -703,7 +703,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, else if ( nMouseY >= aBR.Y() - 4 ) { bVert = TRUE; - nHitY = nPosY+1; // oberer Rand der naechsten Zelle + nHitY = nPosY+1; // oberer Rand der naechsten Zelle } if ( bHori || bVert ) @@ -745,7 +745,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, if (nFound) aSource = aRange; - // Umbrueche + // Umbrueche if ( bVert && bInsideH && !nFound ) { @@ -784,20 +784,20 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, } if (pSource) - *pSource = aSource; // Druckbereich + *pSource = aSource; // Druckbereich if (pBreak) - *pBreak = nBreak; // X/Y Position des verchobenen Seitenumbruchs + *pBreak = nBreak; // X/Y Position des verchobenen Seitenumbruchs if (pPrev) - *pPrev = nPrev; // X/Y Anfang der Seite, die am Umbruch zuende ist + *pPrev = nPrev; // X/Y Anfang der Seite, die am Umbruch zuende ist return nFound; } void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) { - //! Scrolling und Umschalten mit RFMouseMove zusammenfassen ! - //! (Weginvertieren vor dem Scrolling ist anders) + //! Scrolling und Umschalten mit RFMouseMove zusammenfassen ! + //! (Weginvertieren vor dem Scrolling ist anders) - // Scrolling + // Scrolling BOOL bTimer = FALSE; Point aPos = rMEvt.GetPosPixel(); @@ -812,10 +812,10 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) nDy = 1; if ( nDx != 0 || nDy != 0 ) { - if ( bPagebreakDrawn ) // weginvertieren + if ( bPagebreakDrawn ) // weginvertieren { // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), - // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); + // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); bPagebreakDrawn = FALSE; UpdateDragRectOverlay(); } @@ -825,9 +825,9 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) bTimer = TRUE; } - // Umschalten bei Fixierung (damit Scrolling funktioniert) + // Umschalten bei Fixierung (damit Scrolling funktioniert) - if ( eWhich == pViewData->GetActivePart() ) //?? + if ( eWhich == pViewData->GetActivePart() ) //?? { if ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ) if ( nDx > 0 ) @@ -848,9 +848,9 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) } } - // ab hier neu + // ab hier neu - // gesucht wird eine Position zwischen den Zellen (vor nPosX / nPosY) + // gesucht wird eine Position zwischen den Zellen (vor nPosX / nPosY) SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); @@ -868,7 +868,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) if ( nPagebreakMouse == SC_PD_BREAK_H ) { if ( nPosX > aPagebreakSource.aStart.Col() && - nPosX <= aPagebreakSource.aEnd.Col() + 1 ) // ans Ende ist auch erlaubt + nPosX <= aPagebreakSource.aEnd.Col() + 1 ) // ans Ende ist auch erlaubt { bToEnd = ( nPosX == aPagebreakSource.aEnd.Col() + 1 ); aDrawRange.aStart.SetCol( nPosX ); @@ -880,7 +880,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) else { if ( nPosY > aPagebreakSource.aStart.Row() && - nPosY <= aPagebreakSource.aEnd.Row() + 1 ) // ans Ende ist auch erlaubt + nPosY <= aPagebreakSource.aEnd.Row() + 1 ) // ans Ende ist auch erlaubt { bToEnd = ( nPosY == aPagebreakSource.aEnd.Row() + 1 ); aDrawRange.aStart.SetRow( nPosY ); @@ -917,13 +917,13 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) if ( !bPagebreakDrawn || bUp || aDrawRange != aPagebreakDrag ) { - // zeichnen... + // zeichnen... if ( bPagebreakDrawn ) { // weginvertieren // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), - // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); + // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); bPagebreakDrawn = FALSE; } aPagebreakDrag = aDrawRange; @@ -931,13 +931,13 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) { // hininvertieren // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), - // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); + // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); bPagebreakDrawn = TRUE; } UpdateDragRectOverlay(); } - // bei ButtonUp die Aenderung ausfuehren + // bei ButtonUp die Aenderung ausfuehren if ( bUp ) { @@ -967,14 +967,14 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) ScAddress aOldAddr( static_cast<SCCOL>(nPagebreakBreak), nPosY, nTab ); pViewFunc->DeletePageBreak( TRUE, TRUE, &aOldAddr, FALSE ); } - if ( !bHide && !bToEnd ) // am Ende nicht + if ( !bHide && !bToEnd ) // am Ende nicht { ScAddress aNewAddr( static_cast<SCCOL>(nNew), nPosY, nTab ); pViewFunc->InsertPageBreak( TRUE, TRUE, &aNewAddr, FALSE ); } if ( bGrow ) { - // vorigen Break auf hart, und Skalierung aendern + // vorigen Break auf hart, und Skalierung aendern bool bManualBreak = (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakPrev), nTab) & BREAK_MANUAL); if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && !bManualBreak ) { @@ -994,14 +994,14 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) ScAddress aOldAddr( nPosX, nPagebreakBreak, nTab ); pViewFunc->DeletePageBreak( FALSE, TRUE, &aOldAddr, FALSE ); } - if ( !bHide && !bToEnd ) // am Ende nicht + if ( !bHide && !bToEnd ) // am Ende nicht { ScAddress aNewAddr( nPosX, nNew, nTab ); pViewFunc->InsertPageBreak( FALSE, TRUE, &aNewAddr, FALSE ); } if ( bGrow ) { - // vorigen Break auf hart, und Skalierung aendern + // vorigen Break auf hart, und Skalierung aendern bool bManualBreak = (pDoc->HasRowBreak(nPagebreakPrev, nTab) & BREAK_MANUAL); if ( nPagebreakPrev > aPagebreakSource.aStart.Row() && !bManualBreak ) { @@ -1020,7 +1020,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) pDocSh->GetUndoManager()->LeaveListAction(); } - if (!bGrow) // sonst in AdjustPrintZoom schon passiert + if (!bGrow) // sonst in AdjustPrintZoom schon passiert { pViewFunc->UpdatePageBreakData( TRUE ); pDocSh->SetDocumentModified(); @@ -1029,7 +1029,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) } else if ( bHide || aPagebreakDrag != aPagebreakSource ) { - // Druckbereich setzen + // Druckbereich setzen String aNewRanges; USHORT nOldCount = pDoc->GetPrintRangeCount( nTab ); @@ -1061,10 +1061,10 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) } } - // Timer fuer Scrolling + // Timer fuer Scrolling if (bTimer && !bUp) - pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen + pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen else pViewData->GetView()->ResetTimer(); } diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 4940fba35f82..37673bc035d1 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.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 @@ -64,7 +64,7 @@ BOOL ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) Point aLogicPos = PixelToLogic(rMEvt.GetPosPixel()); if ( pDraw->IsDetectiveHit( aLogicPos ) ) { - // auf Detektiv-Pfeilen gar nichts (Doppelklick wird bei ButtonUp ausgewertet) + // auf Detektiv-Pfeilen gar nichts (Doppelklick wird bei ButtonUp ausgewertet) bRet = TRUE; } else @@ -75,7 +75,7 @@ BOOL ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) } } - // bei rechter Taste Draw-Aktion abbrechen + // bei rechter Taste Draw-Aktion abbrechen ScDrawView* pDrView = pViewData->GetScDrawView(); if ( pDrView && !rMEvt.IsLeft() && !bRet ) @@ -143,7 +143,7 @@ void ScGridWindow::DrawEndAction() if (pDraw) pDraw->StopDragTimer(); - // ReleaseMouse beim Aufruf + // ReleaseMouse beim Aufruf } BOOL ScGridWindow::DrawCommand(const CommandEvent& rCEvt) @@ -155,7 +155,7 @@ BOOL ScGridWindow::DrawCommand(const CommandEvent& rCEvt) pDraw->SetWindow( this ); BYTE nUsed = pDraw->Command( rCEvt ); if( nUsed == SC_CMD_USED ) - nButtonDown = 0; // MouseButtonUp wird verschluckt... + nButtonDown = 0; // MouseButtonUp wird verschluckt... if( nUsed || pDrView->IsAction() ) return TRUE; } @@ -183,10 +183,10 @@ BOOL ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt) bLeaveDraw = TRUE; if ( !bOldMarked && rKEvt.GetKeyCode().GetCode() == KEY_DELETE ) - bUsed = FALSE; // nichts geloescht + bUsed = FALSE; // nichts geloescht } if (!bLeaveDraw) - UpdateStatusPosSize(); // #108137# for moving/resizing etc. by keyboard + UpdateStatusPosSize(); // #108137# for moving/resizing etc. by keyboard return bUsed; } } @@ -229,7 +229,7 @@ void ScGridWindow::DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, UL void ScGridWindow::DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev ) { - // Draw-Gitterlinien + // Draw-Gitterlinien ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); if ( pDrView && pDrView->IsGridVisible() ) @@ -279,7 +279,7 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce ) Point aStartPos = pViewData->GetPixPos(eWhich); if ( bNegativePage ) { - // RTL uses negative positions for drawing objects + // RTL uses negative positions for drawing objects aStartPos.X() = -aStartPos.X() + GetOutputSizePixel().Width() - 1; } aDrawMode.SetOrigin( PixelToLogic( aStartPos, aDrawMode ) ); @@ -289,44 +289,44 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce ) //BOOL ScGridWindow::DrawBeforeScroll() //{ -// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); +// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); // -// BOOL bXor = FALSE; -// if (pDrView) -// { -// bXor=pDrView->IsShownXorVisible(this); -// if (bXor) pDrView->HideShownXor(this); -// } -// return bXor; +// BOOL bXor = FALSE; +// if (pDrView) +// { +// bXor=pDrView->IsShownXorVisible(this); +// if (bXor) pDrView->HideShownXor(this); +// } +// return bXor; //} void ScGridWindow::DrawAfterScroll(/*BOOL bVal*/) { - Update(); // immer, damit das Verhalten mit/ohne DrawingLayer gleich ist + Update(); // immer, damit das Verhalten mit/ohne DrawingLayer gleich ist ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); if (pDrView) { //if (bVal) - // pDrView->ShowShownXor(this); + // pDrView->ShowShownXor(this); OutlinerView* pOlView = pDrView->GetTextEditOutlinerView(); if (pOlView && pOlView->GetWindow() == this) - pOlView->ShowCursor(FALSE); // ist beim Scrollen weggekommen + pOlView->ShowCursor(FALSE); // ist beim Scrollen weggekommen } } //void ScGridWindow::DrawMarks() //{ -// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); -// if (pDrView) -// pDrView->DrawMarks(this); +// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); +// if (pDrView) +// pDrView->DrawMarks(this); //} //BOOL ScGridWindow::NeedDrawMarks() //{ -// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); -// return pDrView && pDrView->IsMarkHdlShown() && pDrView->AreObjectsMarked(); +// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); +// return pDrView && pDrView->IsMarkHdlShown() && pDrView->AreObjectsMarked(); //} void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress) @@ -362,7 +362,7 @@ void ScGridWindow::UpdateStatusPosSize() { ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); if (!pDrView) - return; // shouldn't be called in that case + return; // shouldn't be called in that case SdrPageView* pPV = pDrView->GetSdrPageView(); if (!pPV) @@ -370,13 +370,13 @@ void ScGridWindow::UpdateStatusPosSize() SfxItemSet aSet(pViewData->GetViewShell()->GetPool(), SID_ATTR_POSITION, SID_ATTR_SIZE); - // Fill items for position and size: - // #108137# show action rectangle during action, - // position and size of selected object(s) if something is selected, - // mouse position otherwise + // Fill items for position and size: + // #108137# show action rectangle during action, + // position and size of selected object(s) if something is selected, + // mouse position otherwise BOOL bActionItem = FALSE; - if ( pDrView->IsAction() ) // action rectangle + if ( pDrView->IsAction() ) // action rectangle { Rectangle aRect; pDrView->TakeActionRect( aRect ); @@ -391,7 +391,7 @@ void ScGridWindow::UpdateStatusPosSize() } if ( !bActionItem ) { - if ( pDrView->AreObjectsMarked() ) // selected objects + if ( pDrView->AreObjectsMarked() ) // selected objects { Rectangle aRect = pDrView->GetAllMarkedRect(); pPV->LogicToPagePos(aRect); @@ -399,7 +399,7 @@ void ScGridWindow::UpdateStatusPosSize() aSet.Put( SvxSizeItem( SID_ATTR_SIZE, Size( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() ) ) ); } - else // mouse position + else // mouse position { Point aPos = PixelToLogic(aCurMousePos); pPV->LogicToPagePos(aPos); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 66358f6f8907..fb5158ad7363 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.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 @@ -53,11 +53,11 @@ #include "output.hxx" #include "document.hxx" #include "attrib.hxx" -#include "patattr.hxx" // InvertSimple +#include "patattr.hxx" // InvertSimple #include "dbcolect.hxx" #include "docoptio.hxx" #include "notemark.hxx" -#include "dbfunc.hxx" // oder GetPageBreakData an die ViewData +#include "dbfunc.hxx" // oder GetPageBreakData an die ViewData #include "scmod.hxx" #include "inputhdl.hxx" #include "rfindlst.hxx" @@ -65,7 +65,7 @@ #include "pagedata.hxx" #include "docpool.hxx" #include "globstr.hrc" -#include "docsh.hxx" // oder GetSfxInPlaceObject +#include "docsh.hxx" // oder GetSfxInPlaceObject #include "cbutton.hxx" #include "invmerge.hxx" #include "editutil.hxx" @@ -84,9 +84,9 @@ void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) { if ( rRect.Top() < rVisible.Top()-1 ) rRect.Top() = rVisible.Top()-1; -// if ( rRect.Left() < rVisible.Left()-1 ) rRect.Left() = rVisible.Left()-1; +// if ( rRect.Left() < rVisible.Left()-1 ) rRect.Left() = rVisible.Left()-1; if ( rRect.Bottom() > rVisible.Bottom()+1 ) rRect.Bottom() = rVisible.Bottom()+1; -// if ( rRect.Right() > rVisible.Right()+1 ) rRect.Right() = rVisible.Right()+1; +// if ( rRect.Right() > rVisible.Right()+1 ) rRect.Right() = rVisible.Right()+1; // #51122# auch wenn das inner-Rectangle nicht sichtbar ist, muss evtl. // die Titelzeile gezeichnet werden, darum kein Rueckgabewert mehr. @@ -98,8 +98,8 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, double nPPTX, double nPPTY, const Fraction& rZoomY, ScDocument* pDoc, ScViewData* pButtonViewData, BOOL bLayoutRTL ) { - // pButtonViewData wird nur benutzt, um die Button-Groesse zu setzen, - // darf ansonsten NULL sein! + // pButtonViewData wird nur benutzt, um die Button-Groesse zu setzen, + // darf ansonsten NULL sein! Rectangle aInner = rInnerPixel; if ( bLayoutRTL ) @@ -114,17 +114,17 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, Rectangle aOuter = aInner; long nHor = (long) ( SC_SCENARIO_HSPACE * nPPTX ); long nVer = (long) ( SC_SCENARIO_VSPACE * nPPTY ); - aOuter.Left() -= nHor; - aOuter.Right() += nHor; - aOuter.Top() -= nVer; - aOuter.Bottom() += nVer; + aOuter.Left() -= nHor; + aOuter.Right() += nHor; + aOuter.Top() -= nVer; + aOuter.Bottom() += nVer; - // use ScPatternAttr::GetFont only for font size + // use ScPatternAttr::GetFont only for font size Font aAttrFont; ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)). GetFont(aAttrFont,SC_AUTOCOL_BLACK,pDev,&rZoomY); - // everything else from application font + // everything else from application font Font aAppFont = pDev->GetSettings().GetStyleSettings().GetAppFont(); aAppFont.SetSize( aAttrFont.GetSize() ); @@ -140,7 +140,7 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, pDev->SetLineColor(); pDev->SetFillColor( rColor ); - // links, oben, rechts, unten + // links, oben, rechts, unten pDev->DrawRect( Rectangle( aOuter.Left(), aOuter.Top(), aInner.Left(), aOuter.Bottom() ) ); pDev->DrawRect( Rectangle( aOuter.Left(), aOuter.Top(), aOuter.Right(), aInner.Top() ) ); pDev->DrawRect( Rectangle( aInner.Right(), aOuter.Top(), aOuter.Right(), aOuter.Bottom() ) ); @@ -202,14 +202,14 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP if ( nTab+1<nTabCount && pDoc->IsScenario(nTab+1) && !pDoc->IsScenario(nTab) ) { if ( nX1 > 0 ) --nX1; - if ( nY1>=2 ) nY1 -= 2; // Hack: Titelzeile beruehrt zwei Zellen + if ( nY1>=2 ) nY1 -= 2; // Hack: Titelzeile beruehrt zwei Zellen else if ( nY1 > 0 ) --nY1; if ( nX2 < MAXCOL ) ++nX2; - if ( nY2 < MAXROW-1 ) nY2 += 2; // Hack: Titelzeile beruehrt zwei Zellen + if ( nY2 < MAXROW-1 ) nY2 += 2; // Hack: Titelzeile beruehrt zwei Zellen else if ( nY2 < MAXROW ) ++nY2; ScRange aViewRange( nX1,nY1,nTab, nX2,nY2,nTab ); - //! Ranges an der Table cachen!!!! + //! Ranges an der Table cachen!!!! ScMarkData aMarks; for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++) @@ -224,19 +224,19 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP for (USHORT j=0; j<nRangeCount; j++) { ScRange aRange = *xRanges->GetObject(j); - // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn - // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden + // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn + // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden pDoc->ExtendTotalMerge( aRange ); - //! -> Repaint beim Zusammenfassen erweitern !!! + //! -> Repaint beim Zusammenfassen erweitern !!! - if ( aRange.Intersects( aViewRange ) ) //! Platz fuer Text/Button? + if ( aRange.Intersects( aViewRange ) ) //! Platz fuer Text/Button? { Point aStartPos = pViewData->GetScrPos( aRange.aStart.Col(), aRange.aStart.Row(), eWhich, TRUE ); Point aEndPos = pViewData->GetScrPos( aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, eWhich, TRUE ); - // on the grid: + // on the grid: aStartPos.X() -= nLayoutSign; aStartPos.Y() -= 1; aEndPos.X() -= nLayoutSign; @@ -258,7 +258,7 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP if (!aCurrent.Len()) aCurrent = ScGlobal::GetRscString( STR_EMPTYDATA ); - //! eigener Text "(keins)" statt "(leer)" ??? + //! eigener Text "(keins)" statt "(leer)" ??? lcl_DrawOneFrame( pDev, Rectangle( aStartPos, aEndPos ), aCurrent, aColor, bTextBelow, @@ -297,15 +297,15 @@ void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, void ScGridWindow::DoInvertRect( const Rectangle& rPixel ) { -// Invert( PixelToLogic(rPixel) ); +// Invert( PixelToLogic(rPixel) ); if ( rPixel == aInvertRect ) - aInvertRect = Rectangle(); // aufheben + aInvertRect = Rectangle(); // aufheben else { DBG_ASSERT( aInvertRect.IsEmpty(), "DoInvertRect nicht paarig" ); - aInvertRect = rPixel; // neues Rechteck merken + aInvertRect = rPixel; // neues Rechteck merken } UpdateHeaderOverlay(); // uses aInvertRect @@ -346,19 +346,19 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect ) ScDocument* pDoc = pViewData->GetDocument(); if ( pDoc->IsInInterpreter() ) { - // via Reschedule, interpretierende Zellen nicht nochmal anstossen - // hier kein Invalidate, sonst kommt z.B. eine Error-Box nie an die Reihe - // (Bug 36381). Durch bNeedsRepaint wird spaeter alles nochmal gemalt. + // via Reschedule, interpretierende Zellen nicht nochmal anstossen + // hier kein Invalidate, sonst kommt z.B. eine Error-Box nie an die Reihe + // (Bug 36381). Durch bNeedsRepaint wird spaeter alles nochmal gemalt. if ( bNeedsRepaint ) { - //! Rechtecke zusammenfassen? - aRepaintPixel = Rectangle(); // mehrfach -> alles painten + //! Rechtecke zusammenfassen? + aRepaintPixel = Rectangle(); // mehrfach -> alles painten } else { bNeedsRepaint = TRUE; - aRepaintPixel = LogicToPixel(rRect); // nur betroffenen Bereich + aRepaintPixel = LogicToPixel(rRect); // nur betroffenen Bereich } return; } @@ -381,7 +381,7 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect ) Rectangle aMirroredPixel = aPixRect; if ( pDoc->IsLayoutRTL( nTab ) ) { - // mirror and swap + // mirror and swap long nWidth = GetSizePixel().Width(); aMirroredPixel.Left() = nWidth - 1 - aPixRect.Right(); aMirroredPixel.Right() = nWidth - 1 - aPixRect.Left(); @@ -409,13 +409,13 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect ) ScViewData::AddPixelsWhile( nScrY, aPixRect.Bottom(), nY2, MAXROW, nPPTY, pDoc, nTab); } - Draw( nX1,nY1,nX2,nY2, SC_UPDATE_MARKS ); // nicht weiterzeichnen + Draw( nX1,nY1,nX2,nY2, SC_UPDATE_MARKS ); // nicht weiterzeichnen bIsInPaint = FALSE; } // -// Draw ---------------------------------------------------------------- +// Draw ---------------------------------------------------------------- // void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode ) @@ -919,7 +919,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod void ScGridWindow::CheckNeedsRepaint() { - // called at the end of painting, and from timer after background text width calculation + // called at the end of painting, and from timer after background text width calculation if (bNeedsRepaint) { @@ -953,7 +953,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, String aPageStr = ScGlobal::GetRscString( STR_PGNUM ); if ( nPageScript == 0 ) { - // get script type of translated "Page" string only once + // get script type of translated "Page" string only once nPageScript = pDoc->GetStringScriptType( aPageStr ); if (nPageScript == 0) nPageScript = ScGlobal::GetDefaultScriptType(); @@ -964,14 +964,14 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, const ScPatternAttr& rDefPattern = ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)); if ( nPageScript == SCRIPTTYPE_LATIN ) { - // use single font and call DrawText directly + // use single font and call DrawText directly rDefPattern.GetFont( aFont, SC_AUTOCOL_BLACK ); aFont.SetColor( Color( COL_LIGHTGRAY ) ); - // font size is set as needed + // font size is set as needed } else { - // use EditEngine to draw mixed-script string + // use EditEngine to draw mixed-script string pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE ); pEditEng->SetRefMapMode( pContentDev->GetMapMode() ); SfxItemSet* pEditDefaults = new SfxItemSet( pEditEng->GetEmptyItemSet() ); @@ -988,8 +988,8 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if ( aRange.aStart.Col() <= nX2+1 && aRange.aEnd.Col()+1 >= nX1 && aRange.aStart.Row() <= nY2+1 && aRange.aEnd.Row()+1 >= nY1 ) { - // 3 Pixel Rahmen um den Druckbereich - // (mittlerer Pixel auf den Gitterlinien) + // 3 Pixel Rahmen um den Druckbereich + // (mittlerer Pixel auf den Gitterlinien) pContentDev->SetLineColor(); if (rData.IsAutomatic()) @@ -1004,9 +1004,9 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, aStart.X() -= 2; aStart.Y() -= 2; - // Ueberlaeufe verhindern: - if ( aStart.X() < -10 ) aStart.X() = -10; - if ( aStart.Y() < -10 ) aStart.Y() = -10; + // Ueberlaeufe verhindern: + if ( aStart.X() < -10 ) aStart.X() = -10; + if ( aStart.Y() < -10 ) aStart.Y() = -10; if ( aEnd.X() > aWinSize.Width() + 10 ) aEnd.X() = aWinSize.Width() + 10; if ( aEnd.Y() > aWinSize.Height() + 10 ) @@ -1017,8 +1017,8 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, pContentDev->DrawRect( Rectangle( Point(aStart.X(),aEnd.Y()-2), aEnd ) ); pContentDev->DrawRect( Rectangle( Point(aEnd.X()-2,aStart.Y()), aEnd ) ); - // Seitenumbrueche - //! anders darstellen (gestrichelt ????) + // Seitenumbrueche + //! anders darstellen (gestrichelt ????) size_t nColBreaks = rData.GetPagesX(); const SCCOL* pColEnd = rData.GetPageEndX(); @@ -1058,7 +1058,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } } - // Seitenzahlen + // Seitenzahlen SCROW nPrStartY = aRange.aStart.Row(); for (nRowPos=0; nRowPos<nRowBreaks; nRowPos++) @@ -1086,7 +1086,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if ( pEditEng ) { - // find right font size with EditEngine + // find right font size with EditEngine long nHeight = 100; pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT ) ); pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CJK ) ); @@ -1094,7 +1094,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, pEditEng->SetText( aPageStr ); Size aSize100( pEditEng->CalcTextWidth(), pEditEng->GetTextHeight() ); - // 40% of width or 60% of height + // 40% of width or 60% of height long nSizeX = 40 * ( aPageEnd.X() - aPageStart.X() ) / aSize100.Width(); long nSizeY = 60 * ( aPageEnd.Y() - aPageStart.Y() ) / aSize100.Height(); nHeight = Min(nSizeX,nSizeY); @@ -1102,7 +1102,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CJK ) ); pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CTL ) ); - // centered output with EditEngine + // centered output with EditEngine Size aTextSize( pEditEng->CalcTextWidth(), pEditEng->GetTextHeight() ); Point aPos( (aPageStart.X()+aPageEnd.X()-aTextSize.Width())/2, (aPageStart.Y()+aPageEnd.Y()-aTextSize.Height())/2 ); @@ -1110,18 +1110,18 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } else { - // find right font size for DrawText + // find right font size for DrawText aFont.SetSize( Size( 0,100 ) ); pContentDev->SetFont( aFont ); Size aSize100( pContentDev->GetTextWidth( aPageStr ), pContentDev->GetTextHeight() ); - // 40% of width or 60% of height + // 40% of width or 60% of height long nSizeX = 40 * ( aPageEnd.X() - aPageStart.X() ) / aSize100.Width(); long nSizeY = 60 * ( aPageEnd.Y() - aPageStart.Y() ) / aSize100.Height(); aFont.SetSize( Size( 0,Min(nSizeX,nSizeY) ) ); pContentDev->SetFont( aFont ); - // centered output with DrawText + // centered output with DrawText Size aTextSize( pContentDev->GetTextWidth( aPageStr ), pContentDev->GetTextHeight() ); Point aPos( (aPageStart.X()+aPageEnd.X()-aTextSize.Width())/2, (aPageStart.Y()+aPageEnd.Y()-aTextSize.Height())/2 ); @@ -1151,16 +1151,16 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2 SCROW nRow; SCSIZE nArrY; SCSIZE nQuery; - SCTAB nTab = pViewData->GetTabNo(); - ScDBData* pDBData = NULL; - ScQueryParam* pQueryParam = NULL; + SCTAB nTab = pViewData->GetTabNo(); + ScDBData* pDBData = NULL; + ScQueryParam* pQueryParam = NULL; RowInfo* pRowInfo = rTabInfo.mpRowInfo; USHORT nArrCount = rTabInfo.mnArrCount; BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - Point aOldPos = aComboButton.GetPosPixel(); // Zustand fuer MouseDown/Up + Point aOldPos = aComboButton.GetPosPixel(); // Zustand fuer MouseDown/Up Size aOldSize = aComboButton.GetSizePixel(); // merken for (nArrY=1; nArrY+1<nArrCount; nArrY++) @@ -1205,7 +1205,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2 } } - // pQueryParam kann nur MAXQUERY Eintraege enthalten + // pQueryParam kann nur MAXQUERY Eintraege enthalten BOOL bSimpleQuery = TRUE; BOOL bColumnFound = FALSE; @@ -1214,8 +1214,8 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2 for (nQuery=0; nQuery<MAXQUERY && bSimpleQuery; nQuery++) if (pQueryParam->GetEntry(nQuery).bDoQuery) { - // hier nicht auf EQUAL beschraenken - // (auch bei ">1" soll der Spaltenkopf blau werden) + // hier nicht auf EQUAL beschraenken + // (auch bei ">1" soll der Spaltenkopf blau werden) if (pQueryParam->GetEntry(nQuery).nField == nCol) bColumnFound = TRUE; @@ -1225,8 +1225,8 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2 } bool bArrowState = bSimpleQuery && bColumnFound; - long nSizeX; - long nSizeY; + long nSizeX; + long nSizeY; pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY ); Point aScrPos = pViewData->GetScrPos( nCol, nRow, eWhich ); @@ -1339,9 +1339,9 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos ) BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ) { - ScDocument* pDoc = pViewData->GetDocument(); - ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab ); - ScQueryParam aQueryParam; + ScDocument* pDoc = pViewData->GetDocument(); + ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab ); + ScQueryParam aQueryParam; if ( pDBData ) pDBData->GetQueryParam( aQueryParam ); @@ -1350,14 +1350,14 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ) DBG_ERROR("Auto-Filter-Button ohne DBData"); } - BOOL bSimpleQuery = TRUE; - BOOL bColumnFound = FALSE; - SCSIZE nQuery; + BOOL bSimpleQuery = TRUE; + BOOL bColumnFound = FALSE; + SCSIZE nQuery; if ( !aQueryParam.bInplace ) bSimpleQuery = FALSE; - // aQueryParam kann nur MAXQUERY Eintraege enthalten + // aQueryParam kann nur MAXQUERY Eintraege enthalten for ( nQuery=0; nQuery<MAXQUERY && bSimpleQuery; nQuery++ ) if ( aQueryParam.GetEntry(nQuery).bDoQuery ) @@ -1373,14 +1373,14 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ) return ( bSimpleQuery && bColumnFound ); } -void ScGridWindow::DrawComboButton( const Point& rCellPos, - long nCellSizeX, - long nCellSizeY, +void ScGridWindow::DrawComboButton( const Point& rCellPos, + long nCellSizeX, + long nCellSizeY, BOOL bArrowState, - BOOL bBtnIn ) + BOOL bBtnIn ) { - Point aScrPos = rCellPos; - Size aBtnSize = aComboButton.GetSizePixel(); + Point aScrPos = rCellPos; + Size aBtnSize = aComboButton.GetSizePixel(); if ( nCellSizeX < aBtnSize.Width() || nCellSizeY < aBtnSize.Height() ) { @@ -1411,9 +1411,9 @@ void ScGridWindow::DrawComboButton( const Point& rCellPos, void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bTestMerge, BOOL bRepeat ) { - //! if INVERT_HIGHLIGHT swaps foreground and background (like on Mac), - //! use INVERT_HIGHLIGHT only for cells that have no background color set - //! (here and in ScOutputData::DrawMark) + //! if INVERT_HIGHLIGHT swaps foreground and background (like on Mac), + //! use INVERT_HIGHLIGHT only for cells that have no background color set + //! (here and in ScOutputData::DrawMark) PutInOrder( nX1, nX2 ); PutInOrder( nY1, nY2 ); @@ -1433,7 +1433,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, SCCOL nPosX = pViewData->GetPosX( eHWhich ); SCROW nPosY = pViewData->GetPosY( eVWhich ); if (nTestX2 < nPosX || nTestY2 < nPosY) - return; // unsichtbar + return; // unsichtbar SCCOL nRealX1 = nX1; if (nX1 < nPosX) nX1 = nPosX; @@ -1446,11 +1446,11 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if (nYBottom > MAXROW) nYBottom = MAXROW; if (nX1 > nXRight || nY1 > nYBottom) - return; // unsichtbar + return; // unsichtbar if (nX2 > nXRight) nX2 = nXRight; if (nY2 > nYBottom) nY2 = nYBottom; - MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // erst nach den return's !!! + MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // erst nach den return's !!! double nPPTX = pViewData->GetPPTX(); double nPPTY = pViewData->GetPPTY(); @@ -1462,16 +1462,16 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bWasHidden = FALSE; for (SCROW nY=nY1; nY<=nY2; nY++) { - BOOL bFirstRow = ( nY == nPosY ); // first visible row? - BOOL bDoHidden = FALSE; // versteckte nachholen ? + BOOL bFirstRow = ( nY == nPosY ); // first visible row? + BOOL bDoHidden = FALSE; // versteckte nachholen ? USHORT nHeightTwips = pDoc->GetRowHeight( nY,nTab ); BOOL bDoRow = ( nHeightTwips != 0 ); if (bDoRow) { if (bTestMerge) - if (bWasHidden) // auf versteckte zusammengefasste testen + if (bWasHidden) // auf versteckte zusammengefasste testen { -// --nY; // nY geaendert -> vorherige zeichnen +// --nY; // nY geaendert -> vorherige zeichnen bDoHidden = TRUE; bDoRow = TRUE; } @@ -1483,13 +1483,13 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, bWasHidden = TRUE; if (bTestMerge) if (nY==nY2) - bDoRow = TRUE; // letzte Zeile aus Block + bDoRow = TRUE; // letzte Zeile aus Block } if ( bDoRow ) { SCCOL nLoopEndX = nX2; - if (nX2 < nX1) // Rest von zusammengefasst + if (nX2 < nX1) // Rest von zusammengefasst { SCCOL nStartX = nX1; while ( ((const ScMergeFlagAttr*)pDoc-> @@ -1559,7 +1559,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } } } - else // !bTestMerge + else // !bTestMerge { if ( rMark.IsCellMarked( nX, nY, TRUE ) == bRepeat && nEndX * nLayoutSign >= nScrX * nLayoutSign && nEndY >= nScrY ) @@ -1575,7 +1575,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } } - aInvert.Flush(); // before restoring MapMode + aInvert.Flush(); // before restoring MapMode SetMapMode(aOld); @@ -1618,7 +1618,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) SCCOL nPosX = pViewData->GetPosX( eHWhich ); SCROW nPosY = pViewData->GetPosY( eVWhich ); if (nTestX2 < nPosX || nTestY2 < nPosY) - return; // unsichtbar + return; // unsichtbar SCCOL nRealX1 = nX1; if (nX1 < nPosX) nX1 = nPosX; @@ -1631,7 +1631,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) if (nYBottom > MAXROW) nYBottom = MAXROW; if (nX1 > nXRight || nY1 > nYBottom) - return; // unsichtbar + return; // unsichtbar if (nX2 > nXRight) nX2 = nXRight; if (nY2 > nYBottom) nY2 = nYBottom; @@ -1645,14 +1645,14 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) BOOL bWasHidden = FALSE; for (SCROW nY=nY1; nY<=nY2; nY++) { - BOOL bFirstRow = ( nY == nPosY ); // first visible row? - BOOL bDoHidden = FALSE; // versteckte nachholen ? + BOOL bFirstRow = ( nY == nPosY ); // first visible row? + BOOL bDoHidden = FALSE; // versteckte nachholen ? USHORT nHeightTwips = pDoc->GetRowHeight( nY,nTab ); BOOL bDoRow = ( nHeightTwips != 0 ); if (bDoRow) { if (bTestMerge) - if (bWasHidden) // auf versteckte zusammengefasste testen + if (bWasHidden) // auf versteckte zusammengefasste testen { bDoHidden = TRUE; bDoRow = TRUE; @@ -1665,13 +1665,13 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) bWasHidden = TRUE; if (bTestMerge) if (nY==nY2) - bDoRow = TRUE; // letzte Zeile aus Block + bDoRow = TRUE; // letzte Zeile aus Block } if ( bDoRow ) { SCCOL nLoopEndX = nX2; - if (nX2 < nX1) // Rest von zusammengefasst + if (nX2 < nX1) // Rest von zusammengefasst { SCCOL nStartX = nX1; while ( ((const ScMergeFlagAttr*)pDoc-> @@ -1741,7 +1741,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) } } } - else // !bTestMerge + else // !bTestMerge { if ( aMultiMark.IsCellMarked( nX, nY, TRUE ) == bRepeat && nEndX * nLayoutSign >= nScrX * nLayoutSign && nEndY >= nScrY ) @@ -1757,7 +1757,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) } } -// aInvert.Flush(); // before restoring MapMode +// aInvert.Flush(); // before restoring MapMode } // ------------------------------------------------------------------------- @@ -1769,122 +1769,122 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) void ScGridWindow::DrawCursor() { // #114409# -// SCTAB nTab = pViewData->GetTabNo(); -// SCCOL nX = pViewData->GetCurX(); -// SCROW nY = pViewData->GetCurY(); +// SCTAB nTab = pViewData->GetTabNo(); +// SCCOL nX = pViewData->GetCurX(); +// SCROW nY = pViewData->GetCurY(); // -// // in verdeckten Zellen nicht zeichnen +// // in verdeckten Zellen nicht zeichnen // -// ScDocument* pDoc = pViewData->GetDocument(); -// const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab); -// const ScMergeFlagAttr& rMerge = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG); -// if (rMerge.IsOverlapped()) -// return; +// ScDocument* pDoc = pViewData->GetDocument(); +// const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab); +// const ScMergeFlagAttr& rMerge = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG); +// if (rMerge.IsOverlapped()) +// return; // -// // links/oben ausserhalb des Bildschirms ? +// // links/oben ausserhalb des Bildschirms ? // -// BOOL bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) ); -// if (!bVis) -// { -// SCCOL nEndX = nX; -// SCROW nEndY = nY; -// ScDocument* pDoc = pViewData->GetDocument(); -// const ScMergeAttr& rMerge = (const ScMergeAttr&) pPattern->GetItem(ATTR_MERGE); -// if (rMerge.GetColMerge() > 1) -// nEndX += rMerge.GetColMerge()-1; -// if (rMerge.GetRowMerge() > 1) -// nEndY += rMerge.GetRowMerge()-1; -// bVis = ( nEndX>=pViewData->GetPosX(eHWhich) && nEndY>=pViewData->GetPosY(eVWhich) ); -// } +// BOOL bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) ); +// if (!bVis) +// { +// SCCOL nEndX = nX; +// SCROW nEndY = nY; +// ScDocument* pDoc = pViewData->GetDocument(); +// const ScMergeAttr& rMerge = (const ScMergeAttr&) pPattern->GetItem(ATTR_MERGE); +// if (rMerge.GetColMerge() > 1) +// nEndX += rMerge.GetColMerge()-1; +// if (rMerge.GetRowMerge() > 1) +// nEndY += rMerge.GetRowMerge()-1; +// bVis = ( nEndX>=pViewData->GetPosX(eHWhich) && nEndY>=pViewData->GetPosY(eVWhich) ); +// } // -// if ( bVis ) -// { -// // hier kein Update, da aus Paint gerufen und laut Zaehler Cursor schon da -// // wenn Update noetig, dann bei Hide/Showcursor vor dem Hoch-/Runterzaehlen +// if ( bVis ) +// { +// // hier kein Update, da aus Paint gerufen und laut Zaehler Cursor schon da +// // wenn Update noetig, dann bei Hide/Showcursor vor dem Hoch-/Runterzaehlen // -// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); +// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // -// Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); -// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); +// Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); +// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); // -// // completely right of/below the screen? -// // (test with logical start position in aScrPos) -// BOOL bMaybeVisible; -// if ( bLayoutRTL ) -// bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 ); -// else -// { -// Size aOutSize = GetOutputSizePixel(); -// bMaybeVisible = ( aScrPos.X() <= aOutSize.Width() + 2 && aScrPos.Y() <= aOutSize.Height() + 2 ); -// } -// if ( bMaybeVisible ) -// { -// long nSizeXPix; -// long nSizeYPix; -// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); +// // completely right of/below the screen? +// // (test with logical start position in aScrPos) +// BOOL bMaybeVisible; +// if ( bLayoutRTL ) +// bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 ); +// else +// { +// Size aOutSize = GetOutputSizePixel(); +// bMaybeVisible = ( aScrPos.X() <= aOutSize.Width() + 2 && aScrPos.Y() <= aOutSize.Height() + 2 ); +// } +// if ( bMaybeVisible ) +// { +// long nSizeXPix; +// long nSizeYPix; +// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); // -// if ( bLayoutRTL ) -// aScrPos.X() -= nSizeXPix - 2; // move instead of mirroring +// if ( bLayoutRTL ) +// aScrPos.X() -= nSizeXPix - 2; // move instead of mirroring // -// BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX || -// pViewData->GetVSplitMode() == SC_SPLIT_FIX ); -// if ( pViewData->GetActivePart()==eWhich || bFix ) -// { -// // old UNX version with two Invert calls causes flicker. -// // if optimization is needed, a new flag should be added -// // to InvertTracking +// BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX || +// pViewData->GetVSplitMode() == SC_SPLIT_FIX ); +// if ( pViewData->GetActivePart()==eWhich || bFix ) +// { +// // old UNX version with two Invert calls causes flicker. +// // if optimization is needed, a new flag should be added +// // to InvertTracking // -// aScrPos.X() -= 2; -// aScrPos.Y() -= 2; -// Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) ); +// aScrPos.X() -= 2; +// aScrPos.Y() -= 2; +// Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) ); // -// Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() )); -// Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() )); -// Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 )); -// Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() )); -// } -// else -// { -// Rectangle aRect( aScrPos, Size( nSizeXPix - 1, nSizeYPix - 1 ) ); -// Invert( aRect ); -// } -// } +// Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() )); +// Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() )); +// Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 )); +// Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() )); +// } +// else +// { +// Rectangle aRect( aScrPos, Size( nSizeXPix - 1, nSizeYPix - 1 ) ); +// Invert( aRect ); +// } +// } // -// SetMapMode(aOld); -// } +// SetMapMode(aOld); +// } } - // AutoFill-Anfasser: + // AutoFill-Anfasser: void ScGridWindow::DrawAutoFillMark() { // #114409# -// if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() ) -// { -// SCCOL nX = aAutoMarkPos.Col(); -// SCROW nY = aAutoMarkPos.Row(); -// SCTAB nTab = pViewData->GetTabNo(); -// ScDocument* pDoc = pViewData->GetDocument(); -// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); +// if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() ) +// { +// SCCOL nX = aAutoMarkPos.Col(); +// SCROW nY = aAutoMarkPos.Row(); +// SCTAB nTab = pViewData->GetTabNo(); +// ScDocument* pDoc = pViewData->GetDocument(); +// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); // -// Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); -// long nSizeXPix; -// long nSizeYPix; -// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); -// if ( bLayoutRTL ) -// aFillPos.X() -= nSizeXPix + 3; -// else -// aFillPos.X() += nSizeXPix - 2; +// Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); +// long nSizeXPix; +// long nSizeYPix; +// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); +// if ( bLayoutRTL ) +// aFillPos.X() -= nSizeXPix + 3; +// else +// aFillPos.X() += nSizeXPix - 2; // -// aFillPos.Y() += nSizeYPix; -// aFillPos.Y() -= 2; -// Rectangle aFillRect( aFillPos, Size(6,6) ); -// // Anfasser von Zeichenobjekten sind 7*7 +// aFillPos.Y() += nSizeYPix; +// aFillPos.Y() -= 2; +// Rectangle aFillRect( aFillPos, Size(6,6) ); +// // Anfasser von Zeichenobjekten sind 7*7 // -// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); -// Invert( aFillRect ); -// SetMapMode(aOld); -// } +// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); +// Invert( aFillRect ); +// SetMapMode(aOld); +// } } // ------------------------------------------------------------------------- @@ -1906,20 +1906,20 @@ void ScGridWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - if ( eWhich == pViewData->GetActivePart() ) // only once for the view + if ( eWhich == pViewData->GetActivePart() ) // only once for the view { ScTabView* pView = pViewData->GetView(); - // update scale in case the UI ScreenZoom has changed + // update scale in case the UI ScreenZoom has changed ScGlobal::UpdatePPT(this); pView->RecalcPPT(); - // RepeatResize in case scroll bar sizes have changed + // RepeatResize in case scroll bar sizes have changed pView->RepeatResize(); pView->UpdateAllOverlays(); - // invalidate cell attribs in input handler, in case the - // EditEngine BackgroundColor has to be changed + // invalidate cell attribs in input handler, in case the + // EditEngine BackgroundColor has to be changed if ( pViewData->IsActive() ) { ScInputHandler* pHdl = SC_MOD()->GetInputHdl(); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 1e4c09fd8c6b..c3dcba8d8dd5 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.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 @@ ScHideTextCursor::~ScHideTextCursor() Window* pWin = pViewData->GetView()->GetWindowByPos( eWhich ); if (pWin) { - // restore text cursor + // restore text cursor if ( pViewData->HasEditView(eWhich) && pWin->HasFocus() ) pViewData->GetEditView(eWhich)->ShowCursor( FALSE, TRUE ); } @@ -97,13 +97,13 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) BOOL bDone = FALSE; ScDocument* pDoc = pViewData->GetDocument(); - SCTAB nTab = pViewData->GetTabNo(); - ScAddress aCellPos( nPosX, nPosY, nTab ); + SCTAB nTab = pViewData->GetTabNo(); + ScAddress aCellPos( nPosX, nPosY, nTab ); String aTrackText; BOOL bLeftEdge = FALSE; - // Change-Tracking + // Change-Tracking ScChangeTrack* pTrack = pDoc->GetChangeTrack(); ScChangeViewSettings* pSettings = pDoc->GetChangeViewSettings(); @@ -132,7 +132,7 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) if ( aRange.In( aCellPos ) ) { - pFound = pAction; // der letzte gewinnt + pFound = pAction; // der letzte gewinnt switch ( eType ) { case SC_CAT_CONTENT : @@ -167,13 +167,13 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) if ( pFound ) { if ( pFoundContent && pFound->GetType() != SC_CAT_CONTENT ) - pFound = pFoundContent; // Content gewinnt + pFound = pFoundContent; // Content gewinnt if ( pFoundMove && pFound->GetType() != SC_CAT_MOVE && pFoundMove->GetActionNumber() > pFound->GetActionNumber() ) - pFound = pFoundMove; // Move gewinnt + pFound = pFoundMove; // Move gewinnt - // bei geloeschten Spalten: Pfeil auf die linke Seite der Zelle + // bei geloeschten Spalten: Pfeil auf die linke Seite der Zelle if ( pFound->GetType() == SC_CAT_DELETE_COLS ) bLeftEdge = TRUE; @@ -198,27 +198,27 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) } } - // Notiz nur, wenn sie nicht schon auf dem Drawing-Layer angezeigt wird: + // Notiz nur, wenn sie nicht schon auf dem Drawing-Layer angezeigt wird: const ScPostIt* pNote = pDoc->GetNote( aCellPos ); if ( (aTrackText.Len() > 0) || (pNote && !pNote->IsCaptionShown()) ) { BOOL bNew = TRUE; BOOL bFast = FALSE; - if ( pNoteMarker ) // schon eine Notiz angezeigt + if ( pNoteMarker ) // schon eine Notiz angezeigt { - if ( pNoteMarker->GetDocPos() == aCellPos ) // dieselbe - bNew = FALSE; // dann stehenlassen + if ( pNoteMarker->GetDocPos() == aCellPos ) // dieselbe + bNew = FALSE; // dann stehenlassen else - bFast = TRUE; // sonst sofort + bFast = TRUE; // sonst sofort - // marker which was shown for ctrl-F1 isn't removed by mouse events + // marker which was shown for ctrl-F1 isn't removed by mouse events if ( pNoteMarker->IsByKeyboard() && !bKeyboard ) bNew = FALSE; } if ( bNew ) { if ( bKeyboard ) - bFast = TRUE; // keyboard also shows the marker immediately + bFast = TRUE; // keyboard also shows the marker immediately delete pNoteMarker; @@ -247,7 +247,7 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) aMapMode, bLeftEdge, bFast, bKeyboard ); } - bDone = TRUE; // something is shown (old or new) + bDone = TRUE; // something is shown (old or new) } return bDone; @@ -265,18 +265,18 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) if (pDrView) bDrawTextEdit = pDrView->IsTextEdit(); - // notes or change tracking + // notes or change tracking if ( bHelpEnabled && !bDrawTextEdit ) { - Point aPosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() ); + Point aPosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() ); SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPosPixel.X(), aPosPixel.Y(), eWhich, nPosX, nPosY ); if ( ShowNoteMarker( nPosX, nPosY, FALSE ) ) { - Window::RequestHelp( rHEvt ); // alte Tip/Balloon ausschalten + Window::RequestHelp( rHEvt ); // alte Tip/Balloon ausschalten bDone = TRUE; } } @@ -285,21 +285,21 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) { if ( pNoteMarker->IsByKeyboard() ) { - // marker which was shown for ctrl-F1 isn't removed by mouse events + // marker which was shown for ctrl-F1 isn't removed by mouse events } else DELETEZ(pNoteMarker); } - // Image-Map / Text-URL + // Image-Map / Text-URL - if ( bHelpEnabled && !bDone && !nButtonDown ) // nur ohne gedrueckten Button + if ( bHelpEnabled && !bDone && !nButtonDown ) // nur ohne gedrueckten Button { String aHelpText; Rectangle aPixRect; Point aPosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() ); - if ( pDrView ) // URL / Image-Map + if ( pDrView ) // URL / Image-Map { SdrViewEvent aVEvt; MouseEvent aMEvt( aPosPixel, 1, 0, MOUSE_LEFT ); @@ -316,7 +316,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) if ( pIMapObj ) { - // #44990# Bei ImageMaps die Description anzeigen, wenn vorhanden + // #44990# Bei ImageMaps die Description anzeigen, wenn vorhanden aHelpText = pIMapObj->GetAltText(); if (!aHelpText.Len()) aHelpText = pIMapObj->GetURL(); @@ -356,7 +356,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) } } - if ( !aHelpText.Len() ) // Text-URL + if ( !aHelpText.Len() ) // Text-URL { String aUrl; if ( GetEditUrl( aPosPixel, NULL, &aUrl, NULL ) ) @@ -367,11 +367,11 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) ScDocument* pDoc = pViewData->GetDocument(); SCsCOL nPosX; SCsROW nPosY; - SCTAB nTab = pViewData->GetTabNo(); + SCTAB nTab = pViewData->GetTabNo(); pViewData->GetPosFromPixel( aPosPixel.X(), aPosPixel.Y(), eWhich, nPosX, nPosY ); const ScPatternAttr* pPattern = pDoc->GetPattern( nPosX, nPosY, nTab ); - ScHideTextCursor aHideCursor( pViewData, eWhich ); // MapMode is changed in GetEditArea + ScHideTextCursor aHideCursor( pViewData, eWhich ); // MapMode is changed in GetEditArea // bForceToTop = FALSE, use the cell's real position aPixRect = pViewData->GetEditArea( eWhich, nPosX, nPosY, this, pPattern, FALSE ); @@ -392,7 +392,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) } } - // Basic-Controls + // Basic-Controls if ( pDrView && bHelpEnabled && !bDone ) { @@ -402,7 +402,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) bDone = ((ScDrawPage*)pPV->GetPage())->RequestHelp( this, pDrView, rHEvt ); } - // Wenn QuickHelp fuer AutoFill angezeigt wird, nicht wieder wegnehmen lassen + // Wenn QuickHelp fuer AutoFill angezeigt wird, nicht wieder wegnehmen lassen if ( nMouseStatus == SC_GM_TABDOWN && pViewData->GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() ) diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 1e2d45e4c091..ec21c02ce383 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.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 @@ -42,42 +42,42 @@ #include "sc.hrc" #include "tabvwsh.hxx" #include "hdrcont.hxx" -#include "scmod.hxx" // Optionen -#include "inputopt.hxx" // Optionen +#include "scmod.hxx" // Optionen +#include "inputopt.hxx" // Optionen #include "gridmerg.hxx" #include "document.hxx" // ----------------------------------------------------------------------- -#define SC_DRAG_MIN 2 +#define SC_DRAG_MIN 2 -// passes in paint -// (selection left/right must be first because the continuous lines -// are partly overwritten later) +// passes in paint +// (selection left/right must be first because the continuous lines +// are partly overwritten later) -#define SC_HDRPAINT_SEL_RIGHT 0 -#define SC_HDRPAINT_SEL_LEFT 1 -#define SC_HDRPAINT_TOP 2 -#define SC_HDRPAINT_SEL_TOP 3 -#define SC_HDRPAINT_SEL_BOTTOM 4 -#define SC_HDRPAINT_BOTTOM 5 -#define SC_HDRPAINT_TEXT 6 -#define SC_HDRPAINT_COUNT 7 +#define SC_HDRPAINT_SEL_RIGHT 0 +#define SC_HDRPAINT_SEL_LEFT 1 +#define SC_HDRPAINT_TOP 2 +#define SC_HDRPAINT_SEL_TOP 3 +#define SC_HDRPAINT_SEL_BOTTOM 4 +#define SC_HDRPAINT_BOTTOM 5 +#define SC_HDRPAINT_TEXT 6 +#define SC_HDRPAINT_COUNT 7 //================================================================== ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, SCCOLROW nNewSize, USHORT nNewFlags ) : - Window ( pParent ), - pSelEngine ( pSelectionEngine ), - nFlags ( nNewFlags ), - bVertical ( (nNewFlags & HDR_VERTICAL) != 0 ), - nSize ( nNewSize ), - nMarkStart ( 0 ), - nMarkEnd ( 0 ), - bMarkRange ( FALSE ), - bDragging ( FALSE ), - bIgnoreMove ( FALSE ) + Window ( pParent ), + pSelEngine ( pSelectionEngine ), + nFlags ( nNewFlags ), + bVertical ( (nNewFlags & HDR_VERTICAL) != 0 ), + nSize ( nNewSize ), + nMarkStart ( 0 ), + nMarkEnd ( 0 ), + bMarkRange ( FALSE ), + bDragging ( FALSE ), + bIgnoreMove ( FALSE ) { // --- RTL --- no default mirroring for this window, the spreadsheet itself // is also not mirrored @@ -87,7 +87,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn EnableRTL( FALSE ); aNormFont = GetFont(); - aNormFont.SetTransparent( TRUE ); //! WEIGHT_NORMAL hart setzen ??? + aNormFont.SetTransparent( TRUE ); //! WEIGHT_NORMAL hart setzen ??? aBoldFont = aNormFont; aBoldFont.SetWeight( WEIGHT_BOLD ); @@ -97,7 +97,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn Size aSize = LogicToPixel( Size( GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888")) ), GetTextHeight() ) ); - aSize.Width() += 4; // Platz fuer hervorgehobene Umrandung + aSize.Width() += 4; // Platz fuer hervorgehobene Umrandung aSize.Height() += 3; SetSizePixel( aSize ); @@ -105,7 +105,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn nBigWidth = LogicToPixel( Size( GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888888")) ), 0 ) ).Width() + 5; - SetBackground(); // sonst Probleme auf OS/2 !?!?! + SetBackground(); // sonst Probleme auf OS/2 !?!?! } void ScHeaderControl::SetWidth( long nNew ) @@ -113,12 +113,12 @@ void ScHeaderControl::SetWidth( long nNew ) DBG_ASSERT( bVertical, "SetDigits nur fuer Zeilenkoepfe erlaubt" ); if ( nNew != nWidth ) { - Size aSize( nNew, GetSizePixel().Height() ); // Hoehe nicht aendern + Size aSize( nNew, GetSizePixel().Height() ); // Hoehe nicht aendern SetSizePixel( aSize ); nWidth = nNew; - Invalidate(); // neu zentrieren + Invalidate(); // neu zentrieren } } @@ -147,21 +147,21 @@ void ScHeaderControl::DoPaint( SCCOLROW nStart, SCCOLROW nEnd ) void ScHeaderControl::SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd ) { - BOOL bEnabled = SC_MOD()->GetInputOptions().GetMarkHeader(); //! cachen? + BOOL bEnabled = SC_MOD()->GetInputOptions().GetMarkHeader(); //! cachen? if (!bEnabled) bNewSet = FALSE; - // Variablen setzen + // Variablen setzen - BOOL bOldSet = bMarkRange; + BOOL bOldSet = bMarkRange; SCCOLROW nOldStart = nMarkStart; - SCCOLROW nOldEnd = nMarkEnd; + SCCOLROW nOldEnd = nMarkEnd; PutInOrder( nNewStart, nNewEnd ); bMarkRange = bNewSet; nMarkStart = nNewStart; nMarkEnd = nNewEnd; - // Paint + // Paint if ( bNewSet ) { @@ -177,20 +177,20 @@ void ScHeaderControl::SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEn DoPaint( Min( nNewStart, nOldStart ), Max( nNewStart, nOldStart ) - 1 ); else if ( nNewStart > nOldEnd || nNewEnd < nOldStart ) { - // zwei Bereiche... + // zwei Bereiche... DoPaint( nOldStart, nOldEnd ); DoPaint( nNewStart, nNewEnd ); } - else // irgendwie ueberlappend... (kommt eh nicht oft vor) + else // irgendwie ueberlappend... (kommt eh nicht oft vor) DoPaint( Min( nNewStart, nOldStart ), Max( nNewEnd, nOldEnd ) ); } else - DoPaint( nNewStart, nNewEnd ); // komplett neu + DoPaint( nNewStart, nNewEnd ); // komplett neu } else if ( bOldSet ) - DoPaint( nOldStart, nOldEnd ); // komplett aufheben + DoPaint( nOldStart, nOldEnd ); // komplett aufheben - // sonst war nix, is nix + // sonst war nix, is nix } long ScHeaderControl::GetScrPos( SCCOLROW nEntryNo ) @@ -261,13 +261,13 @@ void ScHeaderControl::DrawShadedRect( long nStart, long nEnd, const Color& rBase } // -// Paint +// Paint // void ScHeaderControl::Paint( const Rectangle& rRect ) { - // fuer VCL ist es wichtig, wenig Aufrufe zu haben, darum werden die aeusseren - // Linien zusammengefasst + // fuer VCL ist es wichtig, wenig Aufrufe zu haben, darum werden die aeusseren + // Linien zusammengefasst const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); BOOL bHighContrast = rStyleSettings.GetHighContrastMode(); @@ -291,19 +291,19 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) long nLayoutSign = bLayoutRTL ? -1 : 1; BOOL bMirrored = IsMirrored(); -// const FunctionSet* pFuncSet = pSelEngine->GetFunctionSet(); - String aString; - USHORT nBarSize; - Point aScrPos; - Size aTextSize; -// Size aSize = GetOutputSizePixel(); +// const FunctionSet* pFuncSet = pSelEngine->GetFunctionSet(); + String aString; + USHORT nBarSize; + Point aScrPos; + Size aTextSize; +// Size aSize = GetOutputSizePixel(); if (bVertical) nBarSize = (USHORT) GetSizePixel().Width(); else nBarSize = (USHORT) GetSizePixel().Height(); - SCCOLROW nPos = GetPos(); + SCCOLROW nPos = GetPos(); long nPStart = bVertical ? rRect.Top() : rRect.Left(); long nPEnd = bVertical ? rRect.Bottom() : rRect.Right(); @@ -314,22 +314,22 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) long nInitScrPos = 0; if ( bLayoutRTL ) { - long nTemp = nPStart; // swap nPStart / nPEnd + long nTemp = nPStart; // swap nPStart / nPEnd nPStart = nPEnd; nPEnd = nTemp; - nTemp = nTransStart; // swap nTransStart / nTransEnd + nTemp = nTransStart; // swap nTransStart / nTransEnd nTransStart = nTransEnd; nTransEnd = nTemp; - if ( bVertical ) // start loops from the end + if ( bVertical ) // start loops from the end nInitScrPos = GetSizePixel().Height() - 1; else nInitScrPos = GetSizePixel().Width() - 1; } - // aeussere Linien komplett durchzeichnen - // Zuerst Ende der letzten Zelle finden + // aeussere Linien komplett durchzeichnen + // Zuerst Ende der letzten Zelle finden -// long nLineEnd = -1; +// long nLineEnd = -1; long nLineEnd = nInitScrPos - nLayoutSign; for (SCCOLROW i=nPos; i<nSize; i++) @@ -362,7 +362,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } } - // background is different for entry area and behind the entries + // background is different for entry area and behind the entries Rectangle aFillRect; SetLineColor(); @@ -404,7 +404,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) { if ( bDark ) { - // solid grey background for dark face color is drawn before lines + // solid grey background for dark face color is drawn before lines SetLineColor(); SetFillColor( COL_LIGHTGRAY ); @@ -446,19 +446,19 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } // - // loop through entries several times to avoid changing the line color too often - // and to allow merging of lines + // loop through entries several times to avoid changing the line color too often + // and to allow merging of lines // ScGridMerger aGrid( this, 1, 1 ); - // start at SC_HDRPAINT_BOTTOM instead of 0 - selection doesn't get different - // borders, light border at top isn't used anymore + // start at SC_HDRPAINT_BOTTOM instead of 0 - selection doesn't get different + // borders, light border at top isn't used anymore // use SC_HDRPAINT_SEL_BOTTOM for different color for (USHORT nPass = SC_HDRPAINT_SEL_BOTTOM; nPass < SC_HDRPAINT_COUNT; nPass++) { - // set line color etc. before entry loop + // set line color etc. before entry loop switch ( nPass ) { case SC_HDRPAINT_SEL_BOTTOM: @@ -472,13 +472,13 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) // DrawSelectionBackground is used only for high contrast on light background if ( nTransEnd * nLayoutSign >= nTransStart * nLayoutSign && bHighContrast && !bDark ) { - // Transparent selection background is drawn after lines, before text. - // #109814# Use DrawSelectionBackground to make sure there is a visible - // difference. The case of a dark face color, where DrawSelectionBackground - // would just paint over the lines, is handled separately (bDark). - // Otherwise, GetHighlightColor is used with 80% transparency. - // The window's background color (SetBackground) has to be the background - // of the cell area, for the contrast comparison in DrawSelectionBackground. + // Transparent selection background is drawn after lines, before text. + // #109814# Use DrawSelectionBackground to make sure there is a visible + // difference. The case of a dark face color, where DrawSelectionBackground + // would just paint over the lines, is handled separately (bDark). + // Otherwise, GetHighlightColor is used with 80% transparency. + // The window's background color (SetBackground) has to be the background + // of the cell area, for the contrast comparison in DrawSelectionBackground. Rectangle aTransRect; if (bVertical) @@ -492,8 +492,8 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) break; } - SCCOLROW nCount=0; - long nScrPos=nInitScrPos; + SCCOLROW nCount=0; + long nScrPos=nInitScrPos; do { if (bVertical) @@ -501,9 +501,9 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) else aScrPos = Point( nScrPos, 0 ); - SCCOLROW nEntryNo = nCount + nPos; - if ( nEntryNo >= nSize ) // MAXCOL/MAXROW - nScrPos = nPEnd + nLayoutSign; // beyond nPEnd -> stop + SCCOLROW nEntryNo = nCount + nPos; + if ( nEntryNo >= nSize ) // MAXCOL/MAXROW + nScrPos = nPEnd + nLayoutSign; // beyond nPEnd -> stop else { USHORT nSizePix = GetEntrySize( nEntryNo ); @@ -552,7 +552,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) break; case SC_HDRPAINT_TEXT: - if ( nSizePix > 1 ) // minimal check for small columns/rows + if ( nSizePix > 1 ) // minimal check for small columns/rows { if ( bMark != bBoldSet ) { @@ -572,7 +572,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) aTxtPos.X() += (nBarSize-aTextSize.Width())/2; aTxtPos.Y() += (nSizePix*nLayoutSign-aTextSize.Height())/2; if ( bMirrored ) - aTxtPos.X() += 1; // dark border is left instead of right + aTxtPos.X() += 1; // dark border is left instead of right } else { @@ -584,10 +584,10 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) break; } - // bei Selektion der ganzen Zeile/Spalte: - // InvertRect( Rectangle( aScrPos, aEndPos ) ); + // bei Selektion der ganzen Zeile/Spalte: + // InvertRect( Rectangle( aScrPos, aEndPos ) ); } - nScrPos += nSizePix * nLayoutSign; // also if before the visible area + nScrPos += nSizePix * nLayoutSign; // also if before the visible area } ++nCount; } @@ -598,20 +598,20 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } // -// Maus - Handling +// Maus - Handling // SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder ) { - BOOL bFound=FALSE; - SCCOLROW nCount = 1; - SCCOLROW nPos = GetPos(); - SCCOLROW nHitNo = nPos; - long nScrPos; - long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X(); - long nDif; - Size aSize = GetOutputSizePixel(); - long nWinSize = bVertical ? aSize.Height() : aSize.Width(); + BOOL bFound=FALSE; + SCCOLROW nCount = 1; + SCCOLROW nPos = GetPos(); + SCCOLROW nHitNo = nPos; + long nScrPos; + long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X(); + long nDif; + Size aSize = GetOutputSizePixel(); + long nWinSize = bVertical ? aSize.Height() : aSize.Width(); BOOL bLayoutRTL = IsLayoutRTL(); long nLayoutSign = bLayoutRTL ? -1 : 1; @@ -622,12 +622,12 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder ) { SCCOLROW nEntryNo = nCount + nPos; -// nScrPos = GetScrPos( nEntryNo ) - 1; +// nScrPos = GetScrPos( nEntryNo ) - 1; if (nEntryNo > nSize) nScrPos = nEndPos + nLayoutSign; else - nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //! GetHiddenCount() ?? + nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //! GetHiddenCount() ?? nDif = nMousePos - nScrPos; if (nDif >= -2 && nDif <= 2 && nCount > 0) @@ -661,13 +661,13 @@ bool ScHeaderControl::IsSelectionAllowed(SCCOLROW nPos) const // This sheet is protected. Check if a context menu is allowed on this cell. bool bCellsProtected = false; if (bVertical) - { + { // row header SCROW nRPos = static_cast<SCROW>(nPos); bCellsProtected = pDoc->HasAttrib(0, nRPos, nTab, MAXCOL, nRPos, nTab, HASATTR_PROTECTED); } else - { + { // column header SCCOL nCPos = static_cast<SCCOL>(nPos); bCellsProtected = pDoc->HasAttrib(nCPos, 0, nTab, nCPos, MAXROW, nTab, HASATTR_PROTECTED); @@ -733,18 +733,18 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt ) aVis.Top() = LONG_MIN, aVis.Bottom() = LONG_MAX; pSelEngine->SetVisibleArea( aVis ); - SetMarking( TRUE ); // muss vor SelMouseButtonDown sein + SetMarking( TRUE ); // muss vor SelMouseButtonDown sein pSelEngine->SelMouseButtonDown( rMEvt ); - // #74215# In column/row headers a simple click already is a selection. - // -> Call SelMouseMove to ensure CreateAnchor is called (and DestroyAnchor - // if the next click is somewhere else with Control key). + // #74215# In column/row headers a simple click already is a selection. + // -> Call SelMouseMove to ensure CreateAnchor is called (and DestroyAnchor + // if the next click is somewhere else with Control key). pSelEngine->SelMouseMove( rMEvt ); if (IsMouseCaptured()) { - // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann - //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! + // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann + //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! ReleaseMouse(); StartTracking(); } @@ -765,10 +765,10 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt ) { DrawInvert( nDragPos ); ReleaseMouse(); - bDragging = FALSE; + bDragging = FALSE; - long nScrPos = GetScrPos( nDragNo ); - long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X(); + long nScrPos = GetScrPos( nDragNo ); + long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X(); BOOL bLayoutRTL = IsLayoutRTL(); long nNewWidth = bLayoutRTL ? ( nScrPos - nMousePos + 1 ) : ( nMousePos + 2 - nScrPos ); @@ -783,7 +783,7 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt ) if (nDragNo>0) { --nDragNo; - nNewWidth += GetEntrySize( nDragNo ); //! GetHiddenCount() ??? + nNewWidth += GetEntrySize( nDragNo ); //! GetHiddenCount() ??? } else nNewWidth = 0; @@ -843,8 +843,8 @@ void ScHeaderControl::MouseMove( const MouseEvent& rMEvt ) void ScHeaderControl::Tracking( const TrackingEvent& rTEvt ) { - // Weil die SelectionEngine kein Tracking kennt, die Events nur auf - // die verschiedenen MouseHandler verteilen... + // Weil die SelectionEngine kein Tracking kennt, die Events nur auf + // die verschiedenen MouseHandler verteilen... if ( rTEvt.IsTrackingCanceled() ) StopMarking(); @@ -859,9 +859,9 @@ void ScHeaderControl::Command( const CommandEvent& rCEvt ) USHORT nCmd = rCEvt.GetCommand(); if ( nCmd == COMMAND_CONTEXTMENU ) { - StopMarking(); // Selektion / Dragging beenden + StopMarking(); // Selektion / Dragging beenden - // Popup ausfuehren + // Popup ausfuehren ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); @@ -927,8 +927,8 @@ void ScHeaderControl::StopMarking() SetMarking( FALSE ); bIgnoreMove = TRUE; - // #86260# don't call pSelEngine->Reset, so selection across the parts of - // a split/frozen view is possible + // #86260# don't call pSelEngine->Reset, so selection across the parts of + // a split/frozen view is possible ReleaseMouse(); } @@ -937,7 +937,7 @@ void ScHeaderControl::ShowDragHelp() { if (Help::IsQuickHelpEnabled()) { - long nScrPos = GetScrPos( nDragNo ); + long nScrPos = GetScrPos( nDragNo ); BOOL bLayoutRTL = IsLayoutRTL(); long nVal = bLayoutRTL ? ( nScrPos - nDragPos + 1 ) : ( nDragPos + 2 - nScrPos ); @@ -952,21 +952,21 @@ void ScHeaderControl::ShowDragHelp() USHORT nAlign; if (!bVertical) { - // oberhalb + // oberhalb aRect.Left() = aMousePos.X(); - aRect.Top() = aPos.Y() - 4; - nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; + aRect.Top() = aPos.Y() - 4; + nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; } else { - // rechts oben + // rechts oben aRect.Left() = aPos.X() + aSize.Width() + 8; - aRect.Top() = aMousePos.Y() - 2; - nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM; + aRect.Top() = aMousePos.Y() - 2; + nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM; } - aRect.Right() = aRect.Left(); - aRect.Bottom() = aRect.Top(); + aRect.Right() = aRect.Left(); + aRect.Bottom() = aRect.Top(); Help::ShowQuickHelp(this, aRect, aHelpStr, nAlign); } @@ -974,8 +974,8 @@ void ScHeaderControl::ShowDragHelp() void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt ) { - // Wenn eigene QuickHelp angezeigt wird, nicht durch RequestHelp - // wieder wegnehmen lassen + // Wenn eigene QuickHelp angezeigt wird, nicht durch RequestHelp + // wieder wegnehmen lassen BOOL bOwn = bDragging && Help::IsQuickHelpEnabled(); if (!bOwn) @@ -983,7 +983,7 @@ void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt ) } // ----------------------------------------------------------------------- -// Dummys fuer virtuelle Methoden +// Dummys fuer virtuelle Methoden // ----------------------------------------------------------------------- SCCOLROW ScHeaderControl::GetHiddenCount( SCCOLROW nEntryNo ) diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index 301ba616e769..de7dc79e0fa8 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.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,9 +38,9 @@ #include "hintwin.hxx" #include "global.hxx" -#define HINT_LINESPACE 2 -#define HINT_INDENT 3 -#define HINT_MARGIN 4 +#define HINT_LINESPACE 2 +#define HINT_INDENT 3 +#define HINT_MARGIN 4 //================================================================== @@ -51,8 +51,8 @@ ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& r { aMessage.ConvertLineEnd( LINEEND_CR ); - // Hellgelb, wie Notizen in detfunc.cxx - Color aYellow( 255,255,192 ); // hellgelb + // Hellgelb, wie Notizen in detfunc.cxx + Color aYellow( 255,255,192 ); // hellgelb SetBackground( aYellow ); aTextFont = GetFont(); diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx index 88e78ccf1ee6..23e338d30e29 100644 --- a/sc/source/ui/view/imapwrap.cxx +++ b/sc/source/ui/view/imapwrap.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 @@ USHORT ScIMapChildWindowId() SvxIMapDlg* ScGetIMapDlg() { - //! pass view frame here and in SVXIMAPDLG() + //! pass view frame here and in SVXIMAPDLG() SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if( pViewFrm && pViewFrm->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) @@ -67,7 +67,7 @@ const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg ) return NULL; } -const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ) +const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ) { return pDlg->GetImageMap(); } diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index cb913677e962..f7722a33870c 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.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 @@ -42,7 +42,7 @@ ScInvertMerger::ScInvertMerger( Window* pWindow ) : pWin( pWindow ), pRects( NULL ) { - // both rectangles empty + // both rectangles empty } ScInvertMerger::ScInvertMerger( ::std::vector< Rectangle >* pRectangles ) : @@ -111,7 +111,7 @@ void ScInvertMerger::Flush() void ScInvertMerger::FlushTotal() { if( aTotalRect.IsEmpty() ) - return; // nothing to do + return; // nothing to do if ( pWin ) pWin->Invert( aTotalRect, INVERT_HIGHLIGHT ); @@ -124,11 +124,11 @@ void ScInvertMerger::FlushTotal() void ScInvertMerger::FlushLine() { if( aLineRect.IsEmpty() ) - return; // nothing to do + return; // nothing to do if ( aTotalRect.IsEmpty() ) { - aTotalRect = aLineRect; // start new total rect + aTotalRect = aLineRect; // start new total rect } else { @@ -141,8 +141,8 @@ void ScInvertMerger::FlushLine() } else { - FlushTotal(); // draw old total rect - aTotalRect = aLineRect; // and start new one + FlushTotal(); // draw old total rect + aTotalRect = aLineRect; // and start new one } } @@ -174,7 +174,7 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) aLineRect.Right() = aJustified.Right(); bDone = TRUE; } - else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout + else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout { aLineRect.Left() = aJustified.Left(); bDone = TRUE; @@ -182,8 +182,8 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) } if (!bDone) { - FlushLine(); // use old line rect for total rect - aLineRect = aJustified; // and start new one + FlushLine(); // use old line rect for total rect + aLineRect = aJustified; // and start new one } } } diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 3ab921f8956e..626853396a01 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.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 @@ -42,8 +42,8 @@ #include "document.hxx" #include "postit.hxx" -#define SC_NOTEMARK_TIME 800 -#define SC_NOTEMARK_SHORT 70 +#define SC_NOTEMARK_TIME 800 +#define SC_NOTEMARK_SHORT 70 // ----------------------------------------------------------------------- @@ -99,8 +99,8 @@ IMPL_LINK( ScNoteMarker, TimeHdl, Timer*, EMPTYARG ) OutputDevice* pPrinter = pDoc->GetRefDevice(); if (pPrinter) { - // Am Outliner des Draw-Model ist auch der Drucker als RefDevice gesetzt, - // und es soll einheitlich aussehen. + // Am Outliner des Draw-Model ist auch der Drucker als RefDevice gesetzt, + // und es soll einheitlich aussehen. Outliner& rOutliner = pModel->GetDrawOutliner(); rOutliner.SetRefDevice(pPrinter); } diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 9fd8e497d3b7..c0baa7ae592c 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.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 @@ -184,8 +184,8 @@ const ScOutlineEntry* ScOutlineWindow::GetOutlineEntry( size_t nLevel, size_t nE bool ScOutlineWindow::IsHidden( SCCOLROW nColRowIndex ) const { - return mbHoriz ? - GetDoc().ColHidden(static_cast<SCCOL>(nColRowIndex), GetTab()) : + return mbHoriz ? + GetDoc().ColHidden(static_cast<SCCOL>(nColRowIndex), GetTab()) : GetDoc().RowHidden(static_cast<SCROW>(nColRowIndex), GetTab()); } diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index a5f63f5a15bd..fed6f094ada8 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.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 @@ -220,7 +220,7 @@ //#define _VCSBX_HXX //#define _VCBRW_HXX -//#define _SVDATTR_HXX <--- der wars +//#define _SVDATTR_HXX <--- der wars #define _SVDXOUT_HXX #define _SVDEC_HXX //#define _SVDIO_HXX @@ -264,17 +264,17 @@ void ActivateOlk( ScViewData* /* pViewData */ ) { // Browser fuer Virtual Controls fuellen - // VC's und den Browser dazu gibts nicht mehr... + // VC's und den Browser dazu gibts nicht mehr... - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden + // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } void DeActivateOlk( ScViewData* /* pViewData */ ) { // Browser fuer Virtual Controls fuellen - // VC's und den Browser dazu gibts nicht mehr... + // VC's und den Browser dazu gibts nicht mehr... - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden + // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index fceb71a335db..292f74f507dc 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.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,33 +73,33 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- -// Farben fuer ChangeTracking "nach Autor" wie im Writer (swmodul1.cxx) +// Farben fuer ChangeTracking "nach Autor" wie im Writer (swmodul1.cxx) -#define SC_AUTHORCOLORCOUNT 9 +#define SC_AUTHORCOLORCOUNT 9 static ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = { - COL_LIGHTRED, COL_LIGHTBLUE, COL_LIGHTMAGENTA, - COL_GREEN, COL_RED, COL_BLUE, - COL_BROWN, COL_MAGENTA, COL_CYAN }; + COL_LIGHTRED, COL_LIGHTBLUE, COL_LIGHTMAGENTA, + COL_GREEN, COL_RED, COL_BLUE, + COL_BROWN, COL_MAGENTA, COL_CYAN }; -// Hilfsklasse, fuer die Farbzuordnung, -// um nicht mehrfach hintereinander denselben User aus der Liste zu suchen +// Hilfsklasse, fuer die Farbzuordnung, +// um nicht mehrfach hintereinander denselben User aus der Liste zu suchen class ScActionColorChanger { private: - const ScAppOptions& rOpt; - const ScStrCollection& rUsers; - String aLastUserName; - USHORT nLastUserIndex; - ColorData nColor; + const ScAppOptions& rOpt; + const ScStrCollection& rUsers; + String aLastUserName; + USHORT nLastUserIndex; + ColorData nColor; public: ScActionColorChanger( const ScChangeTrack& rTrack ); ~ScActionColorChanger() {} - void Update( const ScChangeAction& rAction ); - ColorData GetColor() const { return nColor; } + void Update( const ScChangeAction& rAction ); + ColorData GetColor() const { return nColor; } }; //------------------------------------------------------------------ @@ -134,9 +134,9 @@ void ScActionColorChanger::Update( const ScChangeAction& rAction ) nSetColor = rOpt.GetTrackContentColor(); break; } - if ( nSetColor != COL_TRANSPARENT ) // Farbe eingestellt + if ( nSetColor != COL_TRANSPARENT ) // Farbe eingestellt nColor = nSetColor; - else // nach Autor + else // nach Autor { if ( rAction.GetUser() != aLastUserName ) { @@ -164,8 +164,8 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, double nPixelPerTwipsX, double nPixelPerTwipsY, const Fraction* pZoomX, const Fraction* pZoomY ) : pDev( pNewDev ), - pRefDevice( pNewDev ), // default is output device - pFmtDevice( pNewDev ), // default is output device + pRefDevice( pNewDev ), // default is output device + pFmtDevice( pNewDev ), // default is output device mrTabInfo( rTabInfo ), pRowInfo( rTabInfo.mpRowInfo ), nArrCount( rTabInfo.mnArrCount ), @@ -198,7 +198,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, bShowNullValues( TRUE ), bShowFormulas( FALSE ), bShowSpellErrors( FALSE ), - bMarkClipped( FALSE ), // FALSE fuer Drucker/Metafile etc. + bMarkClipped( FALSE ), // FALSE fuer Drucker/Metafile etc. bSnapPixel( FALSE ), bAnyRotated( FALSE ), bAnyClipped( FALSE ), @@ -331,10 +331,10 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) Color aManualColor; if (bPagebreakMode) - bPage = FALSE; // keine "normalen" Umbrueche ueber volle Breite/Hoehe + bPage = FALSE; // keine "normalen" Umbrueche ueber volle Breite/Hoehe - //! um den einen Pixel sieht das Metafile (oder die Druck-Ausgabe) anders aus - //! als die Bildschirmdarstellung, aber wenigstens passen Druck und Metafile zusammen + //! um den einen Pixel sieht das Metafile (oder die Druck-Ausgabe) anders aus + //! als die Bildschirmdarstellung, aber wenigstens passen Druck und Metafile zusammen Size aOnePixel = pDev->PixelToLogic(Size(1,1)); long nOneX = aOnePixel.Width(); @@ -361,7 +361,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) ScGridMerger aGrid( pDev, nOneX, nOneY ); // - // Vertikale Linien + // Vertikale Linien // nPosX = nScrX; @@ -379,7 +379,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) if ( bPage ) { - // Seitenumbrueche auch in ausgeblendeten suchen + // Seitenumbrueche auch in ausgeblendeten suchen SCCOL nCol = nXplus1; while (nCol <= MAXCOL) { @@ -400,10 +400,10 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) } } - BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt + BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt USHORT nWidthXplus2 = pRowInfo[0].pCellInfo[nXplus2].nWidth; - bSingle = bSingleGrid; //! in Fillinfo holen !!!!! + bSingle = bSingleGrid; //! in Fillinfo holen !!!!! if ( nX<MAXCOL && !bSingle ) { bSingle = ( nWidthXplus2 == 0 ); @@ -473,7 +473,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) } // - // Horizontale Linien + // Horizontale Linien // bool bHiddenRow = true; @@ -494,12 +494,12 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) { if (i > nHiddenEndRow) bHiddenRow = pDoc->RowHidden(i, nTab, nHiddenEndRow); - /* TODO: optimize the row break thing for large hidden - * segments where HasRowBreak() has to be called - * nevertheless for each row, as a row break is drawn also - * for hidden rows, above them. This needed to be done only - * once per hidden segment, maybe giving manual breaks - * priority. Something like GetNextRowBreak() and + /* TODO: optimize the row break thing for large hidden + * segments where HasRowBreak() has to be called + * nevertheless for each row, as a row break is drawn also + * for hidden rows, above them. This needed to be done only + * once per hidden segment, maybe giving manual breaks + * priority. Something like GetNextRowBreak() and * GetNextManualRowBreak(). */ nBreak = pDoc->HasRowBreak(i, nTab); if (!bHiddenRow || nBreak) @@ -515,10 +515,10 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) } } - BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt + BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt BOOL bNextYisNextRow = (pRowInfo[nArrYplus1].nRowNo == nYplus1); - bSingle = !bNextYisNextRow; // Hidden + bSingle = !bNextYisNextRow; // Hidden for (SCCOL i=nX1; i<=nX2 && !bSingle; i++) { if (pRowInfo[nArrYplus1].pCellInfo[i+1].bVOverlapped) @@ -539,7 +539,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) for (SCCOL i=nX1; i<=nX2; i++) { nNextX = nPosX + pRowInfo[0].pCellInfo[i+1].nWidth * nLayoutSign; - if (nNextX != nPosX) // sichtbar + if (nNextX != nPosX) // sichtbar { BOOL bVOver; if ( bNextYisNextRow ) @@ -549,7 +549,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) bVOver = ((ScMergeFlagAttr*)pDoc->GetAttr( i,nYplus1,nTab,ATTR_MERGE_FLAG)) ->IsVerOverlapped() - && ((ScMergeFlagAttr*)pDoc->GetAttr( + && ((ScMergeFlagAttr*)pDoc->GetAttr( i,nVisY,nTab,ATTR_MERGE_FLAG)) ->IsVerOverlapped(); //! nVisY aus Array ?? @@ -577,16 +577,16 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) } } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData ) { bPagebreakMode = TRUE; if (!pPageData) - return; // noch nicht initialisiert -> alles "nicht gedruckt" + return; // noch nicht initialisiert -> alles "nicht gedruckt" - // gedruckten Bereich markieren - // (in FillInfo ist schon alles auf FALSE initialisiert) + // gedruckten Bereich markieren + // (in FillInfo ist schon alles auf FALSE initialisiert) USHORT nRangeCount = sal::static_int_cast<USHORT>(pPageData->GetCount()); for (USHORT nPos=0; nPos<nRangeCount; nPos++) @@ -613,7 +613,7 @@ void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData ) void ScOutputData::FindRotated() { - //! nRotMax speichern + //! nRotMax speichern SCCOL nRotMax = nX2; for (SCSIZE nRotY=0; nRotY<nArrCount; nRotY++) if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax) @@ -640,7 +640,7 @@ void ScOutputData::FindRotated() pCondSet = pDoc->GetCondResult( nX, nY, nTab ); } - if ( pPattern ) // Spalte nicht ausgeblendet + if ( pPattern ) // Spalte nicht ausgeblendet { BYTE nDir = pPattern->GetRotateDir( pCondSet ); if (nDir != SC_ROTDIR_NONE) @@ -654,7 +654,7 @@ void ScOutputData::FindRotated() } } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- USHORT lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) { @@ -675,7 +675,7 @@ USHORT lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) nRet = SC_ROTDIR_CENTER; else if ( eRotMode == SVX_ROTATE_MODE_TOP || eRotMode == SVX_ROTATE_MODE_BOTTOM ) { - long nRot180 = nAttrRotate % 18000; // 1/100 Grad + long nRot180 = nAttrRotate % 18000; // 1/100 Grad if ( nRot180 == 9000 ) nRet = SC_ROTDIR_CENTER; else if ( ( eRotMode == SVX_ROTATE_MODE_TOP && nRot180 < 9000 ) || @@ -698,10 +698,10 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow USHORT nDir = lcl_GetRotateDir( pDoc, nCol, nRow, nTab ); - // CENTER wird wie RIGHT behandelt... + // CENTER wird wie RIGHT behandelt... if ( nDir == SC_ROTDIR_RIGHT || nDir == SC_ROTDIR_CENTER ) { - // Text geht nach rechts -> Hintergrund von links nehmen + // Text geht nach rechts -> Hintergrund von links nehmen while ( nCol > 0 && lcl_GetRotateDir( pDoc, nCol, nRow, nTab ) == nDir && pBackground->GetColor().GetTransparency() != 255 ) { @@ -713,7 +713,7 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow } else if ( nDir == SC_ROTDIR_LEFT ) { - // Text geht nach links -> Hintergrund von rechts nehmen + // Text geht nach links -> Hintergrund von rechts nehmen while ( nCol < MAXCOL && lcl_GetRotateDir( pDoc, nCol, nRow, nTab ) == nDir && pBackground->GetColor().GetTransparency() != 255 ) { @@ -727,7 +727,7 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow return pBackground; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- BOOL lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, SCCOL nX1, SCCOL nX2, BOOL bShowProt, BOOL bPagebreakMode ) @@ -784,7 +784,7 @@ void ScOutputData::DrawDocumentBackground() void ScOutputData::DrawBackground() { - FindRotated(); //! von aussen ? + FindRotated(); //! von aussen ? Rectangle aRect; Size aOnePixel = pDev->PixelToLogic(Size(1,1)); @@ -802,7 +802,7 @@ void ScOutputData::DrawBackground() BOOL bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab); BOOL bDoAll = bShowProt || bPagebreakMode || bSolidBackground; - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -816,7 +816,7 @@ void ScOutputData::DrawBackground() { if ( ( ( pThisRowInfo->bEmptyBack ) || bSyntaxMode ) && !bDoAll ) { - // nichts + // nichts } else { @@ -827,7 +827,7 @@ void ScOutputData::DrawBackground() nX1, nX2, bShowProt, bPagebreakMode ) ) { ++nSkip; - nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing + nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing } long nPosX = nScrX; @@ -843,10 +843,10 @@ void ScOutputData::DrawBackground() if (bCellContrast) { - // high contrast for cell borders and backgrounds -> empty background + // high contrast for cell borders and backgrounds -> empty background pBackground = ScGlobal::GetEmptyBrushItem(); } - else if (bShowProt) // show cell protection in syntax mode + else if (bShowProt) // show cell protection in syntax mode { const ScPatternAttr* pP = pInfo->pPatternAttr; if (pP) @@ -878,10 +878,10 @@ void ScOutputData::DrawBackground() if ( pBackground != pOldBackground ) { aRect.Right() = nPosX-nSignedOneX; - if (pOldBackground) // ==0 if hidden + if (pOldBackground) // ==0 if hidden { Color aBackCol = pOldBackground->GetColor(); - if ( !aBackCol.GetTransparency() ) //! partial transparency? + if ( !aBackCol.GetTransparency() ) //! partial transparency? { pDev->SetFillColor( aBackCol ); pDev->DrawRect( aRect ); @@ -896,7 +896,7 @@ void ScOutputData::DrawBackground() if (pOldBackground) { Color aBackCol = pOldBackground->GetColor(); - if ( !aBackCol.GetTransparency() ) //! partial transparency? + if ( !aBackCol.GetTransparency() ) //! partial transparency? { pDev->SetFillColor( aBackCol ); pDev->DrawRect( aRect ); @@ -920,7 +920,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot pDev->SetLineColor(); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); Color aAutoTextColor; if ( bCellContrast ) @@ -952,7 +952,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot BOOL bCornerX = ( nArrX==nX1 || nArrX==nX2+2 ); BOOL bSkipX = ( nArrX==nX1 && !bLeft ) || ( nArrX==nX2+2 && !bRight ); - for (USHORT nPass=0; nPass<2; nPass++) // horizontal / vertikal + for (USHORT nPass=0; nPass<2; nPass++) // horizontal / vertikal { const SvxShadowItem* pAttr = nPass ? pThisRowInfo->pCellInfo[nArrX].pVShadowOrigin : @@ -974,16 +974,16 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot long nMaxWidth = nThisWidth; if (!nMaxWidth) { - //! direction must depend on shadow location - SCCOL nWx = nArrX; // nX+1 + //! direction must depend on shadow location + SCCOL nWx = nArrX; // nX+1 while (nWx<nX2 && !pRowInfo[0].pCellInfo[nWx+1].nWidth) ++nWx; nMaxWidth = pRowInfo[0].pCellInfo[nWx+1].nWidth; } -// Rectangle aRect( Point(nPosX,nPosY), -// Size( pRowInfo[0].pCellInfo[nArrX].nWidth, -// pRowInfo[nArrY].nHeight ) ); +// Rectangle aRect( Point(nPosX,nPosY), +// Size( pRowInfo[0].pCellInfo[nArrX].nWidth, +// pRowInfo[nArrY].nHeight ) ); // rectangle is in logical orientation Rectangle aRect( nPosX, nPosY, @@ -996,19 +996,19 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot long nSizeY = (long)(nSize*nPPTY); if (nSizeY >= nRowHeight) nSizeY = nRowHeight-1; - nSizeX *= nLayoutSign; // used only to add to rectangle values + nSizeX *= nLayoutSign; // used only to add to rectangle values SvxShadowLocation eLoc = pAttr->GetLocation(); if ( bLayoutRTL ) { - // Shadow location is specified as "visual" (right is always right), - // so the attribute's location value is mirrored here and in FillInfo. + // Shadow location is specified as "visual" (right is always right), + // so the attribute's location value is mirrored here and in FillInfo. switch (eLoc) { - case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break; - case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break; - case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break; - case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break; + case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break; + case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break; + case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break; + case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break; default: { // added to avoid warnings @@ -1062,7 +1062,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot } // -// Loeschen +// Loeschen // void ScOutputData::DrawClear() @@ -1095,7 +1095,7 @@ void ScOutputData::DrawClear() while ( nArrY+nSkip+2<nArrCount && pRowInfo[nArrY+nSkip+1].bChanged ) { ++nSkip; - nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing + nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing } aRect = Rectangle( Point( nScrX, nPosY ), @@ -1110,7 +1110,7 @@ void ScOutputData::DrawClear() // -// Linien +// Linien // long lclGetSnappedX( OutputDevice& rDev, long nPosX, bool bSnapPixel ) @@ -1135,13 +1135,13 @@ void ScOutputData::DrawFrame() Color aSingleColor; BOOL bUseSingleColor = FALSE; const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); - // #107519# if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used - // for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines - // that are drawn with DrawRect, so if the line/background bits are set, the DrawMode - // must be reset and the border colors handled here. + // #107519# if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used + // for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines + // that are drawn with DrawRect, so if the line/background bits are set, the DrawMode + // must be reset and the border colors handled here. if ( ( nOldDrawMode & DRAWMODE_WHITEFILL ) && ( nOldDrawMode & DRAWMODE_BLACKLINE ) ) { @@ -1152,7 +1152,7 @@ void ScOutputData::DrawFrame() else if ( ( nOldDrawMode & DRAWMODE_SETTINGSFILL ) && ( nOldDrawMode & DRAWMODE_SETTINGSLINE ) ) { pDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) ); - aSingleColor = rStyleSettings.GetWindowTextColor(); // same as used in VCL for DRAWMODE_SETTINGSLINE + aSingleColor = rStyleSettings.GetWindowTextColor(); // same as used in VCL for DRAWMODE_SETTINGSLINE bUseSingleColor = TRUE; } else if ( bCellContrast ) @@ -1164,7 +1164,7 @@ void ScOutputData::DrawFrame() const Color* pForceColor = bUseSingleColor ? &aSingleColor : 0; if (bAnyRotated) - DrawRotatedFrame( pForceColor ); // removes the lines that must not be painted here + DrawRotatedFrame( pForceColor ); // removes the lines that must not be painted here long nInitPosX = nScrX; if ( bLayoutRTL ) @@ -1246,9 +1246,9 @@ void ScOutputData::DrawFrame() pDev->SetDrawMode(nOldDrawMode); } -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- -// Linie unter der Zelle +// Linie unter der Zelle const SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nRotDir, @@ -1262,19 +1262,19 @@ const SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, { if ( nRotDir == SC_ROTDIR_LEFT ) { - // Text nach links -> Linie von rechts + // Text nach links -> Linie von rechts if ( nCol < MAXCOL ) ++nCol; else - return NULL; // war nix + return NULL; // war nix } else { - // Text nach rechts -> Linie von links + // Text nach rechts -> Linie von links if ( nCol > 0 ) --nCol; else - return NULL; // war nix + return NULL; // war nix } const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab ); const SfxItemSet* pCondSet = pDoc->GetCondResult( nCol, nRow, nTab ); @@ -1318,8 +1318,8 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott rDev.SetLineColor(rColor); // PEN_NULL ??? rDev.SetFillColor(rColor); - // Position oben/unten muss unabhaengig von der Liniendicke sein, - // damit der Winkel stimmt (oder X-Position auch anpassen) + // Position oben/unten muss unabhaengig von der Liniendicke sein, + // damit der Winkel stimmt (oder X-Position auch anpassen) long nTopPos = rTop.Y(); long nBotPos = rBottom.Y(); @@ -1329,7 +1329,7 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott long nBotLeft = rBottom.X() + nXOffs; long nBotRight = nBotLeft + nWidth - 1; - // oben abschliessen + // oben abschliessen if ( rTopLine.Prim() ) { @@ -1337,15 +1337,15 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott if (nLineW >= 2) { Point aTriangle[3]; - aTriangle[0] = Point( nTopLeft, nTopPos ); // wie aPoints[0] - aTriangle[1] = Point( nTopRight, nTopPos ); // wie aPoints[1] + aTriangle[0] = Point( nTopLeft, nTopPos ); // wie aPoints[0] + aTriangle[1] = Point( nTopRight, nTopPos ); // wie aPoints[1] aTriangle[2] = Point( rTop.X(), nTopPos - (nLineW - 1) / 2 ); Polygon aTriPoly( 3, aTriangle ); rDev.DrawPolygon( aTriPoly ); } } - // unten abschliessen + // unten abschliessen if ( rBottomLine.Prim() ) { @@ -1353,8 +1353,8 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott if (nLineW >= 2) { Point aTriangle[3]; - aTriangle[0] = Point( nBotLeft, nBotPos ); // wie aPoints[3] - aTriangle[1] = Point( nBotRight, nBotPos ); // wie aPoints[2] + aTriangle[0] = Point( nBotLeft, nBotPos ); // wie aPoints[3] + aTriangle[1] = Point( nBotRight, nBotPos ); // wie aPoints[2] aTriangle[2] = Point( rBottom.X(), nBotPos - (nLineW - 1) / 2 + nLineW - 1 ); Polygon aTriPoly( 3, aTriangle ); rDev.DrawPolygon( aTriPoly ); @@ -1389,20 +1389,20 @@ void lcl_VertLine( OutputDevice& rDev, const Point& rTop, const Point& rBottom, void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) { - //! nRotMax speichern + //! nRotMax speichern SCCOL nRotMax = nX2; for (SCSIZE nRotY=0; nRotY<nArrCount; nRotY++) if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax) nRotMax = pRowInfo[nRotY].nRotMaxCol; const ScPatternAttr* pPattern; - const SfxItemSet* pCondSet; + const SfxItemSet* pCondSet; const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); - // color (pForceColor) is determined externally, including DrawMode changes + // color (pForceColor) is determined externally, including DrawMode changes long nInitPosX = nScrX; if ( bLayoutRTL ) @@ -1427,8 +1427,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) long nPosY = nScrY; for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) { - // Rotated wird auch 1 Zeile ueber/unter Changed gezeichnet, falls Teile - // in die Zeile hineinragen... + // Rotated wird auch 1 Zeile ueber/unter Changed gezeichnet, falls Teile + // in die Zeile hineinragen... RowInfo& rPrevRowInfo = pRowInfo[nArrY-1]; RowInfo& rThisRowInfo = pRowInfo[nArrY]; @@ -1446,7 +1446,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) SCCOL nX; for (nX=0; nX<=nRotMax; nX++) { - if (nX==nX1) nPosX = nInitPosX; // calculated individually for preceding positions + if (nX==nX1) nPosX = nInitPosX; // calculated individually for preceding positions USHORT nArrX = nX + 1; @@ -1465,7 +1465,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) pInfo->pConditionSet = pCondSet; } - //! LastPattern etc. + //! LastPattern etc. long nAttrRotate = pPattern->GetRotateVal( pCondSet ); SvxRotateMode eRotMode = (SvxRotateMode)((const SvxRotateModeItem&) @@ -1473,7 +1473,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) if ( nAttrRotate ) { - if (nX<nX1) // negative Position berechnen + if (nX<nX1) // negative Position berechnen { nPosX = nInitPosX; SCCOL nCol = nX1; @@ -1484,8 +1484,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) } } - // Startposition minus 1, damit auch schraege Hintergruende - // zur Umrandung passen (Umrandung ist auf dem Gitter) + // Startposition minus 1, damit auch schraege Hintergruende + // zur Umrandung passen (Umrandung ist auf dem Gitter) long nTop = nPosY - 1; long nBottom = nPosY + nRowHeight - 1; @@ -1494,12 +1494,12 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) long nBotLeft = nTopLeft; long nBotRight = nTopRight; - // inclusion of the sign here hasn't been decided yet - // (if not, the extension of the non-rotated background must also be changed) - double nRealOrient = nLayoutSign * nAttrRotate * F_PI18000; // 1/100th degrees + // inclusion of the sign here hasn't been decided yet + // (if not, the extension of the non-rotated background must also be changed) + double nRealOrient = nLayoutSign * nAttrRotate * F_PI18000; // 1/100th degrees double nCos = cos( nRealOrient ); double nSin = sin( nRealOrient ); - //! begrenzen !!! + //! begrenzen !!! long nSkew = (long) ( nRowHeight * nCos / nSin ); switch (eRotMode) @@ -1537,23 +1537,23 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) ATTR_BACKGROUND, pCondSet ); if (bCellContrast) { - // high contrast for cell borders and backgrounds -> empty background + // high contrast for cell borders and backgrounds -> empty background pBackground = ScGlobal::GetEmptyBrushItem(); } const Color& rColor = pBackground->GetColor(); if ( rColor.GetTransparency() != 255 ) { - // #95879# draw background only for the changed row itself - // (background doesn't extend into other cells). - // For the borders (rotated and normal), clipping should be - // set if the row isn't changed, but at least the borders - // don't cover the cell contents. + // #95879# draw background only for the changed row itself + // (background doesn't extend into other cells). + // For the borders (rotated and normal), clipping should be + // set if the row isn't changed, but at least the borders + // don't cover the cell contents. if ( rThisRowInfo.bChanged ) { Polygon aPoly( 4, aPoints ); - // ohne Pen wird bei DrawPolygon rechts und unten - // ein Pixel weggelassen... + // ohne Pen wird bei DrawPolygon rechts und unten + // ein Pixel weggelassen... if ( rColor.GetTransparency() == 0 ) pDev->SetLineColor(rColor); else @@ -1565,9 +1565,9 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) svx::frame::Style aTopLine, aBottomLine, aLeftLine, aRightLine; - if ( nX < nX1 || nX > nX2 ) // Attribute in FillInfo nicht gesetzt + if ( nX < nX1 || nX > nX2 ) // Attribute in FillInfo nicht gesetzt { - //! Seitengrenzen fuer Druck beruecksichtigen !!!!! + //! Seitengrenzen fuer Druck beruecksichtigen !!!!! const SvxBorderLine* pLeftLine; const SvxBorderLine* pTopLine; const SvxBorderLine* pRightLine; @@ -1601,10 +1601,10 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) nPosX += nColWidth * nLayoutSign; } - // erst hinterher im zweiten Schritt die Linien fuer normale Ausgabe loeschen + // erst hinterher im zweiten Schritt die Linien fuer normale Ausgabe loeschen nX = nX1 > 0 ? (nX1-1) : static_cast<SCCOL>(0); - for (; nX<=nX2+1; nX++) // sichtbarer Teil +- 1 + for (; nX<=nX2+1; nX++) // sichtbarer Teil +- 1 { USHORT nArrX = nX + 1; CellInfo& rInfo = rThisRowInfo.pCellInfo[nArrX]; @@ -1618,8 +1618,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) size_t nCol = lclGetArrayColFromCellInfoX( nArrX, nX1, nX2, bLayoutRTL ); - // horizontal: angrenzende Linie verlaengern - // (nur, wenn die gedrehte Zelle eine Umrandung hat) + // horizontal: angrenzende Linie verlaengern + // (nur, wenn die gedrehte Zelle eine Umrandung hat) USHORT nDir = rInfo.nRotateDir; if ( rArray.GetCellStyleTop( nCol, nRow ).Prim() && eRotMode != SVX_ROTATE_MODE_TOP ) { @@ -1665,7 +1665,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) pDev->SetClipRegion(); } -// Drucker +// Drucker PolyPolygon ScOutputData::GetChangedArea() { @@ -1675,9 +1675,9 @@ PolyPolygon ScOutputData::GetChangedArea() aDrawingRect.Left() = nScrX; aDrawingRect.Right() = nScrX+nScrW-1; - BOOL bHad = FALSE; - long nPosY = nScrY; - SCSIZE nArrY; + BOOL bHad = FALSE; + long nPosY = nScrY; + SCSIZE nArrY; for (nArrY=1; nArrY+1<nArrCount; nArrY++) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; @@ -1713,9 +1713,9 @@ BOOL ScOutputData::SetChangedClip() aDrawingRect.Left() = nScrX; aDrawingRect.Right() = nScrX+nScrW-1; - BOOL bHad = FALSE; - long nPosY = nScrY; - SCSIZE nArrY; + BOOL bHad = FALSE; + long nPosY = nScrY; + SCSIZE nArrY; for (nArrY=1; nArrY+1<nArrCount; nArrY++) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; @@ -1748,8 +1748,8 @@ BOOL ScOutputData::SetChangedClip() void ScOutputData::FindChanged() { - SCCOL nX; - SCSIZE nArrY; + SCCOL nX; + SCSIZE nArrY; BOOL bWasIdleDisabled = pDoc->IsIdleDisabled(); pDoc->DisableIdle( TRUE ); @@ -1803,7 +1803,7 @@ void ScOutputData::DrawMark( Window* pWin ) { Rectangle aRect; ScInvertMerger aInvert( pWin ); - //! additional method AddLineRect for ScInvertMerger? + //! additional method AddLineRect for ScInvertMerger? long nPosY = nScrY; for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++) @@ -1884,12 +1884,12 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, BOOL bTop = FALSE; BOOL bBottom = FALSE; BOOL bLeft = FALSE; - BOOL bRight = FALSE; + BOOL bRight = FALSE; long nPosY = nScrY; BOOL bNoStartY = ( nY1 < nRefStartY ); BOOL bNoEndY = FALSE; - for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check + for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check { SCROW nY = pRowInfo[nArrY].nRowNo; @@ -1915,7 +1915,7 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, long nPosX = nScrX; if ( bLayoutRTL ) - nPosX += nMirrorW - 1; // always in pixels + nPosX += nMirrorW - 1; // always in pixels for (SCCOL nX=nX1; nX<=nX2; nX++) { @@ -1973,7 +1973,7 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, pDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab ); if ( nRefStartX <= nVisX2 + 1 && nRefEndX >= nVisX1 && - nRefStartY <= nVisY2 + 1 && nRefEndY >= nVisY1 ) // +1 because it touches next cells left/top + nRefStartY <= nVisY2 + 1 && nRefEndY >= nVisY1 ) // +1 because it touches next cells left/top { long nMinX = nScrX; long nMinY = nScrY; @@ -1990,12 +1990,12 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, BOOL bTop = FALSE; BOOL bBottom = FALSE; BOOL bLeft = FALSE; - BOOL bRight = FALSE; + BOOL bRight = FALSE; long nPosY = nScrY; BOOL bNoStartY = ( nY1 < nRefStartY ); BOOL bNoEndY = FALSE; - for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check + for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check { SCROW nY = pRowInfo[nArrY].nRowNo; @@ -2021,7 +2021,7 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, long nPosX = nScrX; if ( bLayoutRTL ) - nPosX += nMirrorW - 1; // always in pixels + nPosX += nMirrorW - 1; // always in pixels for (SCCOL nX=nX1; nX<=nX2+1; nX++) { @@ -2042,9 +2042,9 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, nMaxY >= nMinY ) { if ( nType == SC_CAT_DELETE_ROWS ) - bLeft = bRight = bBottom = FALSE; //! dicke Linie ??? + bLeft = bRight = bBottom = FALSE; //! dicke Linie ??? else if ( nType == SC_CAT_DELETE_COLS ) - bTop = bBottom = bRight = FALSE; //! dicke Linie ??? + bTop = bBottom = bRight = FALSE; //! dicke Linie ??? pDev->SetLineColor( rColor ); if (bTop && bBottom && bLeft && bRight) @@ -2086,17 +2086,17 @@ void ScOutputData::DrawChangeTrack() ScChangeTrack* pTrack = pDoc->GetChangeTrack(); ScChangeViewSettings* pSettings = pDoc->GetChangeViewSettings(); if ( !pTrack || !pTrack->GetFirst() || !pSettings || !pSettings->ShowChanges() ) - return; // nix da oder abgeschaltet + return; // nix da oder abgeschaltet ScActionColorChanger aColorChanger(*pTrack); - // Clipping passiert von aussen - //! ohne Clipping, nur betroffene Zeilen painten ??!??!? + // Clipping passiert von aussen + //! ohne Clipping, nur betroffene Zeilen painten ??!??!? SCCOL nEndX = nX2; SCROW nEndY = nY2; - if ( nEndX < MAXCOL ) ++nEndX; // auch noch von der naechsten Zelle, weil die Markierung - if ( nEndY < MAXROW ) ++nEndY; // in die jeweils vorhergehende Zelle hineinragt + if ( nEndX < MAXCOL ) ++nEndX; // auch noch von der naechsten Zelle, weil die Markierung + if ( nEndY < MAXROW ) ++nEndY; // in die jeweils vorhergehende Zelle hineinragt ScRange aViewRange( nX1, nY1, nTab, nEndX, nEndY, nTab ); const ScChangeAction* pAction = pTrack->GetFirst(); while (pAction) @@ -2152,7 +2152,7 @@ void ScOutputData::DrawNoteMarks() long nInitPosX = nScrX; if ( bLayoutRTL ) - nInitPosX += nMirrorW - 1; // always in pixels + nInitPosX += nMirrorW - 1; // always in pixels long nLayoutSign = bLayoutRTL ? -1 : 1; long nPosY = nScrY; @@ -2199,7 +2199,7 @@ void ScOutputData::DrawNoteMarks() long nMarkX = nPosX + ( pRowInfo[0].pCellInfo[nX+1].nWidth - 4 ) * nLayoutSign; if ( bIsMerged || pInfo->bMerged ) { - // if merged, add widths of all cells + // if merged, add widths of all cells SCCOL nNextX = nX + 1; while ( nNextX <= nX2 + 1 && pThisRowInfo->pCellInfo[nNextX+1].bHOverlapped ) { @@ -2316,15 +2316,15 @@ void ScOutputData::DrawClipMarks() const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); if ( bUseStyleColor && rStyleSettings.GetHighContrastMode() ) { - // use DrawMode to change the arrow's outline color + // use DrawMode to change the arrow's outline color pDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE ); - // use text color also for the fill color + // use text color also for the fill color aArrowFillCol.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); } long nInitPosX = nScrX; if ( bLayoutRTL ) - nInitPosX += nMirrorW - 1; // always in pixels + nInitPosX += nMirrorW - 1; // always in pixels long nLayoutSign = bLayoutRTL ? -1 : 1; Rectangle aCellRect; @@ -2343,7 +2343,7 @@ void ScOutputData::DrawClipMarks() { if (pInfo->bHOverlapped || pInfo->bVOverlapped) { - // merge origin may be outside of visible area - use document functions + // merge origin may be outside of visible area - use document functions SCCOL nOverX = nX; SCROW nOverY = nY; @@ -2405,7 +2405,7 @@ void ScOutputData::DrawClipMarks() Point( nStartPosX+nOutWidth-1, nPosY+nOutHeight-1 ) ); } - aCellRect.Bottom() -= 1; // don't paint over the cell grid + aCellRect.Bottom() -= 1; // don't paint over the cell grid if ( bLayoutRTL ) aCellRect.Left() += 1; else @@ -2416,14 +2416,14 @@ void ScOutputData::DrawClipMarks() if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_RIGHT : SC_CLIPMARK_LEFT ) ) { - // visually left + // visually left Rectangle aMarkRect = aCellRect; aMarkRect.Right() = aCellRect.Left()+nMarkPixel-1; SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, TRUE ); } if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_LEFT : SC_CLIPMARK_RIGHT ) ) { - // visually right + // visually right Rectangle aMarkRect = aCellRect; aMarkRect.Left() = aCellRect.Right()-nMarkPixel+1; SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, FALSE ); diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index e744023568da..3e8d9a66c2d9 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.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 @@ -81,10 +81,10 @@ #include <math.h> -//! Autofilter-Breite mit column.cxx zusammenfassen +//! Autofilter-Breite mit column.cxx zusammenfassen #define DROPDOWN_BITMAP_SIZE 18 -#define DRAWTEXT_MAX 32767 +#define DRAWTEXT_MAX 32767 const USHORT SC_SHRINKAGAIN_MAX = 7; @@ -95,82 +95,82 @@ const USHORT SC_SHRINKAGAIN_MAX = 7; class ScDrawStringsVars { - ScOutputData* pOutput; // Verbindung + ScOutputData* pOutput; // Verbindung - const ScPatternAttr* pPattern; // Attribute - const SfxItemSet* pCondSet; // aus bedingter Formatierung + const ScPatternAttr* pPattern; // Attribute + const SfxItemSet* pCondSet; // aus bedingter Formatierung - Font aFont; // aus Attributen erzeugt - FontMetric aMetric; - long nAscentPixel; // always pixels - SvxCellOrientation eAttrOrient; - SvxCellHorJustify eAttrHorJust; - SvxCellVerJustify eAttrVerJust; + Font aFont; // aus Attributen erzeugt + FontMetric aMetric; + long nAscentPixel; // always pixels + SvxCellOrientation eAttrOrient; + SvxCellHorJustify eAttrHorJust; + SvxCellVerJustify eAttrVerJust; SvxCellJustifyMethod eAttrHorJustMethod; SvxCellJustifyMethod eAttrVerJustMethod; const SvxMarginItem* pMargin; - USHORT nIndent; - BOOL bRotated; + USHORT nIndent; + BOOL bRotated; - String aString; // Inhalte - Size aTextSize; - long nOriginalWidth; + String aString; // Inhalte + Size aTextSize; + long nOriginalWidth; long nMaxDigitWidth; long nSignWidth; long nDotWidth; long nExpWidth; - ScBaseCell* pLastCell; - ULONG nValueFormat; - BOOL bLineBreak; + ScBaseCell* pLastCell; + ULONG nValueFormat; + BOOL bLineBreak; BOOL bRepeat; BOOL bShrink; - BOOL bPixelToLogic; - BOOL bCellContrast; + BOOL bPixelToLogic; + BOOL bCellContrast; - Color aBackConfigColor; // used for ScPatternAttr::GetFont calls - Color aTextConfigColor; + Color aBackConfigColor; // used for ScPatternAttr::GetFont calls + Color aTextConfigColor; public: ScDrawStringsVars(ScOutputData* pData, BOOL bPTL); ~ScDrawStringsVars(); - // SetPattern = ex-SetVars - // SetPatternSimple: ohne Font + // SetPattern = ex-SetVars + // SetPatternSimple: ohne Font - void SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet, ScBaseCell* pCell, BYTE nScript ); - void SetPatternSimple( const ScPatternAttr* pNew, const SfxItemSet* pSet ); + void SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet, ScBaseCell* pCell, BYTE nScript ); + void SetPatternSimple( const ScPatternAttr* pNew, const SfxItemSet* pSet ); - BOOL SetText( ScBaseCell* pCell ); // TRUE -> pOldPattern vergessen + BOOL SetText( ScBaseCell* pCell ); // TRUE -> pOldPattern vergessen void SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth ); - void SetAutoText( const String& rAutoText ); + void SetAutoText( const String& rAutoText ); - const ScPatternAttr* GetPattern() const { return pPattern; } - SvxCellOrientation GetOrient() const { return eAttrOrient; } - SvxCellHorJustify GetHorJust() const { return eAttrHorJust; } - SvxCellVerJustify GetVerJust() const { return eAttrVerJust; } + const ScPatternAttr* GetPattern() const { return pPattern; } + SvxCellOrientation GetOrient() const { return eAttrOrient; } + SvxCellHorJustify GetHorJust() const { return eAttrHorJust; } + SvxCellVerJustify GetVerJust() const { return eAttrVerJust; } SvxCellJustifyMethod GetHorJustMethod() const { return eAttrHorJustMethod; } SvxCellJustifyMethod GetVerJustMethod() const { return eAttrVerJustMethod; } - const SvxMarginItem* GetMargin() const { return pMargin; } + const SvxMarginItem* GetMargin() const { return pMargin; } - USHORT GetLeftTotal() const { return pMargin->GetLeftMargin() + nIndent; } + USHORT GetLeftTotal() const { return pMargin->GetLeftMargin() + nIndent; } - const String& GetString() const { return aString; } - const Size& GetTextSize() const { return aTextSize; } - long GetOriginalWidth() const { return nOriginalWidth; } + const String& GetString() const { return aString; } + const Size& GetTextSize() const { return aTextSize; } + long GetOriginalWidth() const { return nOriginalWidth; } - ULONG GetValueFormat() const { return nValueFormat; } - BOOL GetLineBreak() const { return bLineBreak; } + ULONG GetValueFormat() const { return nValueFormat; } + BOOL GetLineBreak() const { return bLineBreak; } BOOL IsRepeat() const { return bRepeat; } BOOL IsShrink() const { return bShrink; } - long GetAscent() const { return nAscentPixel; } - BOOL IsRotated() const { return bRotated; } + long GetAscent() const { return nAscentPixel; } + BOOL IsRotated() const { return bRotated; } void SetShrinkScale( long nScale, BYTE nScript ); - BOOL HasCondHeight() const { return pCondSet && SFX_ITEM_SET == + BOOL HasCondHeight() const { return pCondSet && SFX_ITEM_SET == pCondSet->GetItemState( ATTR_FONT_HEIGHT, TRUE ); } BOOL HasEditCharacters() const; @@ -187,31 +187,31 @@ private: //================================================================== ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, BOOL bPTL) : - pOutput ( pData ), - pPattern ( NULL ), - pCondSet ( NULL ), - eAttrOrient ( SVX_ORIENTATION_STANDARD ), + pOutput ( pData ), + pPattern ( NULL ), + pCondSet ( NULL ), + eAttrOrient ( SVX_ORIENTATION_STANDARD ), eAttrHorJust( SVX_HOR_JUSTIFY_STANDARD ), eAttrVerJust( SVX_VER_JUSTIFY_BOTTOM ), eAttrHorJustMethod( SVX_JUSTIFY_METHOD_AUTO ), eAttrVerJustMethod( SVX_JUSTIFY_METHOD_AUTO ), - pMargin ( NULL ), - nIndent ( 0 ), - bRotated ( FALSE ), + pMargin ( NULL ), + nIndent ( 0 ), + bRotated ( FALSE ), nOriginalWidth( 0 ), nMaxDigitWidth( 0 ), nSignWidth( 0 ), nDotWidth( 0 ), nExpWidth( 0 ), - pLastCell ( NULL ), + pLastCell ( NULL ), nValueFormat( 0 ), - bLineBreak ( FALSE ), + bLineBreak ( FALSE ), bRepeat ( FALSE ), bShrink ( FALSE ), bPixelToLogic( bPTL ) { ScModule* pScMod = SC_MOD(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) bCellContrast = pOutput->bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -293,13 +293,13 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pPattern = pNew; pCondSet = pSet; - // pPattern auswerten + // pPattern auswerten OutputDevice* pDev = pOutput->pDev; OutputDevice* pRefDevice = pOutput->pRefDevice; OutputDevice* pFmtDevice = pOutput->pFmtDevice; - // Font + // Font ScAutoFontColorMode eColorMode; if ( pOutput->bUseStyleColor ) @@ -320,11 +320,11 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* &aBackConfigColor, &aTextConfigColor ); aFont.SetAlign(ALIGN_BASELINE); - // Orientierung + // Orientierung eAttrOrient = pPattern->GetCellOrientation( pCondSet ); - // alignment + // alignment eAttrHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern->GetItem( ATTR_HOR_JUSTIFY, pCondSet )).GetValue(); @@ -337,7 +337,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* eAttrHorJustMethod = lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_HOR_JUSTIFY_METHOD, pCondSet); eAttrVerJustMethod = lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_VER_JUSTIFY_METHOD, pCondSet); - // line break + // line break bLineBreak = ((const SfxBoolItem&)pPattern->GetItem( ATTR_LINEBREAK, pCondSet )).GetValue(); @@ -382,7 +382,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* } aFont.SetOrientation( nRot ); - // Syntax-Modus + // Syntax-Modus if (pOutput->bSyntaxMode) pOutput->SetSyntaxColor( &aFont, pCell ); @@ -394,8 +394,8 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* aMetric = pFmtDevice->GetFontMetric(); // - // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme - // -> Metric vom Bildschirm nehmen (wie EditEngine!) + // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme + // -> Metric vom Bildschirm nehmen (wie EditEngine!) // if ( pFmtDevice->GetOutDevType() == OUTDEV_PRINTER && aMetric.GetIntLeading() == 0 ) @@ -417,16 +417,16 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* Color aOLineColor( ((const SvxOverlineItem&)pPattern->GetItem( ATTR_FONT_OVERLINE, pCondSet )).GetColor() ); pDev->SetOverlineColor( aOLineColor ); - // Zahlenformat + // Zahlenformat // ULONG nOld = nValueFormat; nValueFormat = pPattern->GetNumberFormat( pOutput->pDoc->GetFormatTable(), pCondSet ); -/* s.u. +/* s.u. if (nValueFormat != nOld) - pLastCell = NULL; // immer neu formatieren + pLastCell = NULL; // immer neu formatieren */ - // Raender + // Raender pMargin = (const SvxMarginItem*)&pPattern->GetItem( ATTR_MARGIN, pCondSet ); if ( eAttrHorJust == SVX_HOR_JUSTIFY_LEFT ) @@ -438,8 +438,8 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* bShrink = static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_SHRINKTOFIT, pCondSet )).GetValue(); - // zumindest die Text-Groesse muss neu geholt werden - //! unterscheiden, und den Text nicht neu vom Numberformatter holen? + // zumindest die Text-Groesse muss neu geholt werden + //! unterscheiden, und den Text nicht neu vom Numberformatter holen? pLastCell = NULL; } @@ -450,15 +450,15 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt nSignWidth = 0; nDotWidth = 0; nExpWidth = 0; - // wird gerufen, wenn sich die Font-Variablen nicht aendern (!StringDiffer) + // wird gerufen, wenn sich die Font-Variablen nicht aendern (!StringDiffer) pPattern = pNew; - pCondSet = pSet; //! noetig ??? + pCondSet = pSet; //! noetig ??? - // Zahlenformat + // Zahlenformat ULONG nOld = nValueFormat; -// nValueFormat = pPattern->GetNumberFormat( pFormatter ); +// nValueFormat = pPattern->GetNumberFormat( pFormatter ); const SfxPoolItem* pFormItem; if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,TRUE,&pFormItem) != SFX_ITEM_SET ) pFormItem = &pPattern->GetItem(ATTR_VALUE_FORMAT); @@ -470,9 +470,9 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt ((SvxLanguageItem*)pLangItem)->GetLanguage() ); if (nValueFormat != nOld) - pLastCell = NULL; // immer neu formatieren + pLastCell = NULL; // immer neu formatieren - // Raender + // Raender pMargin = (const SvxMarginItem*)&pPattern->GetItem( ATTR_MARGIN, pCondSet ); @@ -486,7 +486,7 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt bShrink = static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_SHRINKTOFIT, pCondSet )).GetValue(); } -inline BOOL SameValue( ScBaseCell* pCell, ScBaseCell* pOldCell ) // pCell ist != 0 +inline BOOL SameValue( ScBaseCell* pCell, ScBaseCell* pOldCell ) // pCell ist != 0 { return pOldCell && pOldCell->GetCellType() == CELLTYPE_VALUE && pCell->GetCellType() == CELLTYPE_VALUE && @@ -501,7 +501,7 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell ) { if ( !SameValue( pCell, pLastCell ) ) { - pLastCell = pCell; // Zelle merken + pLastCell = pCell; // Zelle merken Color* pColor; ULONG nFormat = GetValueFormat(); @@ -519,14 +519,14 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell ) { OutputDevice* pDev = pOutput->pDev; aFont.SetColor(*pColor); - pDev->SetFont( aFont ); // nur fuer Ausgabe + pDev->SetFont( aFont ); // nur fuer Ausgabe bChanged = TRUE; - pLastCell = NULL; // naechstes Mal wieder hierherkommen + pLastCell = NULL; // naechstes Mal wieder hierherkommen } TextChanged(); } - // sonst String/Groesse behalten + // sonst String/Groesse behalten } else { @@ -579,7 +579,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth ) return; } - double fVal = (eType == CELLTYPE_VALUE) ? + double fVal = (eType == CELLTYPE_VALUE) ? static_cast<ScValueCell*>(pCell)->GetValue() : static_cast<ScFormulaCell*>(pCell)->GetValue(); const SvNumberformat* pNumFormat = pOutput->pDoc->GetFormatTable()->GetEntry(nFormat); @@ -622,7 +622,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth ) if (nDecimalCount || nSignCount || nExpCount) { // Re-calculate. - nNumDigits = static_cast<sal_uInt16>(nWidth / nMaxDigit); + nNumDigits = static_cast<sal_uInt16>(nWidth / nMaxDigit); if (!pNumFormat->GetOutputString(fVal, nNumDigits, aString)) // Failed to get output string. Bail out. return; @@ -667,7 +667,7 @@ void ScDrawStringsVars::SetAutoText( const String& rAutoText ) if ( bPixelToLogic ) aTextSize = pRefDevice->LogicToPixel( aTextSize ); - pLastCell = NULL; // derselbe Text kann in der naechsten Zelle wieder passen + pLastCell = NULL; // derselbe Text kann in der naechsten Zelle wieder passen } long ScDrawStringsVars::GetMaxDigitWidth() @@ -678,7 +678,7 @@ long ScDrawStringsVars::GetMaxDigitWidth() sal_Char cZero = '0'; for (sal_Char i = 0; i < 10; ++i) { - sal_Char cDigit = cZero + i; + sal_Char cDigit = cZero + i; long n = pOutput->pFmtDevice->GetTextWidth(String(cDigit)); nMaxDigitWidth = ::std::max(nMaxDigitWidth, n); } @@ -754,10 +754,10 @@ double ScOutputData::GetStretch() { if ( pRefDevice->IsMapMode() ) { - // #95920# If a non-trivial MapMode is set, its scale is now already - // taken into account in the OutputDevice's font handling - // (OutputDevice::ImplNewFont, see #95414#). - // The old handling below is only needed for pixel output. + // #95920# If a non-trivial MapMode is set, its scale is now already + // taken into account in the OutputDevice's font handling + // (OutputDevice::ImplNewFont, see #95414#). + // The old handling below is only needed for pixel output. return 1.0; } @@ -779,7 +779,7 @@ double ScOutputData::GetStretch() //================================================================== // -// output strings +// output strings // void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScBaseCell* pCell ) @@ -879,7 +879,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, bDoMerge = bIsTop; // weiter solange versteckt -/* if (!bDoMerge) +/* if (!bDoMerge) return FALSE; */ @@ -889,7 +889,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, BOOL bVOver = pInfo->bVOverlapped; BOOL bHidden; - while (bHOver) // nY konstant + while (bHOver) // nY konstant { --rOverX; bHidden = pDoc->ColHidden(rOverX, nTab); @@ -898,14 +898,14 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, if (rOverX >= nX1 && !bHidden) { -// rVirtPosX -= pRowInfo[0].pCellInfo[rOverX+1].nWidth; +// rVirtPosX -= pRowInfo[0].pCellInfo[rOverX+1].nWidth; bHOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bHOverlapped; bVOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bVOverlapped; } else { -// if (!bClipVirt) -// rVirtPosX -= (long) (pDoc->GetColWidth( rOverX, nTab ) * nPPTX); +// if (!bClipVirt) +// rVirtPosX -= (long) (pDoc->GetColWidth( rOverX, nTab ) * nPPTX); USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr( rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue(); bHOver = ((nOverlap & SC_MF_HOR) != 0); @@ -921,21 +921,21 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, return FALSE; if (nArrY>0) - --nArrY; // lokale Kopie ! + --nArrY; // lokale Kopie ! if (rOverX >= nX1 && rOverY >= nY1 && !pDoc->ColHidden(rOverX, nTab) && !pDoc->RowHidden(rOverY, nTab) && pRowInfo[nArrY].nRowNo == rOverY) { -// rVirtPosY -= pRowInfo[nArrY].nHeight; +// rVirtPosY -= pRowInfo[nArrY].nHeight; bHOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bHOverlapped; bVOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bVOverlapped; } else { -// if (!bClipVirt) -// rVirtPosY -= (long) (pDoc->GetRowHeight( rOverY, nTab ) * nPPTY); +// if (!bClipVirt) +// rVirtPosY -= (long) (pDoc->GetRowHeight( rOverY, nTab ) * nPPTY); USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr( rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue(); bHOver = ((nOverlap & SC_MF_HOR) != 0); @@ -1015,7 +1015,7 @@ inline BOOL StringDiffer( const ScPatternAttr*& rpOldPattern, const ScPatternAtt else if ( &rpNewPattern->GetItem( ATTR_FONT_RELIEF ) != &rpOldPattern->GetItem( ATTR_FONT_RELIEF ) ) return TRUE; else if ( &rpNewPattern->GetItem( ATTR_BACKGROUND ) != &rpOldPattern->GetItem( ATTR_BACKGROUND ) ) - return TRUE; // needed with automatic text color + return TRUE; // needed with automatic text color else { rpOldPattern = rpNewPattern; @@ -1059,8 +1059,8 @@ BOOL ScOutputData::IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY ) if ( !bEmpty && ( nX < nX1 || nX > nX2 || !pThisRowInfo ) ) { - // for the range nX1..nX2 in RowInfo, cell protection attribute is already evaluated - // into bEmptyCellText in ScDocument::FillInfo / lcl_HidePrint (printfun) + // for the range nX1..nX2 in RowInfo, cell protection attribute is already evaluated + // into bEmptyCellText in ScDocument::FillInfo / lcl_HidePrint (printfun) BOOL bIsPrint = ( eType == OUTTYPE_PRINTER ); @@ -1095,9 +1095,9 @@ void ScOutputData::GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTabP, ScBaseCe BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY ) { - // apply the same logic here as in DrawStrings/DrawEdit: - // Stop at non-empty or merged or overlapped cell, - // where a note is empty as well as a cell that's hidden by protection settings + // apply the same logic here as in DrawStrings/DrawEdit: + // Stop at non-empty or merged or overlapped cell, + // where a note is empty as well as a cell that's hidden by protection settings const ScBaseCell* pCell = pDoc->GetCell( ScAddress( nX, nY, nTab ) ); if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE && !IsEmptyCellText( NULL, nX, nY ) ) @@ -1115,15 +1115,15 @@ BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY ) return TRUE; } -// nX, nArrY: loop variables from DrawStrings / DrawEdit -// nPosX, nPosY: corresponding positions for nX, nArrY -// nCellX, nCellY: position of the cell that contains the text -// nNeeded: Text width, including margin -// rPattern: cell format at nCellX, nCellY -// nHorJustify: horizontal alignment (visual) to determine which cells to use for long strings -// bCellIsValue: if set, don't extend into empty cells -// bBreak: if set, don't extend, and don't set clip marks (but rLeftClip/rRightClip is set) -// bOverwrite: if set, also extend into non-empty cells (for rotated text) +// nX, nArrY: loop variables from DrawStrings / DrawEdit +// nPosX, nPosY: corresponding positions for nX, nArrY +// nCellX, nCellY: position of the cell that contains the text +// nNeeded: Text width, including margin +// rPattern: cell format at nCellX, nCellY +// nHorJustify: horizontal alignment (visual) to determine which cells to use for long strings +// bCellIsValue: if set, don't extend into empty cells +// bBreak: if set, don't extend, and don't set clip marks (but rLeftClip/rRightClip is set) +// bOverwrite: if set, also extend into non-empty cells (for rotated text) // rParam output: various area parameters. void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY, @@ -1352,7 +1352,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) BOOL bWasIdleDisabled = pDoc->IsIdleDisabled(); pDoc->DisableIdle( TRUE ); - Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben + Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben // UINT32 nMinHeight = aMinSize.Height() / 200; // 1/2 Pixel ScDrawStringsVars aVars( this, bPixelToLogic ); @@ -1361,7 +1361,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) long nInitPosX = nScrX; if ( bLayoutRTL ) - nInitPosX += nMirrorW - 1; // pixels + nInitPosX += nMirrorW - 1; // pixels long nLayoutSign = bLayoutRTL ? -1 : 1; SCCOL nLastContentCol = MAXCOL; @@ -1370,7 +1370,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) nLastContentCol - pDoc->GetEmptyLinesInBlock( nX2+1, nY1, nTab, MAXCOL, nY2, nTab, DIR_RIGHT ) ); SCCOL nLoopStartX = nX1; if ( nX1 > 0 ) - --nLoopStartX; // start before nX1 for rest of long text to the left + --nLoopStartX; // start before nX1 for rest of long text to the left // variables for GetOutputArea OutputAreaParam aAreaParam; @@ -1383,7 +1383,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) const SfxItemSet* pOldCondSet = NULL; BYTE nOldScript = 0; - // alternative pattern instances in case we need to modify the pattern + // alternative pattern instances in case we need to modify the pattern // before processing the cell value. ::boost::ptr_vector<ScPatternAttr> aAltPatterns; @@ -1404,13 +1404,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; BOOL bEmpty = nX < nX1 || pInfo->bEmptyCellText; - SCCOL nCellX = nX; // position where the cell really starts + SCCOL nCellX = nX; // position where the cell really starts SCROW nCellY = nY; BOOL bDoCell = FALSE; BOOL bNeedEdit = FALSE; // - // Part of a merged cell? + // Part of a merged cell? // BOOL bOverlapped = ( pInfo->bHOverlapped || pInfo->bVOverlapped ); @@ -1418,7 +1418,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) { bEmpty = TRUE; - SCCOL nOverX; // start of the merged cells + SCCOL nOverX; // start of the merged cells SCROW nOverY; BOOL bVisChanged = !pRowInfo[nArrY-1].bChanged; if (GetMergeOrigin( nX,nY, nArrY, nOverX,nOverY, bVisChanged )) @@ -1432,7 +1432,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } // - // Rest of a long text further to the left? + // Rest of a long text further to the left? // if ( bEmpty && !bMergeEmpty && nX < nX1 && !bOverlapped ) @@ -1451,12 +1451,12 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } // - // Rest of a long text further to the right? + // Rest of a long text further to the right? // if ( bEmpty && !bMergeEmpty && nX == nX2 && !bOverlapped ) { - // don't have to look further than nLastContentCol + // don't have to look further than nLastContentCol SCCOL nTempX=nX; while (nTempX < nLastContentCol && IsEmptyCellText( pThisRowInfo, nTempX, nY )) @@ -1472,21 +1472,21 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } // - // normal visible cell + // normal visible cell // if (!bEmpty) bDoCell = TRUE; // - // don't output the cell that's being edited + // don't output the cell that's being edited // if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow ) bDoCell = FALSE; // - // output the cell text + // output the cell text // ScBaseCell* pCell = NULL; @@ -1495,7 +1495,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( nCellY == nY && nCellX == nX && nCellX >= nX1 && nCellX <= nX2 ) pCell = pThisRowInfo->pCellInfo[nCellX+1].pCell; else - GetVisibleCell( nCellX, nCellY, nTab, pCell ); // get from document + GetVisibleCell( nCellX, nCellY, nTab, pCell ); // get from document if ( !pCell ) bDoCell = FALSE; else if ( pCell->GetCellType() == CELLTYPE_EDIT ) @@ -1517,13 +1517,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab ); } } - else // get from document + else // get from document { pPattern = pDoc->GetPattern( nCellX, nCellY, nTab ); pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab ); } - if (pCell->HasValueData() && + if (pCell->HasValueData() && static_cast<const SfxBoolItem&>( pPattern->GetItem(ATTR_LINEBREAK, pCondSet)).GetValue()) { @@ -1550,7 +1550,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) nOldScript = nScript; } - // use edit engine for rotated, stacked or mixed-script text + // use edit engine for rotated, stacked or mixed-script text if ( aVars.GetOrient() == SVX_ORIENTATION_STACKED || aVars.IsRotated() || IsAmbiguousScript(nScript) ) bNeedEdit = TRUE; @@ -1563,7 +1563,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( aVars.SetText(pCell) ) pOldPattern = NULL; bNeedEdit = aVars.HasEditCharacters() || - (bFormulaCell && ((ScFormulaCell*)pCell)->IsMultilineResult()); + (bFormulaCell && ((ScFormulaCell*)pCell)->IsMultilineResult()); } long nTotalMargin = 0; if (bDoCell && !bNeedEdit) @@ -1581,14 +1581,14 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) ( bCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT ); if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust == SVX_HOR_JUSTIFY_REPEAT ) - eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented + eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented BOOL bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() == SVX_HOR_JUSTIFY_BLOCK ); BOOL bRepeat = aVars.IsRepeat() && !bBreak; BOOL bShrink = aVars.IsShrink() && !bBreak && !bRepeat; - nTotalMargin = - static_cast<long>(aVars.GetLeftTotal() * nPPTX) + + nTotalMargin = + static_cast<long>(aVars.GetLeftTotal() * nPPTX) + static_cast<long>(aVars.GetMargin()->GetRightMargin() * nPPTX); nNeededWidth = aVars.GetTextSize().Width() + nTotalMargin; @@ -1662,7 +1662,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } } - // use edit engine if automatic line breaks are needed + // use edit engine if automatic line breaks are needed if ( bBreak ) { if ( aVars.GetOrient() == SVX_ORIENTATION_STANDARD ) @@ -1684,13 +1684,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } if (bNeedEdit) { - // mark the cell in CellInfo to be drawn in DrawEdit: - // Cells to the left are marked directly, cells to the - // right are handled by the flag for nX2 + // mark the cell in CellInfo to be drawn in DrawEdit: + // Cells to the left are marked directly, cells to the + // right are handled by the flag for nX2 SCCOL nMarkX = ( nCellX <= nX2 ) ? nCellX : nX2; RowInfo* pMarkRowInfo = ( nCellY == nY ) ? pThisRowInfo : &pRowInfo[0]; pMarkRowInfo->pCellInfo[nMarkX+1].bEditEngine = TRUE; - bDoCell = FALSE; // don't draw here + bDoCell = FALSE; // don't draw here } if ( bDoCell ) { @@ -1704,12 +1704,12 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( nNeededWidth <= aAreaParam.maClipRect.GetWidth() ) aAreaParam.mbLeftClip = aAreaParam.mbRightClip = FALSE; - // If the "###" replacement doesn't fit into the cells, no clip marks - // are shown, as the "###" already denotes too little space. - // The rectangles from the first GetOutputArea call remain valid. + // If the "###" replacement doesn't fit into the cells, no clip marks + // are shown, as the "###" already denotes too little space. + // The rectangles from the first GetOutputArea call remain valid. } - long nJustPosX = aAreaParam.maAlignRect.Left(); // "justified" - effect of alignment will be added + long nJustPosX = aAreaParam.maAlignRect.Left(); // "justified" - effect of alignment will be added long nJustPosY = aAreaParam.maAlignRect.Top(); long nAvailWidth = aAreaParam.maAlignRect.GetWidth(); long nOutHeight = aAreaParam.maAlignRect.GetHeight(); @@ -1722,7 +1722,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } if ( aAreaParam.maClipRect.Right() > nScrX + nScrW ) { - aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? + aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? aAreaParam.mbRightClip = TRUE; } @@ -1741,10 +1741,10 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } // - // horizontalen Platz testen + // horizontalen Platz testen // - BOOL bRightAdjusted = FALSE; // to correct text width calculation later + BOOL bRightAdjusted = FALSE; // to correct text width calculation later BOOL bNeedEditEngine = FALSE; if ( !bNeedEditEngine && !bOutside ) { @@ -1804,8 +1804,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( nTestClipHeight > nOutHeight ) { - // kein vertikales Clipping beim Drucken von Zellen mit - // optimaler Hoehe, ausser bei Groesse in bedingter Formatierung + // kein vertikales Clipping beim Drucken von Zellen mit + // optimaler Hoehe, ausser bei Groesse in bedingter Formatierung if ( eType != OUTTYPE_PRINTER || ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) || ( aVars.HasCondHeight() ) ) @@ -1814,9 +1814,9 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( bHClip || bVClip ) { - // nur die betroffene Dimension clippen, - // damit bei nicht-proportionalem Resize nicht alle - // rechtsbuendigen Zahlen abgeschnitten werden: + // nur die betroffene Dimension clippen, + // damit bei nicht-proportionalem Resize nicht alle + // rechtsbuendigen Zahlen abgeschnitten werden: if (!bHClip) { @@ -1829,8 +1829,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) aAreaParam.maClipRect.Bottom() = nScrY+nScrH; } - // aClipRect is not used after SetClipRegion/IntersectClipRegion, - // so it can be modified here + // aClipRect is not used after SetClipRegion/IntersectClipRegion, + // so it can be modified here if (bPixelToLogic) aAreaParam.maClipRect = pRefDevice->PixelToLogic( aAreaParam.maClipRect ); @@ -1869,19 +1869,19 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) Point aDrawTextPos( nJustPosX, nJustPosY ); if ( bPixelToLogic ) { - // undo text width adjustment in pixels + // undo text width adjustment in pixels if (bRightAdjusted) aDrawTextPos.X() += aVars.GetTextSize().Width(); aDrawTextPos = pRefDevice->PixelToLogic( aDrawTextPos ); - // redo text width adjustment in logic units + // redo text width adjustment in logic units if (bRightAdjusted) aDrawTextPos.X() -= aVars.GetOriginalWidth(); } - // in Metafiles immer DrawTextArray, damit die Positionen mit - // aufgezeichnet werden (fuer nicht-proportionales Resize): + // in Metafiles immer DrawTextArray, damit die Positionen mit + // aufgezeichnet werden (fuer nicht-proportionales Resize): String aString = aVars.GetString(); if (bMetaFile || pFmtDevice != pDev || aZoomX != aZoomY) @@ -1932,14 +1932,14 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) pDoc->DisableIdle( bWasIdleDisabled ); } -// ------------------------------------------------------------------------------- +// ------------------------------------------------------------------------------- -void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute +void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute { rEngine.SetUpdateMode( FALSE ); rEngine.SetText(EMPTY_STRING); - // keine Para-Attribute uebrigbehalten... + // keine Para-Attribute uebrigbehalten... const SfxItemSet& rPara = rEngine.GetParaAttribs(0); if (rPara.Count()) rEngine.SetParaAttribs( 0, @@ -2026,7 +2026,7 @@ long lcl_GetEditSize( EditEngine& rEngine, BOOL bWidth, BOOL bSwap, long nAttrRo // assuming standard mode, otherwise width isn't used - double nRealOrient = nAttrRotate * F_PI18000; // 1/100th degrees + double nRealOrient = nAttrRotate * F_PI18000; // 1/100th degrees double nAbsCos = fabs( cos( nRealOrient ) ); double nAbsSin = fabs( sin( nRealOrient ) ); if ( bWidth ) @@ -2283,9 +2283,9 @@ void EditAlignmentParam::setAlignmentItems(ScFieldEditEngine* pEngine, ScBaseCel } else { - // horizontal alignment now may depend on cell content - // (for values with number formats with mixed script types) - // -> always set adjustment + // horizontal alignment now may depend on cell content + // (for values with number formats with mixed script types) + // -> always set adjustment SvxAdjust eSvxAdjust = SVX_ADJUST_LEFT; if (meOrient == SVX_ORIENTATION_STACKED) @@ -2299,7 +2299,7 @@ void EditAlignmentParam::setAlignmentItems(ScFieldEditEngine* pEngine, ScBaseCel eSvxAdjust = mbCellIsValue ? SVX_ADJUST_RIGHT : SVX_ADJUST_LEFT; break; case SVX_HOR_JUSTIFY_LEFT: - case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert + case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert eSvxAdjust = SVX_ADJUST_LEFT; break; case SVX_HOR_JUSTIFY_RIGHT: @@ -2381,19 +2381,19 @@ bool EditAlignmentParam::adjustHorAlignment(ScFieldEditEngine* pEngine) void ScOutputData::DrawEdit(BOOL bPixelToLogic) { vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() ); - Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben + Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben // UINT32 nMinHeight = aMinSize.Height() / 200; // 1/2 Pixel ScModule* pScMod = SC_MOD(); sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); ScFieldEditEngine* pEngine = NULL; BOOL bHyphenatorSet = FALSE; const ScPatternAttr* pOldPattern = NULL; - const SfxItemSet* pOldCondSet = NULL; + const SfxItemSet* pOldCondSet = NULL; ScBaseCell* pCell = NULL; Size aRefOne = pRefDevice->PixelToLogic(Size(1,1)); @@ -2405,32 +2405,32 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } long nLayoutSign = bLayoutRTL ? -1 : 1; - //! store nLastContentCol as member! + //! store nLastContentCol as member! SCCOL nLastContentCol = MAXCOL; if ( nX2 < MAXCOL ) nLastContentCol = sal::static_int_cast<SCCOL>( nLastContentCol - pDoc->GetEmptyLinesInBlock( nX2+1, nY1, nTab, MAXCOL, nY2, nTab, DIR_RIGHT ) ); long nRowPosY = nScrY; - for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten + for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; // long nCellHeight = (long) pThisRowInfo->nHeight; - if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet + if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet if ( pThisRowInfo->bChanged || nArrY==0 ) { long nPosX = 0; - for (SCCOL nX=0; nX<=nX2; nX++) // wegen Ueberhaengen + for (SCCOL nX=0; nX<=nX2; nX++) // wegen Ueberhaengen { - if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually + if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually - CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; + CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; if (pInfo->bEditEngine) { SCROW nY = pThisRowInfo->nRowNo; - SCCOL nCellX = nX; // position where the cell really starts + SCCOL nCellX = nX; // position where the cell really starts SCROW nCellY = nY; BOOL bDoCell = FALSE; @@ -2439,7 +2439,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) { nPosY = nScrY; nY = pRowInfo[1].nRowNo; - SCCOL nOverX; // start of the merged cells + SCCOL nOverX; // start of the merged cells SCROW nOverY; if (GetMergeOrigin( nX,nY, 1, nOverX,nOverY, TRUE )) { @@ -2450,7 +2450,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } else if ( nX == nX2 && !pThisRowInfo->pCellInfo[nX+1].pCell ) { - // Rest of a long text further to the right? + // Rest of a long text further to the right? SCCOL nTempX=nX; while (nTempX < nLastContentCol && IsEmptyCellText( pThisRowInfo, nTempX, nY )) @@ -2484,7 +2484,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) pCondSet = rCellInfo.pConditionSet; pCell = rCellInfo.pCell; } - else // get from document + else // get from document { pPattern = pDoc->GetPattern( nCellX, nCellY, nTab ); pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab ); @@ -2498,16 +2498,16 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) BOOL bHidden = FALSE; // - // Create EditEngine + // Create EditEngine // if (!pEngine) { - // Ein RefDevice muss auf jeden Fall gesetzt werden, - // sonst legt sich die EditEngine ein VirtualDevice an! + // Ein RefDevice muss auf jeden Fall gesetzt werden, + // sonst legt sich die EditEngine ein VirtualDevice an! pEngine = new ScFieldEditEngine( pDoc->GetEnginePool() ); pEngine->SetUpdateMode( FALSE ); - pEngine->SetRefDevice( pFmtDevice ); // always set + pEngine->SetRefDevice( pFmtDevice ); // always set ULONG nCtrl = pEngine->GetControlWord(); if ( bShowSpellErrors ) nCtrl |= EE_CNTRL_ONLINESPELLING; @@ -2522,7 +2522,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) (EEHorizontalTextDirection)pDoc->GetEditTextDirection( nTab ) ); } else - lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE) + lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE) EditAlignmentParam aAlignParam(pPattern, pCondSet, lcl_SafeIsValue(pCell)); @@ -2543,9 +2543,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } if ( aAlignParam.meOrient==SVX_ORIENTATION_STANDARD && nAttrRotate ) { - //! Flag setzen, um die Zelle in DrawRotated wiederzufinden ? - //! (oder Flag schon bei DrawBackground, dann hier keine Abfrage) - bHidden = TRUE; // gedreht wird getrennt ausgegeben + //! Flag setzen, um die Zelle in DrawRotated wiederzufinden ? + //! (oder Flag schon bei DrawBackground, dann hier keine Abfrage) + bHidden = TRUE; // gedreht wird getrennt ausgegeben } aAlignParam.mbAsianVertical = (aAlignParam.meOrient == SVX_ORIENTATION_STACKED) && @@ -2565,12 +2565,12 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) ( aAlignParam.mbCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT ); if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust == SVX_HOR_JUSTIFY_REPEAT ) - eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented + eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented if (!bHidden) { - //! mirror margin values for RTL? - //! move margin down to after final GetOutputArea call + //! mirror margin values for RTL? + //! move margin down to after final GetOutputArea call long nTopM, nLeftM, nBottomM, nRightM; aAlignParam.calcMargins(nTopM, nLeftM, nBottomM, nRightM, nPPTX, nPPTY); @@ -2590,15 +2590,15 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) OutputAreaParam aAreaParam; // - // Initial page size - large for normal text, cell size for automatic line breaks + // Initial page size - large for normal text, cell size for automatic line breaks // Size aPaperSize = Size( 1000000, 1000000 ); if (aAlignParam.hasLineBreak()) { - // call GetOutputArea with nNeeded=0, to get only the cell width + // call GetOutputArea with nNeeded=0, to get only the cell width - //! handle nArrY == 0 + //! handle nArrY == 0 GetOutputArea( nXForPos, nArrYForPos, nPosX, nPosY, nCellX, nCellY, 0, *pPattern, sal::static_int_cast<USHORT>(eOutHorJust), aAlignParam.mbCellIsValue, true, false, aAreaParam ); @@ -2625,7 +2625,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) pEngine->SetPaperSize(aPaperSize); // - // Fill the EditEngine (cell attributes and text) + // Fill the EditEngine (cell attributes and text) // // default alignment for asian vertical mode is top-right @@ -2652,7 +2652,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( !bHyphenatorSet && ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { - // set hyphenator the first time it is needed + // set hyphenator the first time it is needed com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); bHyphenatorSet = TRUE; @@ -2667,7 +2667,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) aAlignParam.setAlignmentItems(pEngine, pCell); - // Read content from cell + // Read content from cell BOOL bWrapFields = FALSE; if (pCell) @@ -2683,13 +2683,13 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( aAlignParam.mbBreak && !aAlignParam.mbAsianVertical && pData->HasField() ) { - // Fields aren't wrapped, so clipping is enabled to prevent - // a field from being drawn beyond the cell size + // Fields aren't wrapped, so clipping is enabled to prevent + // a field from being drawn beyond the cell size bWrapFields = TRUE; } } - else + else { DBG_ERROR("pData == 0"); } @@ -2715,17 +2715,17 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( bSyntaxMode ) SetEditSyntaxColor( *pEngine, pCell ); else if ( bUseStyleColor && bForceAutoColor ) - lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine + lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine } else { DBG_ERROR("pCell == NULL"); } - pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight + pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight // - // Get final output area using the calculated width + // Get final output area using the calculated width // long nEngineWidth, nEngineHeight; @@ -2802,7 +2802,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) nNeededPixel = nEngineWidth; nNeededPixel += nLeftM + nRightM; - // No clip marks if "###" doesn't fit (same as in DrawStrings) + // No clip marks if "###" doesn't fit (same as in DrawStrings) } if ( eOutHorJust != SVX_HOR_JUSTIFY_LEFT && aAlignParam.meOrient == SVX_ORIENTATION_STANDARD ) @@ -2823,9 +2823,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( aAlignParam.mbBreak || aAlignParam.meOrient != SVX_ORIENTATION_STANDARD || aAlignParam.mbAsianVertical ) { - // text with automatic breaks is aligned only within the - // edit engine's paper size, the output of the whole area - // is always left-aligned + // text with automatic breaks is aligned only within the + // edit engine's paper size, the output of the whole area + // is always left-aligned nStartX += nLeftM; if (aAlignParam.meOrient == SVX_ORIENTATION_TOPBOTTOM && aAlignParam.meHorJust == SVX_HOR_JUSTIFY_BLOCK) @@ -2849,7 +2849,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } if ( aAreaParam.maClipRect.Right() > nScrX + nScrW ) { - aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? + aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? aAreaParam.mbRightClip = true; } @@ -2860,7 +2860,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( bWrapFields ) { - // Fields in a cell with automatic breaks: clip to cell width + // Fields in a cell with automatic breaks: clip to cell width bClip = TRUE; } @@ -2875,7 +2875,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) bClip = TRUE; } - Size aCellSize; // output area, excluding margins, in logical units + Size aCellSize; // output area, excluding margins, in logical units if (bPixelToLogic) aCellSize = pRefDevice->PixelToLogic( Size( nOutWidth, nOutHeight ) ); else @@ -2887,9 +2887,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) (ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); BOOL bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1; - // Don't clip for text height when printing rows with optimal height, - // except when font size is from conditional formatting. - //! Allow clipping when vertically merged? + // Don't clip for text height when printing rows with optimal height, + // except when font size is from conditional formatting. + //! Allow clipping when vertically merged? if ( eType != OUTTYPE_PRINTER || ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) || ( pCondSet && SFX_ITEM_SET == @@ -2898,12 +2898,12 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) else bSimClip = TRUE; - // Show clip marks if height is at least 5pt too small and - // there are several lines of text. - // Not for asian vertical text, because that would interfere - // with the default right position of the text. - // Only with automatic line breaks, to avoid having to find - // the cells with the horizontal end of the text again. + // Show clip marks if height is at least 5pt too small and + // there are several lines of text. + // Not for asian vertical text, because that would interfere + // with the default right position of the text. + // Only with automatic line breaks, to avoid having to find + // the cells with the horizontal end of the text again. if ( nEngineHeight - aCellSize.Height() > 100 && ( aAlignParam.mbBreak || aAlignParam.meOrient == SVX_ORIENTATION_STACKED ) && !aAlignParam.mbAsianVertical && bMarkClipped && @@ -2912,14 +2912,14 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) CellInfo* pClipMarkCell = NULL; if ( bMerged ) { - // anywhere in the merged area... + // anywhere in the merged area... SCCOL nClipX = ( nX < nX1 ) ? nX1 : nX; pClipMarkCell = &pRowInfo[(nArrY != 0) ? nArrY : 1].pCellInfo[nClipX+1]; } else pClipMarkCell = &pThisRowInfo->pCellInfo[nX+1]; - pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left? + pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left? bAnyClipped = TRUE; long nMarkPixel = (long)( SC_CLIPMARK_SIZE * nPPTX ); @@ -2938,7 +2938,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) else aLogicClip = aAreaParam.maClipRect; - if (bClip) // bei bSimClip nur aClipRect initialisieren + if (bClip) // bei bSimClip nur aClipRect initialisieren { if (bMetaFile) { @@ -2960,7 +2960,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) long nAvailWidth = aCellSize.Width(); // space for AutoFilter is already handled in GetOutputArea - // horizontal alignment + // horizontal alignment if (aAlignParam.meOrient==SVX_ORIENTATION_STANDARD && !aAlignParam.mbAsianVertical) { @@ -2998,7 +2998,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if (aAlignParam.meVerJust==SVX_VER_JUSTIFY_BOTTOM || aAlignParam.meVerJust==SVX_VER_JUSTIFY_STANDARD) { - //! if pRefDevice != pFmtDevice, keep heights in logic units, + //! if pRefDevice != pFmtDevice, keep heights in logic units, //! only converting margin? if (bPixelToLogic) @@ -3019,7 +3019,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) else aLogicStart.Y() += nTopM + (aCellSize.Height() - nEngineHeight) / 2; } - else // top + else // top { if (bPixelToLogic) aLogicStart.Y() += pRefDevice->PixelToLogic(Size(0,nTopM)).Height(); @@ -3095,9 +3095,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( pEngine->IsRightToLeft( 0 ) ) { - // For right-to-left, EditEngine always calculates its lines - // beginning from the right edge, but EditLine::nStartPosX is - // of USHORT type, so the PaperSize must be limited to USHRT_MAX. + // For right-to-left, EditEngine always calculates its lines + // beginning from the right edge, but EditLine::nStartPosX is + // of USHORT type, so the PaperSize must be limited to USHRT_MAX. Size aLogicPaper = pEngine->GetPaperSize(); if ( aLogicPaper.Width() > USHRT_MAX ) { @@ -3111,8 +3111,8 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( bSimClip && !nOriVal && !aAlignParam.mbAsianVertical ) { - // kein hartes Clipping, aber nur die betroffenen - // Zeilen ausgeben + // kein hartes Clipping, aber nur die betroffenen + // Zeilen ausgeben Point aDocStart = aLogicClip.TopLeft(); aDocStart -= aLogicStart; @@ -3122,8 +3122,8 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) { if (aAlignParam.mbAsianVertical) { - // with SetVertical, the start position is top left of - // the whole output area, not the text itself + // with SetVertical, the start position is top left of + // the whole output area, not the text itself aLogicStart.X() -= pEngine->GetPaperSize().Width(); } pEngine->Draw( pDev, aLogicStart, nOriVal ); @@ -3173,14 +3173,14 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) delete pEngine; if (bAnyRotated) - DrawRotated(bPixelToLogic); //! von aussen rufen ? + DrawRotated(bPixelToLogic); //! von aussen rufen ? } -// ------------------------------------------------------------------------------- +// ------------------------------------------------------------------------------- void ScOutputData::DrawRotated(BOOL bPixelToLogic) { - //! nRotMax speichern + //! nRotMax speichern SCCOL nRotMax = nX2; for (SCSIZE nRotY=0; nRotY<nArrCount; nRotY++) if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax) @@ -3189,16 +3189,16 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) ScModule* pScMod = SC_MOD(); sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); ScFieldEditEngine* pEngine = NULL; BOOL bHyphenatorSet = FALSE; const ScPatternAttr* pPattern; - const SfxItemSet* pCondSet; + const SfxItemSet* pCondSet; const ScPatternAttr* pOldPattern = NULL; - const SfxItemSet* pOldCondSet = NULL; + const SfxItemSet* pOldCondSet = NULL; ScBaseCell* pCell = NULL; long nInitPosX = nScrX; @@ -3209,18 +3209,18 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) long nLayoutSign = bLayoutRTL ? -1 : 1; long nRowPosY = nScrY; - for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten + for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; long nCellHeight = (long) pThisRowInfo->nHeight; - if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet + if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet if ( ( pThisRowInfo->bChanged || nArrY==0 ) && pThisRowInfo->nRotMaxCol != SC_ROTMAX_NONE ) { long nPosX = 0; for (SCCOL nX=0; nX<=nRotMax; nX++) { - if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually + if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; if ( pInfo->nRotateDir != SC_ROTDIR_NONE ) @@ -3236,11 +3236,11 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) { if (!pEngine) { - // Ein RefDevice muss auf jeden Fall gesetzt werden, - // sonst legt sich die EditEngine ein VirtualDevice an! + // Ein RefDevice muss auf jeden Fall gesetzt werden, + // sonst legt sich die EditEngine ein VirtualDevice an! pEngine = new ScFieldEditEngine( pDoc->GetEnginePool() ); pEngine->SetUpdateMode( FALSE ); - pEngine->SetRefDevice( pFmtDevice ); // always set + pEngine->SetRefDevice( pFmtDevice ); // always set ULONG nCtrl = pEngine->GetControlWord(); if ( bShowSpellErrors ) nCtrl |= EE_CNTRL_ONLINESPELLING; @@ -3255,12 +3255,12 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) (EEHorizontalTextDirection)pDoc->GetEditTextDirection( nTab ) ); } else - lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE) + lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE) long nPosY = nRowPosY; BOOL bVisChanged = FALSE; - //! Rest von zusammengefasster Zelle weiter oben funktioniert nicht! + //! Rest von zusammengefasster Zelle weiter oben funktioniert nicht! BOOL bFromDoc = FALSE; pPattern = pInfo->pPatternAttr; @@ -3278,7 +3278,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) GetVisibleCell( nX, nY, nTab, pCell ); if ( !pCell || IsEmptyCellText( pThisRowInfo, nX, nY ) ) - bHidden = TRUE; // nRotateDir is also set without a cell + bHidden = TRUE; // nRotateDir is also set without a cell long nCellWidth = (long) pRowInfo[0].pCellInfo[nX+1].nWidth; @@ -3314,7 +3314,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) } long nCellStartX = nStartX; - // Ersatzdarstellung fuer zu kleinen Text weggelassen + // Ersatzdarstellung fuer zu kleinen Text weggelassen if (!bHidden) { @@ -3325,7 +3325,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) else nOutHeight = (long) ( pDoc->GetRowHeight(nY,nTab) * nPPTY ); - if ( bMerged ) // Zusammengefasst + if ( bMerged ) // Zusammengefasst { SCCOL nCountX = pMerge->GetColMerge(); for (SCCOL i=1; i<nCountX; i++) @@ -3365,7 +3365,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if ( !bHyphenatorSet && ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { - // set hyphenator the first time it is needed + // set hyphenator the first time it is needed com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); bHyphenatorSet = TRUE; @@ -3378,9 +3378,9 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) pEngine->SetBackgroundColor( aBackCol ); } - // Raender + // Raender - //! Position und Papersize auf EditUtil umstellen !!! + //! Position und Papersize auf EditUtil umstellen !!! const SvxMarginItem* pMargin = (const SvxMarginItem*) &pPattern->GetItem(ATTR_MARGIN, pCondSet); @@ -3389,7 +3389,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) nIndent = ((const SfxUInt16Item&)pPattern-> GetItem(ATTR_INDENT, pCondSet)).GetValue(); - long nTotalHeight = nOutHeight; // ohne Rand abzuziehen + long nTotalHeight = nOutHeight; // ohne Rand abzuziehen if ( bPixelToLogic ) nTotalHeight = pRefDevice->PixelToLogic(Size(0,nTotalHeight)).Height(); @@ -3402,7 +3402,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) nOutWidth -= nLeftM + nRightM; nOutHeight -= nTopM + nBottomM; - // Rotation schon hier, um bei Umbruch auch PaperSize anzupassen + // Rotation schon hier, um bei Umbruch auch PaperSize anzupassen long nAttrRotate = 0; double nSin = 0.0; double nCos = 1.0; @@ -3417,12 +3417,12 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) pPattern->GetItem(ATTR_ROTATE_MODE, pCondSet)).GetValue(); if ( nAttrRotate == 18000 ) - eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf + eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf if ( bLayoutRTL ) nAttrRotate = -nAttrRotate; - double nRealOrient = nAttrRotate * F_PI18000; // 1/100 Grad + double nRealOrient = nAttrRotate * F_PI18000; // 1/100 Grad nCos = cos( nRealOrient ); nSin = sin( nRealOrient ); } @@ -3430,15 +3430,15 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) Size aPaperSize = Size( 1000000, 1000000 ); if (eOrient==SVX_ORIENTATION_STACKED) - aPaperSize.Width() = nOutWidth; // zum Zentrieren + aPaperSize.Width() = nOutWidth; // zum Zentrieren else if (bBreak) { if (nAttrRotate) { - //! richtige PaperSize fuer Umbruch haengt von der Zeilenzahl - //! ab, solange die Zeilen nicht einzeln versetzt ausgegeben - //! werden koennen -> darum unbegrenzt, also kein Umbruch. - //! Mit versetzten Zeilen waere das folgende richtig: + //! richtige PaperSize fuer Umbruch haengt von der Zeilenzahl + //! ab, solange die Zeilen nicht einzeln versetzt ausgegeben + //! werden koennen -> darum unbegrenzt, also kein Umbruch. + //! Mit versetzten Zeilen waere das folgende richtig: aPaperSize.Width() = (long)(nOutHeight / fabs(nSin)); } else if (eOrient == SVX_ORIENTATION_STANDARD) @@ -3449,9 +3449,9 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if (bPixelToLogic) pEngine->SetPaperSize(pRefDevice->PixelToLogic(aPaperSize)); else - pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1 + pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1 - // Daten aus Zelle lesen + // Daten aus Zelle lesen if (pCell) { @@ -3488,14 +3488,14 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if ( bSyntaxMode ) SetEditSyntaxColor( *pEngine, pCell ); else if ( bUseStyleColor && bForceAutoColor ) - lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine + lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine } else { DBG_ERROR("pCell == NULL"); } - pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight + pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight long nEngineWidth = (long) pEngine->CalcTextWidth(); long nEngineHeight = pEngine->GetTextHeight(); @@ -3534,7 +3534,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if (bPixelToLogic) pEngine->SetPaperSize(pRefDevice->PixelToLogic(aPaperSize)); else - pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1 + pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1 //pEngine->QuickFormatDoc( TRUE ); nEngineWidth = (long) pEngine->CalcTextWidth(); nEngineHeight = pEngine->GetTextHeight(); @@ -3545,7 +3545,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) long nRealWidth = nEngineWidth; long nRealHeight = nEngineHeight; - // wenn gedreht, Groesse anpassen + // wenn gedreht, Groesse anpassen if (nAttrRotate) { double nAbsCos = fabs( nCos ); @@ -3556,29 +3556,29 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) nRealHeight * nAbsSin ); else nEngineWidth = (long) ( nRealHeight / nAbsSin ); - //! begrenzen !!! + //! begrenzen !!! nEngineHeight = (long) ( nRealHeight * nAbsCos + nRealWidth * nAbsSin ); } - if (!nAttrRotate) // hier nur gedrehter Text - bHidden = TRUE; //! vorher abfragen !!! + if (!nAttrRotate) // hier nur gedrehter Text + bHidden = TRUE; //! vorher abfragen !!! - //! weglassen, was nicht hereinragt + //! weglassen, was nicht hereinragt if (!bHidden) { BOOL bClip = FALSE; Size aClipSize = Size( nScrX+nScrW-nStartX, nScrY+nScrH-nStartY ); - // weiterschreiben + // weiterschreiben Size aCellSize; if (bPixelToLogic) aCellSize = pRefDevice->PixelToLogic( Size( nOutWidth, nOutHeight ) ); else - aCellSize = Size( nOutWidth, nOutHeight ); // Scale ist 1 + aCellSize = Size( nOutWidth, nOutHeight ); // Scale ist 1 long nGridWidth = nEngineWidth; BOOL bNegative = FALSE; @@ -3600,7 +3600,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) SvxCellHorJustify eOutHorJust = eHorJust; if ( eRotMode != SVX_ROTATE_MODE_STANDARD ) eOutHorJust = bNegative ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT; - long nNeededWidth = nGridWidth; // in pixel for GetOutputArea + long nNeededWidth = nGridWidth; // in pixel for GetOutputArea if ( bPixelToLogic ) nNeededWidth = pRefDevice->LogicToPixel(Size(nNeededWidth,0)).Width(); @@ -3645,7 +3645,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) { //! Clipping unnoetig, wenn links am Fenster - bClip = TRUE; // nur Rest ausgeben! + bClip = TRUE; // nur Rest ausgeben! if (nStartX<nScrX) { long nDif = nScrX - nStartX; @@ -3666,15 +3666,15 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) } } - bClip = TRUE; // always clip at the window/page border + bClip = TRUE; // always clip at the window/page border //Rectangle aClipRect; if (bClip) { if ( nAttrRotate /* && eRotMode != SVX_ROTATE_MODE_STANDARD */ ) { - // gedrehten, ausgerichteten Text nur an den - // Seitengrenzen clippen + // gedrehten, ausgerichteten Text nur an den + // Seitengrenzen clippen nClipStartX = nScrX; aClipSize.Width() = nScrW; } @@ -3684,7 +3684,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) Point(nClipStartX,nClipStartY), aClipSize ) ); else aAreaParam.maClipRect = Rectangle(Point(nClipStartX, nClipStartY), - aClipSize ); // Scale = 1 + aClipSize ); // Scale = 1 if (bMetaFile) { @@ -3716,7 +3716,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if (nAvailWidth<nComp) nAvailWidth=nComp; } - // horizontale Ausrichtung + // horizontale Ausrichtung if (eOrient==SVX_ORIENTATION_STANDARD && !nAttrRotate) { @@ -3742,7 +3742,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) } else { - // bei gedrehtem Text ist Standard zentriert + // bei gedrehtem Text ist Standard zentriert if (eHorJust==SVX_HOR_JUSTIFY_RIGHT) aLogicStart.X() += nAvailWidth - nEngineWidth; else if (eHorJust==SVX_HOR_JUSTIFY_CENTER || @@ -3801,7 +3801,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) double nAddY = 0.0; if ( nCos > 0.0 && eRotMode != SVX_ROTATE_MODE_STANDARD ) { - //! begrenzen !!! + //! begrenzen !!! double nH = nRealHeight * nCos; nAddX += nH * ( nCos / fabs(nSin) ); } @@ -3816,7 +3816,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if ( eRotMode != SVX_ROTATE_MODE_STANDARD ) { - //! begrenzen !!! + //! begrenzen !!! double nSkew = nTotalHeight * nCos / fabs(nSin); if ( eRotMode == SVX_ROTATE_MODE_CENTER ) nAddX -= nSkew * 0.5; @@ -3832,7 +3832,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if ( nSin > 0.0 ) nUp = aCellSize.Height() - nEngineHeight; } - else // BOTTOM / STANDARD + else // BOTTOM / STANDARD { if ( nSin < 0.0 ) nUp = aCellSize.Height() - nEngineHeight; @@ -3845,13 +3845,13 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) aLogicStart.Y() += (long) nAddY; } - // bSimClip is not used here (because nOriVal is set) + // bSimClip is not used here (because nOriVal is set) if ( pEngine->IsRightToLeft( 0 ) ) { - // For right-to-left, EditEngine always calculates its lines - // beginning from the right edge, but EditLine::nStartPosX is - // of USHORT type, so the PaperSize must be limited to USHRT_MAX. + // For right-to-left, EditEngine always calculates its lines + // beginning from the right edge, but EditLine::nStartPosX is + // of USHORT type, so the PaperSize must be limited to USHRT_MAX. Size aLogicPaper = pEngine->GetPaperSize(); if ( aLogicPaper.Width() > USHRT_MAX ) { diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index b5bb920fb209..2ec9395c2e5f 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.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 @@ -95,7 +95,7 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY ) aRect.Top() = (long) (aRect.Top() * HMM_PER_TWIPS); aRect.Right() = (long) (aRect.Right() * HMM_PER_TWIPS); aRect.Bottom() = (long) (aRect.Bottom() * HMM_PER_TWIPS); - + if(pViewShell || pDrawView) { SdrView* pLocalDrawView = (pDrawView) ? pDrawView : pViewShell->GetSdrView(); @@ -123,7 +123,7 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY ) } // #i72502# -void ScOutputData::PostPrintDrawingLayer(const Point& rMMOffset) // #i74768# +void ScOutputData::PostPrintDrawingLayer(const Point& rMMOffset) // #i74768# { // #i74768# just use offset as in PrintDrawingLayer() to also get the form controls // painted with offset @@ -157,14 +157,14 @@ void ScOutputData::PostPrintDrawingLayer(const Point& rMMOffset) // #i74768# void ScOutputData::PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOffset) { bool bHideAllDrawingLayer(false); - + if(pViewShell || pDrawView) { SdrView* pLocalDrawView = (pDrawView) ? pDrawView : pViewShell->GetSdrView(); if(pLocalDrawView) { - bHideAllDrawingLayer = pLocalDrawView->getHideOle() && pLocalDrawView->getHideChart() + bHideAllDrawingLayer = pLocalDrawView->getHideOle() && pLocalDrawView->getHideChart() && pLocalDrawView->getHideDraw() && pLocalDrawView->getHideFormControl(); } } @@ -241,14 +241,14 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer) return; } -// Teile nur fuer Bildschirm +// Teile nur fuer Bildschirm // #109985# void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) { - BOOL bHad = FALSE; - long nPosY = nScrY; - SCSIZE nArrY; + BOOL bHad = FALSE; + long nPosY = nScrY; + SCSIZE nArrY; for (nArrY=1; nArrY+1<nArrCount; nArrY++) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx index 5fe990aad697..c9264bc4b618 100644 --- a/sc/source/ui/view/pfuncache.cxx +++ b/sc/source/ui/view/pfuncache.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 @@ ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark, nTotalPages( 0 ), bLocInitialized( false ) { - // page count uses the stored cell widths for the printer anyway, - // so ScPrintFunc with the document's printer can be used to count + // page count uses the stored cell widths for the printer anyway, + // so ScPrintFunc with the document's printer can be used to count SfxPrinter* pPrinter = pDocSh->GetPrinter(); @@ -77,7 +77,7 @@ ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark, ScPrintFunc aFunc( pDocSh, pPrinter, nTab, nAttrPage, 0, pSelRange, &aSelection.GetOptions() ); nThisTab = aFunc.GetTotalPages(); - nFirstAttr[nTab] = aFunc.GetFirstPageNo(); // from page style or previous sheet + nFirstAttr[nTab] = aFunc.GetFirstPageNo(); // from page style or previous sheet } else nFirstAttr[nTab] = nAttrPage; @@ -154,7 +154,7 @@ bool ScPrintFuncCache::FindLocation( const ScAddress& rCell, ScPrintPageLocation return true; } } - return false; // not found + return false; // not found } BOOL ScPrintFuncCache::IsSameSelection( const ScPrintSelectionStatus& rStatus ) const @@ -182,7 +182,7 @@ long ScPrintFuncCache::GetTabStart( SCTAB nTab ) const long ScPrintFuncCache::GetDisplayStart( SCTAB nTab ) const { - //! merge with lcl_GetDisplayStart in preview? + //! merge with lcl_GetDisplayStart in preview? long nDisplayStart = 0; ScDocument* pDoc = pDocSh->GetDocument(); diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index e1d493dd3f24..8516475f9050 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.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/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index f23082e1a041..f50feafd98a0 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.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/view/preview.cxx b/sc/source/ui/view/preview.cxx index 3222ef64531c..6e970f318d07 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.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,7 +62,7 @@ #include "drwlayer.hxx" #include "scmod.hxx" #include "globstr.hrc" -#include "sc.hrc" // fuer ShellInvalidate +#include "sc.hrc" // fuer ShellInvalidate #include "AccessibleDocumentPagePreview.hxx" #include <vcl/lineinfo.hxx> #include <svx/algitem.hxx> @@ -80,7 +80,7 @@ //================================================================== -#define SC_PREVIEW_SHADOWSIZE 2 +#define SC_PREVIEW_SHADOWSIZE 2 long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, long* pPages ) { @@ -150,10 +150,10 @@ __EXPORT ScPreview::~ScPreview() delete pLocationData; } -void ScPreview::UpdateDrawView() // nTab muss richtig sein +void ScPreview::UpdateDrawView() // nTab muss richtig sein { ScDocument* pDoc = pDocShell->GetDocument(); - ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0 + ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0 // #114135# if ( pModel ) @@ -161,12 +161,12 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein SdrPage* pPage = pModel->GetPage(nTab); if ( pDrawView && ( !pDrawView->GetSdrPageView() || pDrawView->GetSdrPageView()->GetPage() != pPage ) ) { - // die angezeigte Page der DrawView umzustellen (s.u.) funktioniert nicht ?!? + // die angezeigte Page der DrawView umzustellen (s.u.) funktioniert nicht ?!? delete pDrawView; pDrawView = NULL; } - if ( !pDrawView ) // neu anlegen? + if ( !pDrawView ) // neu anlegen? { pDrawView = new FmFormView( pModel, this ); // #55259# die DrawView uebernimmt den Design-Modus vom Model @@ -178,7 +178,7 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein } else if ( pDrawView ) { - delete pDrawView; // fuer diese Tabelle nicht gebraucht + delete pDrawView; // fuer diese Tabelle nicht gebraucht pDrawView = NULL; } } @@ -192,7 +192,7 @@ void ScPreview::TestLastPage() { nPageNo = nTotalPages - 1; nTab = nTabCount - 1; - while (nTab > 0 && !nPages[nTab]) // letzte nicht leere Tabelle + while (nTab > 0 && !nPages[nTab]) // letzte nicht leere Tabelle --nTab; DBG_ASSERT(nPages[nTab],"alle Tabellen leer?"); nTabPage = nPages[nTab] - 1; @@ -203,7 +203,7 @@ void ScPreview::TestLastPage() ScDocument* pDoc = pDocShell->GetDocument(); nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages ); } - else // leeres Dokument + else // leeres Dokument { nTab = 0; nPageNo = nTabPage = nTabStart = nDisplayStart = 0; @@ -240,8 +240,8 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ ) // instead of a separate progress for each sheet from ScPrintFunc pDocShell->UpdatePendingRowHeights( nAnz-1, true ); - // PrintOptions is passed to PrintFunc for SkipEmpty flag, - // but always all sheets are used (there is no selected sheet) + // PrintOptions is passed to PrintFunc for SkipEmpty flag, + // but always all sheets are used (there is no selected sheet) ScPrintOptions aOptions = SC_MOD()->GetPrintOptions(); ScMarkData aMarkData; @@ -262,7 +262,7 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ ) long nThisTab = aPrintFunc.GetTotalPages(); nPages[i] = nThisTab; nTotalPages += nThisTab; - nFirstAttr[i] = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage + nFirstAttr[i] = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage if (nPageNo>=nThisStart && nPageNo<nTotalPages) { @@ -280,7 +280,7 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ ) if (nAnz > nTabsTested) nTabsTested = nAnz; - // testen, ob hinter letzter Seite + // testen, ob hinter letzter Seite if ( nTabsTested >= nTabCount ) TestLastPage(); @@ -293,10 +293,10 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ ) } -void ScPreview::RecalcPages() // nur nPageNo geaendert +void ScPreview::RecalcPages() // nur nPageNo geaendert { if (!bValid) - return; // dann wird CalcPages aufgerufen + return; // dann wird CalcPages aufgerufen SCTAB nOldTab = nTab; @@ -321,7 +321,7 @@ void ScPreview::RecalcPages() // nur nPageNo geaendert nTabPage = nPageNo - nThisStart; nTabStart = nThisStart; -// aPageSize = aPrintFunc.GetPageSize(); +// aPageSize = aPrintFunc.GetPageSize(); } } @@ -329,7 +329,7 @@ void ScPreview::RecalcPages() // nur nPageNo geaendert nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages ); } - TestLastPage(); // testen, ob hinter letzter Seite + TestLastPage(); // testen, ob hinter letzter Seite if ( nTab != nOldTab ) bStateValid = FALSE; @@ -344,7 +344,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) { CalcPages(0); RecalcPages(); - UpdateDrawView(); // Tabelle evtl. geaendert + UpdateDrawView(); // Tabelle evtl. geaendert } Fraction aPreviewZoom( nZoom, 100 ); @@ -400,9 +400,9 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) DBG_ASSERT(nPrinted<=1, "was'n nu los?"); SetMapMode(aMMMode); -// USHORT nPrintZoom = pPrintFunc->GetZoom(); +// USHORT nPrintZoom = pPrintFunc->GetZoom(); - if (nPrinted) // wenn nichts, alles grau zeichnen + if (nPrinted) // wenn nichts, alles grau zeichnen { aLocalPageSize = pPrintFunc->GetPageSize(); aLocalPageSize.Width() = (long) (aLocalPageSize.Width() * HMM_PER_TWIPS ); @@ -438,7 +438,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) if (bBottom) { if (bRight) - DrawRect(Rectangle(0,nPageEndY, nPageEndX,aWinEnd.Y())); // Ecke nicht doppelt + DrawRect(Rectangle(0,nPageEndY, nPageEndX,aWinEnd.Y())); // Ecke nicht doppelt else DrawRect(Rectangle(0,nPageEndY, aWinEnd.X(),aWinEnd.Y())); } @@ -448,7 +448,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) { Color aBorderColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); - // draw border + // draw border if ( aOffset.X() <= 0 || aOffset.Y() <= 0 || bRight || bBottom ) { @@ -461,7 +461,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) DrawRect( PixelToLogic( aPixel ) ); } - // draw shadow + // draw shadow SetLineColor(); SetFillColor( aBorderColor ); @@ -753,7 +753,7 @@ String ScPreview::GetPosString() if (!bValid) { CalcPages(nTab); - UpdateDrawView(); // Tabelle evtl. geaendert + UpdateDrawView(); // Tabelle evtl. geaendert } String aString( ScGlobal::GetRscString( STR_PAGE ) ); @@ -780,14 +780,14 @@ void ScPreview::SetZoom(USHORT nNewZoom) { nZoom = nNewZoom; - // apply new MapMode and call UpdateScrollBars to update aOffset + // apply new MapMode and call UpdateScrollBars to update aOffset Fraction aPreviewZoom( nZoom, 100 ); Fraction aHorPrevZoom( (long)( 100 * nZoom / pDocShell->GetOutputFactor() ), 10000 ); MapMode aMMMode( MAP_100TH_MM, Point(), aHorPrevZoom, aPreviewZoom ); SetMapMode( aMMMode ); - bInPaint = TRUE; // don't scroll during SetYOffset in UpdateScrollBars + bInPaint = TRUE; // don't scroll during SetYOffset in UpdateScrollBars pViewShell->UpdateScrollBars(); bInPaint = FALSE; @@ -803,7 +803,7 @@ void ScPreview::SetPageNo( long nPage ) { nPageNo = nPage; RecalcPages(); - UpdateDrawView(); // Tabelle evtl. geaendert + UpdateDrawView(); // Tabelle evtl. geaendert InvalidateLocationData( SC_HINT_DATACHANGED ); Invalidate(); } @@ -819,7 +819,7 @@ long ScPreview::GetFirstPage(SCTAB nTabP) if (nTabP>0) { CalcPages( nTabP ); - UpdateDrawView(); // Tabelle evtl. geaendert + UpdateDrawView(); // Tabelle evtl. geaendert for (SCTAB i=0; i<nTabP; i++) nPage += nPages[i]; @@ -858,9 +858,9 @@ USHORT ScPreview::GetOptimalZoom(BOOL bWidthOnly) double nWinScaleY = ScGlobal::nScreenPPTY; Size aWinSize = GetOutputSizePixel(); - // desired margin is 0.25cm in default MapMode (like Writer), - // but some additional margin is introduced by integer scale values - // -> add only 0.10cm, so there is some margin in all cases. + // desired margin is 0.25cm in default MapMode (like Writer), + // but some additional margin is introduced by integer scale values + // -> add only 0.10cm, so there is some margin in all cases. Size aMarginSize( LogicToPixel( Size( 100, 100 ), MAP_100TH_MM ) ); aWinSize.Width() -= 2 * aMarginSize.Width(); aWinSize.Height() -= 2 * aMarginSize.Height(); @@ -943,19 +943,19 @@ void ScPreview::SetYOffset( long nY ) void ScPreview::DoInvalidate() { - // Wenn das ganze aus dem GetState der Shell gerufen wird, - // muss das Invalidate hinterher asynchron kommen... + // Wenn das ganze aus dem GetState der Shell gerufen wird, + // muss das Invalidate hinterher asynchron kommen... if (bInGetState) Application::PostUserEvent( STATIC_LINK( this, ScPreview, InvalidateHdl ) ); else - StaticInvalidate(); // sofort + StaticInvalidate(); // sofort } void ScPreview::StaticInvalidate() { - // static method, because it's called asynchronously - // -> must use current viewframe + // static method, because it's called asynchronously + // -> must use current viewframe SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (!pViewFrm) @@ -1000,8 +1000,8 @@ void ScPreview::DataChanged( const DataChangedEvent& rDCEvt ) if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - // scroll bar size may have changed - pViewShell->InvalidateBorder(); // calls OuterResizePixel + // scroll bar size may have changed + pViewShell->InvalidateBorder(); // calls OuterResizePixel } Invalidate(); diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 22e24170fba0..94580c084ca1 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.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 @@ -56,11 +56,11 @@ enum ScPreviewLocationType struct ScPreviewLocationEntry { - ScPreviewLocationType eType; - Rectangle aPixelRect; - ScRange aCellRange; - BOOL bRepeatCol; - BOOL bRepeatRow; + ScPreviewLocationType eType; + Rectangle aPixelRect; + ScRange aCellRange; + BOOL bRepeatCol; + BOOL bRepeatRow; ScPreviewLocationEntry( ScPreviewLocationType eNewType, const Rectangle& rPixel, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow ) : @@ -113,12 +113,12 @@ void ScPreviewTableInfo::LimitToArea( const Rectangle& rPixelArea ) { if ( pColInfo ) { - // cells completely left of the visible area + // cells completely left of the visible area SCCOL nStart = 0; while ( nStart < nCols && pColInfo[nStart].nPixelEnd < rPixelArea.Left() ) ++nStart; - // cells completely right of the visible area + // cells completely right of the visible area SCCOL nEnd = nCols; while ( nEnd > 0 && pColInfo[nEnd-1].nPixelStart > rPixelArea.Right() ) --nEnd; @@ -134,18 +134,18 @@ void ScPreviewTableInfo::LimitToArea( const Rectangle& rPixelArea ) SetColInfo( nNewCount, pNewInfo ); } else - SetColInfo( 0, NULL ); // all invisible + SetColInfo( 0, NULL ); // all invisible } } if ( pRowInfo ) { - // cells completely above the visible area + // cells completely above the visible area SCROW nStart = 0; while ( nStart < nRows && pRowInfo[nStart].nPixelEnd < rPixelArea.Top() ) ++nStart; - // cells completely below the visible area + // cells completely below the visible area SCROW nEnd = nRows; while ( nEnd > 0 && pRowInfo[nEnd-1].nPixelStart > rPixelArea.Bottom() ) --nEnd; @@ -161,7 +161,7 @@ void ScPreviewTableInfo::LimitToArea( const Rectangle& rPixelArea ) SetRowInfo( nNewCount, pNewInfo ); } else - SetRowInfo( 0, NULL ); // all invisible + SetRowInfo( 0, NULL ); // all invisible } } } @@ -231,7 +231,7 @@ void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange& void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol ) { - SCTAB nTab = 0; //! ? + SCTAB nTab = 0; //! ? ScRange aRange( nStartCol, 0, nTab, nEndCol, 0, nTab ); Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_COLHEADER, aPixelRect, aRange, bRepCol, FALSE ) ); @@ -239,7 +239,7 @@ void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartC void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow ) { - SCTAB nTab = 0; //! ? + SCTAB nTab = 0; //! ? ScRange aRange( 0, nStartRow, nTab, 0, nEndRow, nTab ); Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_ROWHEADER, aPixelRect, aRange, FALSE, bRepRow ) ); @@ -247,7 +247,7 @@ void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartR void ScPreviewLocationData::AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft ) { - ScRange aRange; //! ? + ScRange aRange; //! ? Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); ScPreviewLocationType eType = bHeader ? @@ -534,7 +534,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev aMainRect.Top() = pEntry->aPixelRect.Top(); aMainRect.Bottom() = pEntry->aPixelRect.Bottom(); } - nTab = pEntry->aCellRange.aStart.Tab(); //! store separately? + nTab = pEntry->aCellRange.aStart.Tab(); //! store separately? } else if ( pEntry->eType == SC_PLOC_ROWHEADER ) { @@ -553,7 +553,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } // - // get column info + // get column info // SCCOL nColCount = 0; @@ -623,7 +623,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev rInfo.SetColInfo( 0, NULL ); // - // get row info + // get row info // SCROW nRowCount = 0; @@ -692,7 +692,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev rInfo.SetRowInfo( 0, NULL ); // - // limit to visible area + // limit to visible area // rInfo.SetTab( nTab ); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index ec316617e20e..ca75165ebb2b 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.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 @@ -80,12 +80,12 @@ #include "sc.hrc" #include "scabstdlg.hxx" -// fuer Rad-Maus -#define SC_DELTA_ZOOM 10 +// fuer Rad-Maus +#define SC_DELTA_ZOOM 10 #define MINZOOM_SLIDER 10 #define MAXZOOM_SLIDER 400 -#define SC_USERDATA_SEP ';' +#define SC_USERDATA_SEP ';' using namespace com::sun::star; @@ -136,7 +136,7 @@ void ScPreviewShell::Construct( Window* pParent ) if (pDrawBC) StartListening(*pDrawBC); -// pPreview->Show(); // wird vom Sfx angezeigt +// pPreview->Show(); // wird vom Sfx angezeigt pHorScroll->Show(); pVerScroll->Show(); pCorner->Show(); @@ -155,17 +155,17 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, if ( pOldSh && pOldSh->ISA( ScTabViewShell ) ) { - // store view settings, show table from TabView - //! store live ScViewData instead, and update on ScTablesHint? - //! or completely forget aSourceData on ScTablesHint? + // store view settings, show table from TabView + //! store live ScViewData instead, and update on ScTablesHint? + //! or completely forget aSourceData on ScTablesHint? ScTabViewShell* pTabViewShell = ((ScTabViewShell*)pOldSh); ScViewData* pData = pTabViewShell->GetViewData(); pData->WriteUserDataSequence( aSourceData ); InitStartTable( pData->GetTabNo() ); - // #106334# also have to store the TabView's DesignMode state - // (only if draw view exists) + // #106334# also have to store the TabView's DesignMode state + // (only if draw view exists) SdrView* pDrawView = pTabViewShell->GetSdrView(); if ( pDrawView ) nSourceDesignMode = pDrawView->IsDesignMode(); @@ -190,8 +190,8 @@ __EXPORT ScPreviewShell::~ScPreviewShell() delete pVerScroll; delete pCorner; - // #97612# normal mode of operation is switching back to default view in the same frame, - // so there's no need to activate any other window here anymore + // #97612# normal mode of operation is switching back to default view in the same frame, + // so there's no need to activate any other window here anymore } void ScPreviewShell::InitStartTable(SCTAB nTab) @@ -214,11 +214,11 @@ Size __EXPORT ScPreviewShell::GetOptimalSizePixel() const if ( pViewSh ) { - ScViewData* pViewData = pViewSh->GetViewData(); - SCTAB nCurTab = pViewData->GetTabNo(); - ScDocument* pDoc = pDocShell->GetDocument(); - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = pStylePool->Find( + ScViewData* pViewData = pViewSh->GetViewData(); + SCTAB nCurTab = pViewData->GetTabNo(); + ScDocument* pDoc = pDocShell->GetDocument(); + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nCurTab ), SFX_STYLE_FAMILY_PAGE ); @@ -226,9 +226,9 @@ Size __EXPORT ScPreviewShell::GetOptimalSizePixel() const if ( pStyleSheet ) { - const SfxItemSet& rSet = pStyleSheet->GetItemSet(); - const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE ); - const Size& rPageSize = rItem.GetSize(); + const SfxItemSet& rSet = pStyleSheet->GetItemSet(); + const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE ); + const Size& rPageSize = rItem.GetSize(); aOptSize.Width() = (long) (rPageSize.Width() * pViewData->GetPPTX()); aOptSize.Height() = (long) (rPageSize.Height() * pViewData->GetPPTY()); @@ -246,8 +246,8 @@ void __EXPORT ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size { long nBarW = GetViewFrame()->GetWindow().GetSettings().GetStyleSettings().GetScrollBarSize(); long nBarH = nBarW; -// long nBarW = pVerScroll->GetSizePixel().Width(); -// long nBarH = pHorScroll->GetSizePixel().Height(); +// long nBarW = pVerScroll->GetSizePixel().Width(); +// long nBarH = pHorScroll->GetSizePixel().Height(); Size aOutSize( rSize.Width()-nBarW, rSize.Height()-nBarH ); pPreview->SetPosSizePixel( rPos, aOutSize ); @@ -281,8 +281,8 @@ void ScPreviewShell::UpdateScrollBars() ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab = pPreview->GetTab(); - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ), + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE ); DBG_ASSERT(pStyleSheet,"StyleSheet nicht gefunden"); if (!pStyleSheet) return; @@ -292,7 +292,7 @@ void ScPreviewShell::UpdateScrollBars() aPageSize.Width() = (long) (aPageSize.Width() * HMM_PER_TWIPS ); aPageSize.Height() = (long) (aPageSize.Height() * HMM_PER_TWIPS ); - // for centering, page size without the shadow is used + // for centering, page size without the shadow is used Size aWindowSize = pPreview->GetOutputSize(); @@ -308,25 +308,25 @@ void ScPreviewShell::UpdateScrollBars() nMaxPos = aPageSize.Width() - aWindowSize.Width(); if ( nMaxPos<0 ) { - // page smaller than window -> center (but put scrollbar to 0) + // page smaller than window -> center (but put scrollbar to 0) aOfs.X() = 0; pPreview->SetXOffset( nMaxPos / 2 ); } else if (aOfs.X() < 0) { - // page larger than window -> never use negative offset + // page larger than window -> never use negative offset aOfs.X() = 0; pPreview->SetXOffset( 0 ); } else if (aOfs.X() > nMaxPos) { - // limit offset to align with right edge of window + // limit offset to align with right edge of window aOfs.X() = nMaxPos; pPreview->SetXOffset(nMaxPos); } pHorScroll->SetThumbPos( aOfs.X() ); } - + if( pVerScroll ) { long nPageNo = pPreview->GetPageNo(); @@ -338,7 +338,7 @@ void ScPreviewShell::UpdateScrollBars() pVerScroll->SetVisibleSize( aWindowSize.Height() ); if ( nMaxVertPos < 0 ) { - // page smaller than window -> center (but put scrollbar to 0) + // page smaller than window -> center (but put scrollbar to 0) aOfs.Y() = 0; pPreview->SetYOffset( nMaxVertPos / 2 ); pVerScroll->SetThumbPos( nPageNo * aWindowSize.Height() ); @@ -346,7 +346,7 @@ void ScPreviewShell::UpdateScrollBars() } else if (aOfs.Y() < 0) { - // page larger than window -> never use negative offset + // page larger than window -> never use negative offset pVerScroll->SetRange( Range( 0, aPageSize.Height() ) ); aOfs.Y() = 0; pPreview->SetYOffset( 0 ); @@ -354,7 +354,7 @@ void ScPreviewShell::UpdateScrollBars() } else if (aOfs.Y() > nMaxVertPos ) { - // limit offset to align with window bottom + // limit offset to align with window bottom pVerScroll->SetRange( Range( 0, aPageSize.Height() ) ); aOfs.Y() = nMaxVertPos; pPreview->SetYOffset( nMaxVertPos ); @@ -418,7 +418,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) } else if( nDelta > 0 ) { - BOOL bAllTested = pPreview->AllTested(); + BOOL bAllTested = pPreview->AllTested(); if ( nTotalPages && ( nPageNo < nTotalPages || !bAllTested ) ) pPreview->SetPageNo( nPageNo ); @@ -431,10 +431,10 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) } aRect.Left() = aPos.X() - 8; - aRect.Top() = aMousePos.Y(); - aRect.Right() = aRect.Left(); - aRect.Top() = aRect.Top(); - nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; + aRect.Top() = aMousePos.Y(); + aRect.Right() = aRect.Left(); + aRect.Top() = aRect.Top(); + nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; Help::ShowQuickHelp( pScroll->GetParent(), aRect, aHelpStr, nAlign ); } } @@ -483,15 +483,15 @@ USHORT __EXPORT ScPreviewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDif PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent ) { - pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen + pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen (void)GetPrinter(); - const long nCurPage = pPreview->GetPageNo()+1; - const long nDocPageMax = pPreview->GetTotalPages(); + const long nCurPage = pPreview->GetPageNo()+1; + const long nDocPageMax = pPreview->GetTotalPages(); PrintDialog* pDlg = new PrintDialog( pParent, true ); // wenn zu langsam wieder einbauen -// if ( pPreview->AllTested() ) -// nPageMax = pPreview->GetTotalPages(); +// if ( pPreview->AllTested() ) +// nPageMax = pPreview->GetTotalPages(); pDlg->EnableSheetRange( true, PRINTSHEETS_ALL ); pDlg->EnableSheetRange( true, PRINTSHEETS_SELECTED_SHEETS ); @@ -502,13 +502,13 @@ PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent ) if ( nDocPageMax > 0 ) pDlg->SetRangeText( String::CreateFromInt32( nCurPage ) ); - pDlg->EnableRange ( PRINTDIALOG_ALL ); - pDlg->EnableRange ( PRINTDIALOG_RANGE ); - pDlg->SetFirstPage ( 1 ); - pDlg->SetMinPage ( 1 ); - pDlg->SetLastPage ( (USHORT)nDocPageMax ); - pDlg->SetMaxPage ( (USHORT)nDocPageMax ); - pDlg->EnableCollate (); + pDlg->EnableRange ( PRINTDIALOG_ALL ); + pDlg->EnableRange ( PRINTDIALOG_RANGE ); + pDlg->SetFirstPage ( 1 ); + pDlg->SetMinPage ( 1 ); + pDlg->SetLastPage ( (USHORT)nDocPageMax ); + pDlg->SetMaxPage ( (USHORT)nDocPageMax ); + pDlg->EnableCollate (); // Selektion hier nicht @@ -519,7 +519,7 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); - ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); + ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); if ( ScTpPrintOptionsCreate ) return (*ScTpPrintOptionsCreate)( pParent, rOptions); return 0; @@ -553,7 +553,7 @@ ErrCode ScPreviewShell::DoPrint( SfxPrinter *pPrinter, USHORT __EXPORT ScPreviewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog ) { - pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen + pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen // get the list of affected sheets before SfxViewShell::Print bool bAllTabs = ( pPrintDialog ? ( pPrintDialog->GetCheckedSheetRange() == PRINTSHEETS_ALL ) : SC_MOD()->GetPrintOptions().GetAllSheets() ); @@ -591,12 +591,12 @@ void __EXPORT ScPreviewShell::Activate(BOOL bMDI) { SfxViewShell::Activate(bMDI); - //! Basic etc. -> auslagern in eigene Datei (s. tabvwsh4) + //! Basic etc. -> auslagern in eigene Datei (s. tabvwsh4) if (bMDI) { // InputHdl ist jetzt meistens Null, keine Assertion mehr! - ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); + ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); if ( pInputHdl ) pInputHdl->NotifyChange( NULL ); } @@ -641,7 +641,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) case SID_NEXT_TABLE: // Accelerator case SID_PREVIEW_NEXT: { - BOOL bAllTested = pPreview->AllTested(); + BOOL bAllTested = pPreview->AllTested(); long nPage = pPreview->GetPageNo(); long nTotal = pPreview->GetTotalPages(); if (nTotal && (nPage+1 < nTotal || !bAllTested)) @@ -672,8 +672,8 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) case SID_ATTR_ZOOM: case FID_SCALE: { - USHORT nZoom = 100; - BOOL bCancel = FALSE; + USHORT nZoom = 100; + BOOL bCancel = FALSE; eZoom = SVX_ZOOM_PERCENT; @@ -688,8 +688,8 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) } else { - SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); - SvxZoomItem aZoomItem( SVX_ZOOM_PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM ); + SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); + SvxZoomItem aZoomItem( SVX_ZOOM_PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM ); aSet.Put( aZoomItem ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -703,7 +703,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) if ( !bCancel ) { - const SvxZoomItem& rZoomItem = (const SvxZoomItem&) + const SvxZoomItem& rZoomItem = (const SvxZoomItem&) pDlg->GetOutputItemSet()-> Get( SID_ATTR_ZOOM ); @@ -775,7 +775,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) pPreview->SetZoom( nCurrentZoom ); rReq.Done(); } - } + } } break; case SID_PREVIEW_SCALINGFACTOR: @@ -801,9 +801,9 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) break; case SID_PRINTPREVIEW: case SID_PREVIEW_CLOSE: - // print preview is now always in the same frame as the tab view - // -> always switch this frame back to normal view - // (ScTabViewShell ctor reads stored view data) + // print preview is now always in the same frame as the tab view + // -> always switch this frame back to normal view + // (ScTabViewShell ctor reads stored view data) GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_ASYNCHRON ); break; @@ -831,11 +831,11 @@ void __EXPORT ScPreviewShell::GetState( SfxItemSet& rSet ) { pPreview->SetInGetState(TRUE); - SCTAB nTab = pPreview->GetTab(); - long nPage = pPreview->GetPageNo(); - long nTotal = pPreview->GetTotalPages(); - USHORT nZoom = pPreview->GetZoom(); - BOOL bAllTested = pPreview->AllTested(); + SCTAB nTab = pPreview->GetTab(); + long nPage = pPreview->GetPageNo(); + long nTotal = pPreview->GetTotalPages(); + USHORT nZoom = pPreview->GetZoom(); + BOOL bAllTested = pPreview->AllTested(); SfxWhichIter aIter(rSet); USHORT nWhich = aIter.FirstWhich(); @@ -937,28 +937,28 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData ) SCTAB nTab = pPreview->GetTab(); pDoc->GetName( nTab, rData.aTabName ); - rData.aTitle = pDocShell->GetTitle(); + rData.aTitle = pDocShell->GetTitle(); const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); - rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); if ( rData.aLongDocName.Len() ) rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS ); else rData.aShortDocName = rData.aLongDocName = rData.aTitle; - rData.nPageNo = pPreview->GetPageNo() + 1; + rData.nPageNo = pPreview->GetPageNo() + 1; - BOOL bAllTested = pPreview->AllTested(); + BOOL bAllTested = pPreview->AllTested(); if (bAllTested) rData.nTotalPages = pPreview->GetTotalPages(); else rData.nTotalPages = 99; - // eNumType kennt der Dialog selber + // eNumType kennt der Dialog selber } void __EXPORT ScPreviewShell::WriteUserData(String& rData, BOOL /* bBrowse */) { - // nZoom - // nPageNo + // nZoom + // nPageNo rData = String::CreateFromInt32(pPreview->GetZoom()); rData += (sal_Unicode) SC_USERDATA_SEP; @@ -1024,21 +1024,21 @@ void __EXPORT ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans:: void ScPreviewShell::DoScroll( USHORT nMode ) { - Point aCurPos, aPrevPos; + Point aCurPos, aPrevPos; - long nHRange = pHorScroll->GetRange().Max(); - long nHLine = pHorScroll->GetLineSize(); - long nHPage = pHorScroll->GetPageSize(); - long nVRange = pVerScroll->GetRange().Max(); - long nVLine = pVerScroll->GetLineSize(); - long nVPage = pVerScroll->GetPageSize(); + long nHRange = pHorScroll->GetRange().Max(); + long nHLine = pHorScroll->GetLineSize(); + long nHPage = pHorScroll->GetPageSize(); + long nVRange = pVerScroll->GetRange().Max(); + long nVLine = pVerScroll->GetLineSize(); + long nVPage = pVerScroll->GetPageSize(); aCurPos.X() = pHorScroll->GetThumbPos(); aCurPos.Y() = pVerScroll->GetThumbPos(); aPrevPos = aCurPos; - long nThumbPos = pVerScroll->GetThumbPos(); - long nRangeMax = pVerScroll->GetRangeMax(); + long nThumbPos = pVerScroll->GetThumbPos(); + long nRangeMax = pVerScroll->GetRangeMax(); switch( nMode ) { @@ -1167,13 +1167,13 @@ void ScPreviewShell::DoScroll( USHORT nMode ) // nHRange-nHPage kann negativ sein, deshalb Abfrage auf < 0 hinterher - if( aCurPos.Y() > (nVRange-nVPage) ) + if( aCurPos.Y() > (nVRange-nVPage) ) aCurPos.Y() = (nVRange-nVPage); - if( aCurPos.Y() < 0 ) + if( aCurPos.Y() < 0 ) aCurPos.Y() = 0; - if( aCurPos.X() > (nHRange-nHPage) ) + if( aCurPos.X() > (nHRange-nHPage) ) aCurPos.X() = (nHRange-nHPage); - if( aCurPos.X() < 0 ) + if( aCurPos.X() < 0 ) aCurPos.X() = 0; if( nMaxVertPos>=0 ) diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index 6677798f9dcf..72a7a7aa4a32 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.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/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 8180c1b8ea1e..a3e4832b81b1 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.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,7 +41,7 @@ #include <editeng/boxitem.hxx> #include <editeng/brshitem.hxx> #include <svtools/colorcfg.hxx> -#include <editeng/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS +#include <editeng/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS #include <svx/fmview.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/lrspitem.hxx> @@ -88,7 +88,7 @@ #include <boost/scoped_ptr.hpp> -#define ZOOM_MIN 10 +#define ZOOM_MIN 10 #define GET_BOOL(set,which) ((const SfxBoolItem&)(set)->Get((which))).GetValue() #define GET_USHORT(set,which) ((const SfxUInt16Item&)(set)->Get((which))).GetValue() @@ -99,7 +99,7 @@ ScPageRowEntry::ScPageRowEntry(const ScPageRowEntry& r) { nStartRow = r.nStartRow; - nEndRow = r.nEndRow; + nEndRow = r.nEndRow; nPagesX = r.nPagesX; if (r.pHidden && nPagesX) { @@ -115,7 +115,7 @@ const ScPageRowEntry& ScPageRowEntry::operator=(const ScPageRowEntry& r) delete[] pHidden; nStartRow = r.nStartRow; - nEndRow = r.nEndRow; + nEndRow = r.nEndRow; nPagesX = r.nPagesX; if (r.pHidden && nPagesX) { @@ -143,7 +143,7 @@ void ScPageRowEntry::SetHidden(size_t nX) { if ( nX < nPagesX ) { - if ( nX+1 == nPagesX ) // letzte Seite? + if ( nX+1 == nPagesX ) // letzte Seite? --nPagesX; else { @@ -159,7 +159,7 @@ void ScPageRowEntry::SetHidden(size_t nX) BOOL ScPageRowEntry::IsHidden(size_t nX) const { - return nX>=nPagesX || ( pHidden && pHidden[nX] ); //! inline? + return nX>=nPagesX || ( pHidden && pHidden[nX] ); //! inline? } size_t ScPageRowEntry::CountVisible() const @@ -188,12 +188,12 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions ) pDocShell->UpdatePendingRowHeights( nPrintTab ); pDoc = pDocShell->GetDocument(); - SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen + SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen if (pDocPrinter) aOldPrinterMode = pDocPrinter->GetMapMode(); - // einheitlicher MapMode ueber alle Aufrufe (z.B. Repaint !!!), - // weil die EditEngine sonst unterschiedliche Texthoehen liefert + // einheitlicher MapMode ueber alle Aufrufe (z.B. Repaint !!!), + // weil die EditEngine sonst unterschiedliche Texthoehen liefert pDev->SetMapMode(MAP_PIXEL); pPageEndX = NULL; @@ -206,7 +206,7 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions ) pEditEngine = NULL; pEditDefaults = NULL; - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nPrintTab ), SFX_STYLE_FAMILY_PAGE ); @@ -227,27 +227,27 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions ) InitParam(pOptions); - pPageData = NULL; // wird nur zur Initialisierung gebraucht + pPageData = NULL; // wird nur zur Initialisierung gebraucht } ScPrintFunc::ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTab, long nPage, long nDocP, const ScRange* pArea, const ScPrintOptions* pOptions, ScPageBreakData* pData ) - : pDocShell ( pShell ), - pPrinter ( pNewPrinter ), - pDrawView ( NULL ), - nPrintTab ( nTab ), - nPageStart ( nPage ), - nDocPages ( nDocP ), - pUserArea ( pArea ), - bState ( FALSE ), - bSourceRangeValid ( FALSE ), - bPrintCurrentTable ( FALSE ), - bMultiArea ( FALSE ), - nTabPages ( 0 ), - nTotalPages ( 0 ), - pPageData ( pData ) + : pDocShell ( pShell ), + pPrinter ( pNewPrinter ), + pDrawView ( NULL ), + nPrintTab ( nTab ), + nPageStart ( nPage ), + nDocPages ( nDocP ), + pUserArea ( pArea ), + bState ( FALSE ), + bSourceRangeValid ( FALSE ), + bPrintCurrentTable ( FALSE ), + bMultiArea ( FALSE ), + nTabPages ( 0 ), + nTotalPages ( 0 ), + pPageData ( pData ) { pDev = pPrinter; aSrcOffset = pPrinter->PixelToLogic( pPrinter->GetPageOffsetPixel(), MAP_100TH_MM ); @@ -257,20 +257,20 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTa ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, SCTAB nTab, long nPage, long nDocP, const ScRange* pArea, const ScPrintOptions* pOptions ) - : pDocShell ( pShell ), - pPrinter ( NULL ), - pDrawView ( NULL ), - nPrintTab ( nTab ), - nPageStart ( nPage ), - nDocPages ( nDocP ), - pUserArea ( pArea ), - bState ( FALSE ), - bSourceRangeValid ( FALSE ), - bPrintCurrentTable ( FALSE ), - bMultiArea ( FALSE ), - nTabPages ( 0 ), - nTotalPages ( 0 ), - pPageData ( NULL ) + : pDocShell ( pShell ), + pPrinter ( NULL ), + pDrawView ( NULL ), + nPrintTab ( nTab ), + nPageStart ( nPage ), + nDocPages ( nDocP ), + pUserArea ( pArea ), + bState ( FALSE ), + bSourceRangeValid ( FALSE ), + bPrintCurrentTable ( FALSE ), + bMultiArea ( FALSE ), + nTabPages ( 0 ), + nTotalPages ( 0 ), + pPageData ( NULL ) { pDev = pOutDev; Construct( pOptions ); @@ -278,30 +278,30 @@ ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, SCTAB nTab, ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, const ScPrintState& rState, const ScPrintOptions* pOptions ) - : pDocShell ( pShell ), - pPrinter ( NULL ), - pDrawView ( NULL ), - pUserArea ( NULL ), - bSourceRangeValid ( FALSE ), - bPrintCurrentTable ( FALSE ), - bMultiArea ( FALSE ), - pPageData ( NULL ) + : pDocShell ( pShell ), + pPrinter ( NULL ), + pDrawView ( NULL ), + pUserArea ( NULL ), + bSourceRangeValid ( FALSE ), + bPrintCurrentTable ( FALSE ), + bMultiArea ( FALSE ), + pPageData ( NULL ) { pDev = pOutDev; - nPrintTab = rState.nPrintTab; - nStartCol = rState.nStartCol; - nStartRow = rState.nStartRow; - nEndCol = rState.nEndCol; - nEndRow = rState.nEndRow; - nZoom = rState.nZoom; - nPagesX = rState.nPagesX; - nPagesY = rState.nPagesY; - nTabPages = rState.nTabPages; - nTotalPages = rState.nTotalPages; - nPageStart = rState.nPageStart; - nDocPages = rState.nDocPages; - bState = TRUE; + nPrintTab = rState.nPrintTab; + nStartCol = rState.nStartCol; + nStartRow = rState.nStartRow; + nEndCol = rState.nEndCol; + nEndRow = rState.nEndRow; + nZoom = rState.nZoom; + nPagesX = rState.nPagesX; + nPagesY = rState.nPagesY; + nTabPages = rState.nTabPages; + nTotalPages = rState.nTotalPages; + nPageStart = rState.nPageStart; + nDocPages = rState.nDocPages; + bState = TRUE; Construct( pOptions ); } @@ -356,18 +356,18 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, Window* pWindow, void ScPrintFunc::GetPrintState( ScPrintState& rState ) { - rState.nPrintTab = nPrintTab; - rState.nStartCol = nStartCol; - rState.nStartRow = nStartRow; - rState.nEndCol = nEndCol; - rState.nEndRow = nEndRow; - rState.nZoom = nZoom; - rState.nPagesX = nPagesX; - rState.nPagesY = nPagesY; - rState.nTabPages = nTabPages; - rState.nTotalPages = nTotalPages; - rState.nPageStart = nPageStart; - rState.nDocPages = nDocPages; + rState.nPrintTab = nPrintTab; + rState.nStartCol = nStartCol; + rState.nStartRow = nStartRow; + rState.nEndCol = nEndCol; + rState.nEndRow = nEndRow; + rState.nZoom = nZoom; + rState.nPagesX = nPagesX; + rState.nPagesY = nPagesY; + rState.nTabPages = nTabPages; + rState.nTotalPages = nTotalPages; + rState.nPageStart = nPageStart; + rState.nDocPages = nDocPages; } BOOL ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const @@ -381,14 +381,14 @@ void ScPrintFunc::FillPageData() if (pPageData) { USHORT nCount = sal::static_int_cast<USHORT>( pPageData->GetCount() ); - ScPrintRangeData& rData = pPageData->GetData(nCount); // hochzaehlen + ScPrintRangeData& rData = pPageData->GetData(nCount); // hochzaehlen rData.SetPrintRange( ScRange( nStartCol, nStartRow, nPrintTab, nEndCol, nEndRow, nPrintTab ) ); rData.SetPagesX( nPagesX, pPageEndX ); rData.SetPagesY( nTotalY, pPageEndY ); - // Einstellungen + // Einstellungen rData.SetTopDown( aTableParam.bTopDown ); rData.SetAutomatic( !aAreaParam.bPrintArea ); } @@ -410,10 +410,10 @@ ScPrintFunc::~ScPrintFunc() delete pEditDefaults; delete pEditEngine; - // Druckereinstellungen werden jetzt von aussen wiederhergestellt + // Druckereinstellungen werden jetzt von aussen wiederhergestellt - // #64294# Fuer DrawingLayer/Charts muss der MapMode am Drucker (RefDevice) immer stimmen - SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen + // #64294# Fuer DrawingLayer/Charts muss der MapMode am Drucker (RefDevice) immer stimmen + SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen if (pDocPrinter) pDocPrinter->SetMapMode(aOldPrinterMode); } @@ -435,7 +435,7 @@ void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) if (((const ScProtectionAttr&)rCellInfo.pPatternAttr-> GetItem(ATTR_PROTECTION, rCellInfo.pConditionSet)).GetHidePrint()) { - pThisRowInfo->pCellInfo[nX+1].pCell = NULL; + pThisRowInfo->pCellInfo[nX+1].pCell = NULL; pThisRowInfo->pCellInfo[nX+1].bEmptyCellText = TRUE; } } @@ -443,17 +443,17 @@ void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) } // -// Ausgabe auf Device (static) +// Ausgabe auf Device (static) // -// wird benutzt fuer: -// - Clipboard/Bitmap -// - Ole-Object (DocShell::Draw) -// - Vorschau bei Vorlagen +// wird benutzt fuer: +// - Clipboard/Bitmap +// - Ole-Object (DocShell::Draw) +// - Vorschau bei Vorlagen void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPrintFactor */, const Rectangle& rBound, ScViewData* pViewData, BOOL bMetaFile ) { - //! nPrintFactor auswerten !!! + //! nPrintFactor auswerten !!! SCTAB nTab = 0; if (pViewData) @@ -526,15 +526,15 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr nTwipsSizeX += pDoc->GetColWidth( i, nTab ); long nTwipsSizeY = (long) pDoc->GetRowHeight( nY1, nY2, nTab ); - // wenn keine Linien, dann trotzdem Platz fuer den Aussenrahmen (20 Twips = 1pt) - // (HasLines initalisiert aLines auf 0,0,0,0) + // wenn keine Linien, dann trotzdem Platz fuer den Aussenrahmen (20 Twips = 1pt) + // (HasLines initalisiert aLines auf 0,0,0,0) nTwipsSizeX += aLines.Left() + Max( aLines.Right(), 20L ); nTwipsSizeY += aLines.Top() + Max( aLines.Bottom(), 20L ); double nScaleX = (double) nDevSizeX / nTwipsSizeX; double nScaleY = (double) nDevSizeY / nTwipsSizeY; - //! Flag bei FillInfo uebergeben !!!!! + //! Flag bei FillInfo uebergeben !!!!! ScRange aERange; BOOL bEmbed = pDoc->IsEmbedded(); if (bEmbed) @@ -543,7 +543,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr pDoc->ResetEmbedded(); } - // Daten zusammenstellen + // Daten zusammenstellen ScTableInfo aTabInfo; pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab, @@ -553,14 +553,14 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr if (bEmbed) pDoc->SetEmbedded(aERange); -/* if (!bMetaFile) +/* if (!bMetaFile) pDev->SetMapMode(MAP_PIXEL); */ long nScrX = aRect.Left(); long nScrY = aRect.Top(); - // Wenn keine Linien, trotzdem Platz fuer Gitterlinien lassen - // (werden sonst abgeschnitten) + // Wenn keine Linien, trotzdem Platz fuer Gitterlinien lassen + // (werden sonst abgeschnitten) long nAddX = (long)( aLines.Left() * nScaleX ); nScrX += ( nAddX ? nAddX : 1 ); long nAddY = (long)( aLines.Top() * nScaleY ); @@ -584,7 +584,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr aOutputData.SetDrawView( pDrawView ); } - //! SetUseStyleColor ?? + //! SetUseStyleColor ?? if ( bMetaFile && pDev->GetOutDevType() == OUTDEV_VIRDEV ) aOutputData.SetSnapPixel(); @@ -593,7 +593,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr long nLogStX = aLogStart.X(); long nLogStY = aLogStart.Y(); - //! nZoom fuer GetFont in OutputData ??? + //! nZoom fuer GetFont in OutputData ??? if (!bMetaFile && pViewData) pDev->SetMapMode(pViewData->GetLogicMode(pViewData->GetActivePart())); @@ -633,13 +633,13 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr if (!bMetaFile && pViewData) pDev->SetMapMode(aMode); - aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche + aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche pDev->SetLineColor( COL_BLACK ); Size aOne = pDev->PixelToLogic( Size(1,1) ); if (bMetaFile) - aOne = Size(1,1); // compatible with DrawGrid + aOne = Size(1,1); // compatible with DrawGrid long nRight = nScrX + aOutputData.GetScrW() - aOne.Width(); long nBottom = nScrY + aOutputData.GetScrH() - aOne.Height(); @@ -664,38 +664,38 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr } // -// Drucken +// Drucken // void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) { - // nDistance muss vorher unterschiedlich initalisiert sein + // nDistance muss vorher unterschiedlich initalisiert sein if ( pHFSet == NULL ) { - rParam.bEnable = FALSE; - rParam.pBorder = NULL; - rParam.pBack = NULL; - rParam.pShadow = NULL; + rParam.bEnable = FALSE; + rParam.pBorder = NULL; + rParam.pBack = NULL; + rParam.pShadow = NULL; } else { - rParam.bEnable = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_ON)).GetValue(); - rParam.bDynamic = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_DYNAMIC)).GetValue(); - rParam.bShared = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_SHARED)).GetValue(); - rParam.nHeight = ((const SvxSizeItem&) pHFSet->Get(ATTR_PAGE_SIZE)).GetSize().Height(); + rParam.bEnable = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_ON)).GetValue(); + rParam.bDynamic = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_DYNAMIC)).GetValue(); + rParam.bShared = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_SHARED)).GetValue(); + rParam.nHeight = ((const SvxSizeItem&) pHFSet->Get(ATTR_PAGE_SIZE)).GetSize().Height(); const SvxLRSpaceItem* pHFLR = &(const SvxLRSpaceItem&) pHFSet->Get(ATTR_LRSPACE); long nTmp; nTmp = pHFLR->GetLeft(); rParam.nLeft = nTmp < 0 ? 0 : USHORT(nTmp); nTmp = pHFLR->GetRight(); rParam.nRight = nTmp < 0 ? 0 : USHORT(nTmp); - rParam.pBorder = (const SvxBoxItem*) &pHFSet->Get(ATTR_BORDER); - rParam.pBack = (const SvxBrushItem*) &pHFSet->Get(ATTR_BACKGROUND); - rParam.pShadow = (const SvxShadowItem*)&pHFSet->Get(ATTR_SHADOW);; + rParam.pBorder = (const SvxBoxItem*) &pHFSet->Get(ATTR_BORDER); + rParam.pBack = (const SvxBrushItem*) &pHFSet->Get(ATTR_BACKGROUND); + rParam.pShadow = (const SvxShadowItem*)&pHFSet->Get(ATTR_SHADOW);; -// jetzt doch wieder schon im Dialog: -// rParam.nHeight += rParam.nDistance; // nicht mehr im Dialog ??? +// jetzt doch wieder schon im Dialog: +// rParam.nHeight += rParam.nDistance; // nicht mehr im Dialog ??? if (rParam.pBorder) rParam.nHeight += lcl_LineTotal( rParam.pBorder->GetTop() ) + @@ -708,14 +708,14 @@ void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) rParam.nHeight = 0; } -// bNew = TRUE: benutzten Bereich aus dem Dokument suchen -// bNew = FALSE: nur ganze Zeilen/Spalten begrenzen +// bNew = TRUE: benutzten Bereich aus dem Dokument suchen +// bNew = FALSE: nur ganze Zeilen/Spalten begrenzen BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew ) { - SCCOL nOldEndCol = nEndCol; // nur wichtig bei !bNew + SCCOL nOldEndCol = nEndCol; // nur wichtig bei !bNew SCROW nOldEndRow = nEndRow; - BOOL bChangeCol = TRUE; // bei bNew werden beide angepasst + BOOL bChangeCol = TRUE; // bei bNew werden beide angepasst BOOL bChangeRow = TRUE; BOOL bNotes = aTableParam.bNotes; @@ -724,7 +724,7 @@ BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew ) nStartCol = 0; nStartRow = 0; if (!pDoc->GetPrintArea( nPrintTab, nEndCol, nEndRow, bNotes )) - return FALSE; // nix + return FALSE; // nix } else { @@ -761,23 +761,23 @@ BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew ) bFound = pDoc->GetPrintAreaVer( nPrintTab, nStartCol, nEndCol, nEndRow, bNotes ); if (!bFound) - return FALSE; // leer + return FALSE; // leer if (bForcedChangeRow) bChangeRow = TRUE; } pDoc->ExtendMerge( nStartCol,nStartRow, nEndCol,nEndRow, nPrintTab, - FALSE, TRUE ); // kein Refresh, incl. Attrs + FALSE, TRUE ); // kein Refresh, incl. Attrs if ( bChangeCol ) { - OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen - pRefDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize + OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen + pRefDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize pDoc->ExtendPrintArea( pRefDev, nPrintTab, nStartCol, nStartRow, nEndCol, nEndRow ); - // nEndCol wird veraendert + // nEndCol wird veraendert } if ( nEndCol < MAXCOL && pDoc->HasAttrib( @@ -798,14 +798,14 @@ long ScPrintFunc::TextHeight( const EditTextObject* pObject ) if (!pObject) return 0; -// pEditEngine->SetPageNo( nTotalPages ); +// pEditEngine->SetPageNo( nTotalPages ); pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, FALSE ); return (long) pEditEngine->GetTextHeight(); } -// nZoom muss gesetzt sein !!! -// und der entsprechende Twip-MapMode eingestellt +// nZoom muss gesetzt sein !!! +// und der entsprechende Twip-MapMode eingestellt void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam ) { @@ -813,7 +813,7 @@ void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam ) if (rParam.bEnable && rParam.bDynamic) { - // nHeight aus Inhalten berechnen + // nHeight aus Inhalten berechnen MakeEditEngine(); long nPaperWidth = ( aPageSize.Width() - nLeftMargin - nRightMargin - @@ -855,7 +855,7 @@ void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam ) rParam.pShadow->CalcShadowSpace(SHADOW_BOTTOM); if (rParam.nHeight < rParam.nManHeight) - rParam.nHeight = rParam.nManHeight; // eingestelltes Minimum + rParam.nHeight = rParam.nManHeight; // eingestelltes Minimum } } @@ -876,9 +876,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) nBottomMargin = pULItem->GetLower(); const SvxPageItem* pPageItem = (const SvxPageItem*) &pParamSet->Get( ATTR_PAGE ); - nPageUsage = pPageItem->GetPageUsage(); - bLandscape = pPageItem->IsLandscape(); - aFieldData.eNumType = pPageItem->GetNumType(); + nPageUsage = pPageItem->GetPageUsage(); + bLandscape = pPageItem->IsLandscape(); + aFieldData.eNumType = pPageItem->GetNumType(); bCenterHor = ((const SfxBoolItem&) pParamSet->Get(ATTR_PAGE_HORCENTER)).GetValue(); bCenterVer = ((const SfxBoolItem&) pParamSet->Get(ATTR_PAGE_VERCENTER)).GetValue(); @@ -890,14 +890,14 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) aPageSize = SvxPaperInfo::GetPaperSize( PAPER_A4 ); } - pBorderItem = (const SvxBoxItem*) &pParamSet->Get(ATTR_BORDER); - pBackgroundItem = (const SvxBrushItem*) &pParamSet->Get(ATTR_BACKGROUND); - pShadowItem = (const SvxShadowItem*) &pParamSet->Get(ATTR_SHADOW); + pBorderItem = (const SvxBoxItem*) &pParamSet->Get(ATTR_BORDER); + pBackgroundItem = (const SvxBrushItem*) &pParamSet->Get(ATTR_BACKGROUND); + pShadowItem = (const SvxShadowItem*) &pParamSet->Get(ATTR_SHADOW); // TabPage "Kopfzeile" - aHdr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERLEFT); // Inhalt - aHdr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERRIGHT); + aHdr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERLEFT); // Inhalt + aHdr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERRIGHT); const SvxSetItem* pHeaderSetItem; const SfxItemSet* pHeaderSet = NULL; @@ -906,14 +906,14 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) { pHeaderSet = &pHeaderSetItem->GetItemSet(); // Kopfzeile hat unteren Abstand - aHdr.nDistance = ((const SvxULSpaceItem&) pHeaderSet->Get(ATTR_ULSPACE)).GetLower(); + aHdr.nDistance = ((const SvxULSpaceItem&) pHeaderSet->Get(ATTR_ULSPACE)).GetLower(); } lcl_FillHFParam( aHdr, pHeaderSet ); // TabPage "Fusszeile" - aFtr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERLEFT); // Inhalt - aFtr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERRIGHT); + aFtr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERLEFT); // Inhalt + aFtr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERRIGHT); const SvxSetItem* pFooterSetItem; const SfxItemSet* pFooterSet = NULL; @@ -922,7 +922,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) { pFooterSet = &pFooterSetItem->GetItemSet(); // Fusszeile hat oberen Abstand - aFtr.nDistance = ((const SvxULSpaceItem&) pFooterSet->Get(ATTR_ULSPACE)).GetUpper(); + aFtr.nDistance = ((const SvxULSpaceItem&) pFooterSet->Get(ATTR_ULSPACE)).GetUpper(); } lcl_FillHFParam( aFtr, pFooterSet ); @@ -957,47 +957,47 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) DBG_ASSERT( pScaleItem && pScaleToItem && pScaleToPagesItem, "Missing ScaleItem! :-/" ); aTableParam.bCellContent = TRUE; - aTableParam.bNotes = GET_BOOL(pParamSet,ATTR_PAGE_NOTES); - aTableParam.bGrid = GET_BOOL(pParamSet,ATTR_PAGE_GRID); - aTableParam.bHeaders = GET_BOOL(pParamSet,ATTR_PAGE_HEADERS); - aTableParam.bFormulas = GET_BOOL(pParamSet,ATTR_PAGE_FORMULAS); - aTableParam.bNullVals = GET_BOOL(pParamSet,ATTR_PAGE_NULLVALS); - aTableParam.bCharts = GET_SHOW(pParamSet,ATTR_PAGE_CHARTS); - aTableParam.bObjects = GET_SHOW(pParamSet,ATTR_PAGE_OBJECTS); - aTableParam.bDrawings = GET_SHOW(pParamSet,ATTR_PAGE_DRAWINGS); - aTableParam.bTopDown = GET_BOOL(pParamSet,ATTR_PAGE_TOPDOWN); - aTableParam.bLeftRight = !aTableParam.bLeftRight; - aTableParam.nFirstPageNo = GET_USHORT(pParamSet,ATTR_PAGE_FIRSTPAGENO); + aTableParam.bNotes = GET_BOOL(pParamSet,ATTR_PAGE_NOTES); + aTableParam.bGrid = GET_BOOL(pParamSet,ATTR_PAGE_GRID); + aTableParam.bHeaders = GET_BOOL(pParamSet,ATTR_PAGE_HEADERS); + aTableParam.bFormulas = GET_BOOL(pParamSet,ATTR_PAGE_FORMULAS); + aTableParam.bNullVals = GET_BOOL(pParamSet,ATTR_PAGE_NULLVALS); + aTableParam.bCharts = GET_SHOW(pParamSet,ATTR_PAGE_CHARTS); + aTableParam.bObjects = GET_SHOW(pParamSet,ATTR_PAGE_OBJECTS); + aTableParam.bDrawings = GET_SHOW(pParamSet,ATTR_PAGE_DRAWINGS); + aTableParam.bTopDown = GET_BOOL(pParamSet,ATTR_PAGE_TOPDOWN); + aTableParam.bLeftRight = !aTableParam.bLeftRight; + aTableParam.nFirstPageNo = GET_USHORT(pParamSet,ATTR_PAGE_FIRSTPAGENO); if (!aTableParam.nFirstPageNo) - aTableParam.nFirstPageNo = (USHORT) nPageStart; // von vorheriger Tabelle + aTableParam.nFirstPageNo = (USHORT) nPageStart; // von vorheriger Tabelle if ( pScaleItem && pScaleToItem && pScaleToPagesItem ) { - UINT16 nScaleAll = pScaleItem->GetValue(); - UINT16 nScaleToPages = pScaleToPagesItem->GetValue(); + UINT16 nScaleAll = pScaleItem->GetValue(); + UINT16 nScaleToPages = pScaleToPagesItem->GetValue(); - aTableParam.bScaleNone = (nScaleAll == 100); - aTableParam.bScaleAll = (nScaleAll > 0 ); + aTableParam.bScaleNone = (nScaleAll == 100); + aTableParam.bScaleAll = (nScaleAll > 0 ); aTableParam.bScaleTo = pScaleToItem->IsValid(); - aTableParam.bScalePageNum = (nScaleToPages > 0 ); - aTableParam.nScaleAll = nScaleAll; + aTableParam.bScalePageNum = (nScaleToPages > 0 ); + aTableParam.nScaleAll = nScaleAll; aTableParam.nScaleWidth = pScaleToItem->GetWidth(); aTableParam.nScaleHeight = pScaleToItem->GetHeight(); - aTableParam.nScalePageNum = nScaleToPages; + aTableParam.nScalePageNum = nScaleToPages; } else { - aTableParam.bScaleNone = TRUE; - aTableParam.bScaleAll = FALSE; + aTableParam.bScaleNone = TRUE; + aTableParam.bScaleAll = FALSE; aTableParam.bScaleTo = FALSE; - aTableParam.bScalePageNum = FALSE; - aTableParam.nScaleAll = 0; + aTableParam.bScalePageNum = FALSE; + aTableParam.nScaleAll = 0; aTableParam.nScaleWidth = 0; aTableParam.nScaleHeight = 0; - aTableParam.nScalePageNum = 0; + aTableParam.nScalePageNum = 0; } - // skip empty pages only if options with that flag are passed + // skip empty pages only if options with that flag are passed aTableParam.bSkipEmpty = pOptions && pOptions->GetSkipEmpty(); if ( pPageData ) aTableParam.bSkipEmpty = FALSE; @@ -1008,28 +1008,28 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) // TabPage "Bereiche": //------------------------------------------------------ - //! alle PrintAreas der Tabelle durchgehen !!! - const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 ); - const ScRange* pRepeatCol = pDoc->GetRepeatColRange( nPrintTab ); - const ScRange* pRepeatRow = pDoc->GetRepeatRowRange( nPrintTab ); + //! alle PrintAreas der Tabelle durchgehen !!! + const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 ); + const ScRange* pRepeatCol = pDoc->GetRepeatColRange( nPrintTab ); + const ScRange* pRepeatRow = pDoc->GetRepeatRowRange( nPrintTab ); - // ATTR_PAGE_PRINTTABLES wird ignoriert + // ATTR_PAGE_PRINTTABLES wird ignoriert - if ( pUserArea ) // UserArea (Selektion) hat Vorrang + if ( pUserArea ) // UserArea (Selektion) hat Vorrang { bPrintCurrentTable = - aAreaParam.bPrintArea = TRUE; // Selektion + aAreaParam.bPrintArea = TRUE; // Selektion aAreaParam.aPrintArea = *pUserArea; - // Die Tabellen-Abfrage ist schon in DocShell::Print, hier immer + // Die Tabellen-Abfrage ist schon in DocShell::Print, hier immer aAreaParam.aPrintArea.aStart.SetTab(nPrintTab); aAreaParam.aPrintArea.aEnd.SetTab(nPrintTab); -// lcl_LimitRange( aAreaParam.aPrintArea, nPrintTab ); // ganze Zeilen/Spalten... +// lcl_LimitRange( aAreaParam.aPrintArea, nPrintTab ); // ganze Zeilen/Spalten... } else if ( pDoc->HasPrintRange() ) { - if ( pPrintArea ) // mindestens eine gesetzt ? + if ( pPrintArea ) // mindestens eine gesetzt ? { bPrintCurrentTable = aAreaParam.bPrintArea = TRUE; @@ -1046,7 +1046,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } else { - // #74834# don't print hidden tables if there's no print range defined there + // #74834# don't print hidden tables if there's no print range defined there if ( pDoc->IsVisible( nPrintTab ) ) { aAreaParam.bPrintArea = FALSE; @@ -1054,7 +1054,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } else { - aAreaParam.bPrintArea = TRUE; // otherwise the table is always counted + aAreaParam.bPrintArea = TRUE; // otherwise the table is always counted bPrintCurrentTable = FALSE; } } @@ -1063,8 +1063,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) { aAreaParam.bRepeatCol = TRUE; aAreaParam.aRepeatCol = *pRepeatCol; - nRepeatStartCol = pRepeatCol->aStart.Col(); - nRepeatEndCol = pRepeatCol->aEnd .Col(); + nRepeatStartCol = pRepeatCol->aStart.Col(); + nRepeatEndCol = pRepeatCol->aEnd .Col(); } else { @@ -1076,8 +1076,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) { aAreaParam.bRepeatRow = TRUE; aAreaParam.aRepeatRow = *pRepeatRow; - nRepeatStartRow = pRepeatRow->aStart.Row(); - nRepeatEndRow = pRepeatRow->aEnd .Row(); + nRepeatStartRow = pRepeatRow->aStart.Row(); + nRepeatEndRow = pRepeatRow->aEnd .Row(); } else { @@ -1086,19 +1086,19 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } // - // Seiten aufteilen + // Seiten aufteilen // if (!bState) { - nTabPages = CountPages(); // berechnet auch Zoom + nTabPages = CountPages(); // berechnet auch Zoom nTotalPages = nTabPages; nTotalPages += CountNotePages(); } else { - CalcPages(); // nur Umbrueche suchen - CountNotePages(); // Notizen zaehlen, auch wenn Seitenzahl schon bekannt + CalcPages(); // nur Umbrueche suchen + CountNotePages(); // Notizen zaehlen, auch wenn Seitenzahl schon bekannt } if (nDocPages) @@ -1108,15 +1108,15 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) SetDateTime( Date(), Time() ); - aFieldData.aTitle = pDocShell->GetTitle(); + aFieldData.aTitle = pDocShell->GetTitle(); const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); - aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); if ( aFieldData.aLongDocName.Len() ) aFieldData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS ); else aFieldData.aShortDocName = aFieldData.aLongDocName = aFieldData.aTitle; - // Druckereinstellungen (Orientation, Paper) jetzt erst bei DoPrint + // Druckereinstellungen (Orientation, Paper) jetzt erst bei DoPrint } Size ScPrintFunc::GetDataSize() const @@ -1183,7 +1183,7 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi Size aDrawSize = aGrfSize; bool bDraw = TRUE; -// bool bRetouche = TRUE; +// bool bRetouche = TRUE; switch ( ePos ) { case GPOS_LT: aPos = rOrg.TopLeft(); @@ -1218,13 +1218,13 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi case GPOS_AREA: aPos = rOrg.TopLeft(); aDrawSize = rOrg.GetSize(); -// bRetouche = FALSE; +// bRetouche = FALSE; break; case GPOS_TILED: { - // #104004# use GraphicObject::DrawTiled instead of an own loop - // (pixel rounding is handled correctly, and a very small bitmap - // is duplicated into a bigger one for better performance) + // #104004# use GraphicObject::DrawTiled instead of an own loop + // (pixel rounding is handled correctly, and a very small bitmap + // is duplicated into a bigger one for better performance) GraphicObject aObject( *pGraphic ); @@ -1253,10 +1253,10 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi // per bitmap pixel. This is approximately 50 // and 7 for current PDF writer, respectively. // - const double k1( 50 ); - const double k2( 7 ); - const Size aSize( rOrg.GetSize() ); - const double Abitmap( k1/k2 * aSize.Width()*aSize.Height() ); + const double k1( 50 ); + const double k2( 7 ); + const Size aSize( rOrg.GetSize() ); + const double Abitmap( k1/k2 * aSize.Width()*aSize.Height() ); aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0), NULL, GRFMGR_DRAW_STANDARD, @@ -1268,7 +1268,7 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi } bDraw = FALSE; -// bRetouche = FALSE; +// bRetouche = FALSE; } break; @@ -1285,13 +1285,13 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi } } -// Rahmen wird nach innen gezeichnet +// Rahmen wird nach innen gezeichnet void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, const SvxBoxItem* pBorderData, const SvxBrushItem* pBackground, const SvxShadowItem* pShadow ) { - //! direkte Ausgabe aus SvxBoxItem !!! + //! direkte Ausgabe aus SvxBoxItem !!! if (pBorderData) if ( !pBorderData->GetTop() && !pBorderData->GetBottom() && !pBorderData->GetLeft() && @@ -1299,25 +1299,25 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, pBorderData = NULL; if (!pBorderData && !pBackground && !pShadow) - return; // nichts zu tun + return; // nichts zu tun long nLeft = 0; long nRight = 0; long nTop = 0; long nBottom = 0; - // aFrameRect - aussen um die Umrandung, ohne Schatten + // aFrameRect - aussen um die Umrandung, ohne Schatten if ( pShadow && pShadow->GetLocation() != SVX_SHADOW_NONE ) { - nLeft += (long) ( pShadow->CalcShadowSpace(SHADOW_LEFT) * nScaleX ); - nRight += (long) ( pShadow->CalcShadowSpace(SHADOW_RIGHT) * nScaleX ); - nTop += (long) ( pShadow->CalcShadowSpace(SHADOW_TOP) * nScaleY ); - nBottom += (long) ( pShadow->CalcShadowSpace(SHADOW_BOTTOM) * nScaleY ); + nLeft += (long) ( pShadow->CalcShadowSpace(SHADOW_LEFT) * nScaleX ); + nRight += (long) ( pShadow->CalcShadowSpace(SHADOW_RIGHT) * nScaleX ); + nTop += (long) ( pShadow->CalcShadowSpace(SHADOW_TOP) * nScaleY ); + nBottom += (long) ( pShadow->CalcShadowSpace(SHADOW_BOTTOM) * nScaleY ); } Rectangle aFrameRect( Point(nScrX+nLeft, nScrY+nTop), Size(nScrW-nLeft-nRight, nScrH-nTop-nBottom) ); - // Mitte der Umrandung, um Linien ueber OutputData zu zeichnen: + // Mitte der Umrandung, um Linien ueber OutputData zu zeichnen: if (pBorderData) { nLeft += (long) ( lcl_LineTotal(pBorderData->GetLeft()) * nScaleX / 2 ); @@ -1328,22 +1328,22 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, long nEffHeight = nScrH - nTop - nBottom; long nEffWidth = nScrW - nLeft - nRight; if (nEffHeight<=0 || nEffWidth<=0) - return; // leer + return; // leer - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); if ( pBackground && !bCellContrast ) { -// Rectangle aBackRect( Point(nScrX+nLeft, nScrY+nTop), Size(nEffWidth,nEffHeight) ); +// Rectangle aBackRect( Point(nScrX+nLeft, nScrY+nTop), Size(nEffWidth,nEffHeight) ); if (pBackground->GetGraphicPos() != GPOS_NONE) { OutputDevice* pRefDev; if ( bIsRender ) - pRefDev = pDev; // don't use printer for PDF + pRefDev = pDev; // don't use printer for PDF else - pRefDev = pDoc->GetPrinter(); // use printer also for preview + pRefDev = pDoc->GetPrinter(); // use printer also for preview lcl_DrawGraphic( *pBackground, pDev, pRefDev, aFrameRect, aFrameRect ); } @@ -1425,7 +1425,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, nScrX+nLeft, nScrY+nTop, 0,0, 0,0, nScaleX, nScaleY ); aOutputData.SetUseStyleColor( bUseStyleColor ); -// pDev->SetMapMode(aTwipMode); +// pDev->SetMapMode(aTwipMode); if (pBorderData) aOutputData.DrawFrame(); @@ -1569,7 +1569,7 @@ void ScPrintFunc::LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, long nScrX, long nScrY, BOOL bRepCol, BOOL bRepRow, ScPreviewLocationData& rLocationData ) { - // get MapMode for drawing objects (same MapMode as in ScOutputData::PrintDrawingLayer) + // get MapMode for drawing objects (same MapMode as in ScOutputData::PrintDrawingLayer) Point aLogPos = OutputDevice::LogicToLogic(Point(nScrX,nScrY), aOffsetMode, aLogicMode); long nLogStX = aLogPos.X(); @@ -1587,7 +1587,7 @@ void ScPrintFunc::LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, aMMOffset += Point( nLogStX, nLogStY ); MapMode aDrawMapMode( MAP_100TH_MM, aMMOffset, aLogicMode.GetScaleX(), aLogicMode.GetScaleY() ); - // get pixel rectangle + // get pixel rectangle Size aOnePixel = pDev->PixelToLogic(Size(1,1)); long nOneX = aOnePixel.Width(); @@ -1617,7 +1617,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if ( nX2 < nX1 || nY2 < nY1 ) return; - //! Flag bei FillInfo uebergeben !!!!! + //! Flag bei FillInfo uebergeben !!!!! ScRange aERange; BOOL bEmbed = pDoc->IsEmbedded(); if (bEmbed) @@ -1630,7 +1630,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, long nLogStX = aPos.X(); long nLogStY = aPos.Y(); - // Daten zusammenstellen + // Daten zusammenstellen ScTableInfo aTabInfo; pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nPrintTab, @@ -1654,7 +1654,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if(!bHideAllDrawingLayer) { pDev->SetMapMode(aLogicMode); - // hier kein Clipping setzen (Mapmode wird verschoben) + // hier kein Clipping setzen (Mapmode wird verschoben) // #i72502# aOutputData.PrintDrawingLayer(SC_LAYER_BACK, aMMOffset); @@ -1673,40 +1673,40 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if ( !pPrinter ) { - OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen - Fraction aPrintFrac( nZoom, 100 ); // ohne nManualZoom - // MapMode, wie er beim Drucken herauskommen wuerde: + OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen + Fraction aPrintFrac( nZoom, 100 ); // ohne nManualZoom + // MapMode, wie er beim Drucken herauskommen wuerde: pRefDev->SetMapMode( MapMode( MAP_100TH_MM, Point(), aPrintFrac, aPrintFrac ) ); - // when rendering (PDF), don't use printer as ref device, but printer's MapMode - // has to be set anyway, as charts still use it (#106409#) + // when rendering (PDF), don't use printer as ref device, but printer's MapMode + // has to be set anyway, as charts still use it (#106409#) if ( !bIsRender ) aOutputData.SetRefDevice( pRefDev ); } -// aOutputData.SetMetaFileMode(TRUE); +// aOutputData.SetMetaFileMode(TRUE); if( aTableParam.bCellContent ) aOutputData.DrawBackground(); pDev->SetClipRegion( Rectangle( aPos, Size( aOutputData.GetScrW(), aOutputData.GetScrH() ) ) ); pDev->SetClipRegion(); -// aOutputData.SetMetaFileMode(FALSE); +// aOutputData.SetMetaFileMode(FALSE); if( aTableParam.bCellContent ) { aOutputData.DrawExtraShadow( bShLeft, bShTop, bShRight, bShBottom ); aOutputData.DrawFrame(); aOutputData.DrawStrings(); - // pDev->SetMapMode(aLogicMode); + // pDev->SetMapMode(aLogicMode); aOutputData.DrawEdit(FALSE); } -// pDev->SetMapMode(aOffsetMode); +// pDev->SetMapMode(aOffsetMode); if (aTableParam.bGrid) - aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche + aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche -/*!!!!!!!!!!! Notizen in Tabelle markieren ?????????????????????????? +/*!!!!!!!!!!! Notizen in Tabelle markieren ?????????????????????????? if (aTableParam.bNotes) { @@ -1718,7 +1718,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, aOutputData.AddPDFNotes(); // has no effect if not rendering PDF with notes enabled -// pDev->SetMapMode(aDrawMode); +// pDev->SetMapMode(aDrawMode); // test if all paint parts are hidden, then a paint is not necessary at all if(!bHideAllDrawingLayer) @@ -1732,13 +1732,13 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, aOutputData.PostPrintDrawingLayer(aMMOffset); // #i74768# } -BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? +BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? { SvxPageUsage eUsage = (SvxPageUsage) ( nPageUsage & 0x000f ); return ( eUsage == SVX_PAGE_MIRROR && (nPageNo & 1) ); } -BOOL ScPrintFunc::IsLeft( long nPageNo ) // linke Fussnoten ? +BOOL ScPrintFunc::IsLeft( long nPageNo ) // linke Fussnoten ? { SvxPageUsage eUsage = (SvxPageUsage) ( nPageUsage & 0x000f ); BOOL bLeft; @@ -1760,8 +1760,8 @@ void ScPrintFunc::MakeEditEngine() { if (!pEditEngine) { - // can't use document's edit engine pool here, - // because pool must have twips as default metric + // can't use document's edit engine pool here, + // because pool must have twips as default metric pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), TRUE ); pEditEngine->EnableUndo(FALSE); @@ -1771,42 +1771,42 @@ void ScPrintFunc::MakeEditEngine() pEditEngine->SetControlWord( pEditEngine->GetControlWord() & ~EE_CNTRL_RTFSTYLESHEETS ); pEditEngine->EnableAutoColor( bUseStyleColor ); - // Default-Set fuer Ausrichtung + // Default-Set fuer Ausrichtung pEditDefaults = new SfxItemSet( pEditEngine->GetEmptyItemSet() ); const ScPatternAttr& rPattern = (const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN); rPattern.FillEditItemSet( pEditDefaults ); - // 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: pEditDefaults->Put( rPattern.GetItem(ATTR_FONT_HEIGHT), EE_CHAR_FONTHEIGHT ); pEditDefaults->Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CJK ); pEditDefaults->Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CTL ); - // #69193# dont use font color, because background color is not used - //! there's no way to set the background for note pages + // #69193# dont use font color, because background color is not used + //! there's no way to set the background for note pages pEditDefaults->ClearItem( EE_CHAR_COLOR ); if (ScGlobal::IsSystemRTL()) pEditDefaults->Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) ); } - pEditEngine->SetData( aFieldData ); // Seitennummer etc. setzen + pEditEngine->SetData( aFieldData ); // Seitennummer etc. setzen } -// nStartY = logic +// nStartY = logic void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, BOOL bDoPrint, ScPreviewLocationData* pLocationData ) { const ScPrintHFParam& rParam = bHeader ? aHdr : aFtr; - pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips + pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips BOOL bLeft = IsLeft(nPageNo) && !rParam.bShared; const ScPageHFItem* pHFItem = bLeft ? rParam.pLeft : rParam.pRight; long nLineStartX = aPageRect.Left() + rParam.nLeft; - long nLineEndX = aPageRect.Right() - rParam.nRight; + long nLineEndX = aPageRect.Right() - rParam.nRight; long nLineWidth = nLineEndX - nLineStartX + 1; - // Edit-Engine + // Edit-Engine Point aStart( nLineStartX, nStartY ); Size aPaperSize( nLineWidth, rParam.nHeight-rParam.nDistance ); @@ -1822,8 +1822,8 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, if ( rParam.pShadow && rParam.pShadow->GetLocation() != SVX_SHADOW_NONE ) { - long nLeft = rParam.pShadow->CalcShadowSpace(SHADOW_LEFT); - long nTop = rParam.pShadow->CalcShadowSpace(SHADOW_TOP); + long nLeft = rParam.pShadow->CalcShadowSpace(SHADOW_LEFT); + long nTop = rParam.pShadow->CalcShadowSpace(SHADOW_TOP); aStart.X() += nLeft; aStart.Y() += nTop; aPaperSize.Width() -= nLeft + rParam.pShadow->CalcShadowSpace(SHADOW_RIGHT); @@ -1836,14 +1836,14 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, pEditEngine->SetPaperSize(aPaperSize); const EditTextObject* pObject; - // Rahmen / Hintergrund + // Rahmen / Hintergrund Point aBorderStart( nLineStartX, nStartY ); Size aBorderSize( nLineWidth, rParam.nHeight-rParam.nDistance ); if ( rParam.bDynamic ) { - // hier nochmal anpassen, wegen geraden/ungeraden Kopf/Fusszeilen - // und evtl. anderen Umbruechen durch Variablen (Seitennummer etc.) + // hier nochmal anpassen, wegen geraden/ungeraden Kopf/Fusszeilen + // und evtl. anderen Umbruechen durch Variablen (Seitennummer etc.) long nMaxHeight = 0; nMaxHeight = Max( nMaxHeight, TextHeight( pHFItem->GetLeftArea() ) ); @@ -1859,7 +1859,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, rParam.pShadow->CalcShadowSpace(SHADOW_BOTTOM); if (nMaxHeight < rParam.nManHeight-rParam.nDistance) - nMaxHeight = rParam.nManHeight-rParam.nDistance; // eingestelltes Minimum + nMaxHeight = rParam.nManHeight-rParam.nDistance; // eingestelltes Minimum aBorderSize.Height() = nMaxHeight; } @@ -1868,17 +1868,17 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, { double nOldScaleX = nScaleX; double nOldScaleY = nScaleY; - nScaleX = nScaleY = 1.0; // direkt in Twips ausgeben + nScaleX = nScaleY = 1.0; // direkt in Twips ausgeben DrawBorder( aBorderStart.X(), aBorderStart.Y(), aBorderSize.Width(), aBorderSize.Height(), rParam.pBorder, rParam.pBack, rParam.pShadow ); nScaleX = nOldScaleX; nScaleY = nOldScaleY; - // Clipping fuer Text + // Clipping fuer Text pDev->SetClipRegion( Rectangle( aStart, aPaperSize ) ); - // links + // links pObject = pHFItem->GetLeftArea(); if (pObject) @@ -1892,7 +1892,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, pEditEngine->Draw( pDev, aDraw, 0 ); } - // Mitte + // Mitte pObject = pHFItem->GetCenterArea(); if (pObject) @@ -1906,7 +1906,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, pEditEngine->Draw( pDev, aDraw, 0 ); } - // rechts + // rechts pObject = pHFItem->GetRightArea(); if (pObject) @@ -1942,15 +1942,15 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData Font aMarkFont; ScAutoFontColorMode eColorMode = bUseStyleColor ? SC_AUTOCOL_DISPLAY : SC_AUTOCOL_PRINT; ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont( aMarkFont, eColorMode ); -//? aMarkFont.SetWeight( WEIGHT_BOLD ); +//? aMarkFont.SetWeight( WEIGHT_BOLD ); pDev->SetFont( aMarkFont ); long nMarkLen = pDev->GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GW99999:"))); // ohne Space, weil's eh selten so weit kommt Size aDataSize = aPageRect.GetSize(); - if ( nMarkLen > aDataSize.Width() / 2 ) // alles viel zu klein? - nMarkLen = aDataSize.Width() / 2; // Seite bruederlich aufteilen + if ( nMarkLen > aDataSize.Width() / 2 ) // alles viel zu klein? + nMarkLen = aDataSize.Width() / 2; // Seite bruederlich aufteilen aDataSize.Width() -= nMarkLen; pEditEngine->SetPaperSize( aDataSize ); @@ -1981,7 +1981,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData pPos->Format( aMarkStr, SCA_VALID, pDoc, pDoc->GetAddressConvention() ); aMarkStr += ':'; - // Zellposition auch per EditEngine, damit die Position stimmt + // Zellposition auch per EditEngine, damit die Position stimmt pEditEngine->SetText(aMarkStr); pEditEngine->Draw( pDev, Point( aPageRect.Left(), nPosY ), 0 ); } @@ -1995,7 +1995,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData } nPosY += nTextHeight; - nPosY += 200; // Abstand + nPosY += 200; // Abstand ++nCount; bOk = TRUE; } @@ -2014,7 +2014,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr if ( bDoPrint && bClearWin ) { - //! mit PrintPage zusammenfassen !!! + //! mit PrintPage zusammenfassen !!! Color aBackgroundColor( COL_WHITE ); if ( bUseStyleColor ) @@ -2029,7 +2029,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr } - // aPageRect auf linke / rechte Seiten anpassen + // aPageRect auf linke / rechte Seiten anpassen Rectangle aTempRect = Rectangle( Point(), aPageSize ); if (IsMirror(nPageNo)) @@ -2051,7 +2051,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr if ( bDoPrint || pLocationData ) { - // Kopf- und Fusszeilen + // Kopf- und Fusszeilen if (aHdr.bEnable) { @@ -2082,11 +2082,11 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO BOOL bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; - // nPageNo is the page number within all sheets of one "start page" setting + // nPageNo is the page number within all sheets of one "start page" setting if ( bClearWin && bDoPrint ) { - // muss genau zum Zeichnen des Rahmens in preview.cxx passen !!! + // muss genau zum Zeichnen des Rahmens in preview.cxx passen !!! Color aBackgroundColor( COL_WHITE ); if ( bUseStyleColor ) @@ -2101,7 +2101,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO } - // aPageRect auf linke / rechte Seiten anpassen + // aPageRect auf linke / rechte Seiten anpassen Rectangle aTempRect = Rectangle( Point(), aPageSize ); if (IsMirror(nPageNo)) @@ -2139,7 +2139,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO // pPrinter->StartPage(); } - // Kopf- und Fusszeilen (ohne Zentrierung) + // Kopf- und Fusszeilen (ohne Zentrierung) if (aHdr.bEnable) { @@ -2152,9 +2152,9 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO PrintHF( nPageNo, FALSE, nFooterY, bDoPrint, pLocationData ); } - // Position ( Raender / zentrieren ) + // Position ( Raender / zentrieren ) - long nLeftSpace = aPageRect.Left(); // Document-Twips + long nLeftSpace = aPageRect.Left(); // Document-Twips long nTopSpace = aPageRect.Top(); if ( bCenterHor || bLayoutRTL ) { @@ -2169,18 +2169,18 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nDataWidth += (long) PRINT_HEADER_WIDTH; if (pBorderItem) nDataWidth += pBorderItem->GetDistance(BOX_LINE_LEFT) + - pBorderItem->GetDistance(BOX_LINE_RIGHT); //! Line width? + pBorderItem->GetDistance(BOX_LINE_RIGHT); //! Line width? if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE) nDataWidth += pShadowItem->CalcShadowSpace(SHADOW_LEFT) + pShadowItem->CalcShadowSpace(SHADOW_RIGHT); if ( bCenterHor ) { - nLeftSpace += ( aPageRect.GetWidth() - nDataWidth ) / 2; // LTR or RTL + nLeftSpace += ( aPageRect.GetWidth() - nDataWidth ) / 2; // LTR or RTL if (pBorderItem) nLeftSpace -= lcl_LineTotal(pBorderItem->GetLeft()); } else if ( bLayoutRTL ) - nLeftSpace += aPageRect.GetWidth() - nDataWidth; // align to the right edge of the page + nLeftSpace += aPageRect.GetWidth() - nDataWidth; // align to the right edge of the page } if ( bCenterVer ) { @@ -2192,7 +2192,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nDataHeight += (long) PRINT_HEADER_HEIGHT; if (pBorderItem) nDataHeight += pBorderItem->GetDistance(BOX_LINE_TOP) + - pBorderItem->GetDistance(BOX_LINE_BOTTOM); //! Line width? + pBorderItem->GetDistance(BOX_LINE_BOTTOM); //! Line width? if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE) nDataHeight += pShadowItem->CalcShadowSpace(SHADOW_TOP) + pShadowItem->CalcShadowSpace(SHADOW_BOTTOM); @@ -2201,14 +2201,14 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nTopSpace -= lcl_LineTotal(pBorderItem->GetTop()); } - // calculate sizes of the elements for partitioning - // (header, repeat, data) + // calculate sizes of the elements for partitioning + // (header, repeat, data) long nHeaderWidth = 0; long nHeaderHeight = 0; long nRepeatWidth = 0; long nRepeatHeight = 0; - long nContentWidth = 0; // scaled - not the same as nDataWidth above + long nContentWidth = 0; // scaled - not the same as nDataWidth above long nContentHeight = 0; if (aTableParam.bHeaders) { @@ -2226,12 +2226,12 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nContentHeight += pDoc->GetScaledRowHeight( nY1, nY2, nPrintTab, nScaleY); - // partition the page + // partition the page long nStartX = ((long) ( nLeftSpace * nScaleX )); long nStartY = ((long) ( nTopSpace * nScaleY )); -// nStartX -= aOffset.X(); // schon im MapMode -// nStartY -= aOffset.Y(); +// nStartX -= aOffset.X(); // schon im MapMode +// nStartY -= aOffset.Y(); long nInnerStartX = nStartX; long nInnerStartY = nStartY; @@ -2250,10 +2250,10 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO if ( bLayoutRTL ) { - // arrange elements starting from the right edge + // arrange elements starting from the right edge nInnerStartX += nHeaderWidth + nRepeatWidth + nContentWidth; - // make rounding easier so the elements are really next to each other in preview + // make rounding easier so the elements are really next to each other in preview Size aOffsetOnePixel = pDev->PixelToLogic( Size(1,1), aOffsetMode ); long nOffsetOneX = aOffsetOnePixel.Width(); nInnerStartX += nOffsetOneX / 2; @@ -2262,7 +2262,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO long nFrameStartX = nInnerStartX; long nFrameStartY = nInnerStartY; - long nRepStartX = nInnerStartX + nHeaderWidth * nLayoutSign; // widths/heights are 0 if not used + long nRepStartX = nInnerStartX + nHeaderWidth * nLayoutSign; // widths/heights are 0 if not used long nRepStartY = nInnerStartY + nHeaderHeight; long nDataX = nRepStartX + nRepeatWidth * nLayoutSign; long nDataY = nRepStartY + nRepeatHeight; @@ -2273,19 +2273,19 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO if ( bLayoutRTL ) { - // each element's start position is its left edge - //! subtract one pixel less? - nInnerStartX -= nHeaderWidth; // used for header + // each element's start position is its left edge + //! subtract one pixel less? + nInnerStartX -= nHeaderWidth; // used for header nRepStartX -= nRepeatWidth; nDataX -= nContentWidth; - // continue right of the main elements again + // continue right of the main elements again nEndX += nHeaderWidth + nRepeatWidth + nContentWidth; } - // Seiten-Rahmen / Hintergrund + // Seiten-Rahmen / Hintergrund - //! nEndX/Y anpassen + //! nEndX/Y anpassen long nBorderEndX = nEndX; long nBorderEndY = nEndY; @@ -2313,7 +2313,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO pDev->SetMapMode( aOffsetMode ); - // Wiederholungszeilen/Spalten ausgeben + // Wiederholungszeilen/Spalten ausgeben if (bDoRepCol && bDoRepRow) { @@ -2341,15 +2341,15 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO LocateArea( nX1,nRepeatStartRow, nX2,nRepeatEndRow, nDataX,nRepStartY, FALSE,TRUE, *pLocationData ); } - // Daten ausgeben + // Daten ausgeben if ( bDoPrint ) PrintArea( nX1,nY1, nX2,nY2, nDataX,nDataY, !bDoRepCol,!bDoRepRow,TRUE,TRUE ); if ( pLocationData ) LocateArea( nX1,nY1, nX2,nY2, nDataX,nDataY, FALSE,FALSE, *pLocationData ); - // Spalten-/Zeilenkoepfe ausgeben - // nach den Daten (ueber evtl. weitergezeichneten Schatten) + // Spalten-/Zeilenkoepfe ausgeben + // nach den Daten (ueber evtl. weitergezeichneten Schatten) Color aGridColor( COL_BLACK ); if ( bUseStyleColor ) @@ -2394,7 +2394,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO LocateRowHdr( nY1,nY2, nInnerStartX,nDataY, FALSE, *pLocationData ); } - // einfacher Rahmen + // einfacher Rahmen if ( bDoPrint && ( aTableParam.bGrid || aTableParam.bHeaders ) ) { @@ -2415,7 +2415,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO pDev->SetLineColor( aGridColor ); pDev->SetFillColor(); pDev->DrawRect( Rectangle( nLeftX, nTopY, nRightX, nBottomY ) ); - // nEndX/Y ohne Rahmen-Anpassung + // nEndX/Y ohne Rahmen-Anpassung } if ( pPrinter && bDoPrint ) @@ -2452,7 +2452,7 @@ void ScPrintFunc::SetUseStyleColor( BOOL bFlag ) void ScPrintFunc::SetRenderFlag( BOOL bFlag ) { - bIsRender = bFlag; // set when using XRenderable (PDF) + bIsRender = bFlag; // set when using XRenderable (PDF) } void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects() @@ -2467,8 +2467,8 @@ void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects() } // -// UpdatePages wird nur von aussen gerufen, um die Umbrueche fuer die Anzeige -// richtig zu setzen - immer ohne UserArea +// UpdatePages wird nur von aussen gerufen, um die Umbrueche fuer die Anzeige +// richtig zu setzen - immer ohne UserArea // BOOL ScPrintFunc::UpdatePages() @@ -2476,11 +2476,11 @@ BOOL ScPrintFunc::UpdatePages() if (!pParamSet) return FALSE; - // Zoom + // Zoom nZoom = 100; if (aTableParam.bScalePageNum || aTableParam.bScaleTo) - nZoom = ZOOM_MIN; // stimmt fuer Umbrueche + nZoom = ZOOM_MIN; // stimmt fuer Umbrueche else if (aTableParam.bScaleAll) { nZoom = aTableParam.nScaleAll; @@ -2493,10 +2493,10 @@ BOOL ScPrintFunc::UpdatePages() for (SCTAB nTab=0; nTab<nTabCount; nTab++) if ( nTab==nPrintTab || pDoc->GetPageStyle(nTab)==aName ) { - // Wiederholungszeilen / Spalten + // Wiederholungszeilen / Spalten pDoc->SetRepeatArea( nTab, nRepeatStartCol,nRepeatEndCol, nRepeatStartRow,nRepeatEndRow ); - // Umbrueche setzen + // Umbrueche setzen ResetBreaks(nTab); pDocShell->PostPaint(0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID); } @@ -2504,32 +2504,32 @@ BOOL ScPrintFunc::UpdatePages() return TRUE; } -long ScPrintFunc::CountPages() // setzt auch nPagesX, nPagesY +long ScPrintFunc::CountPages() // setzt auch nPagesX, nPagesY { BOOL bAreaOk = FALSE; if (pDoc->HasTable( nPrintTab )) { - if (aAreaParam.bPrintArea) // Druckbereich angegeben? + if (aAreaParam.bPrintArea) // Druckbereich angegeben? { if ( bPrintCurrentTable ) { ScRange& rRange = aAreaParam.aPrintArea; - // hier kein Vergleich der Tabellen mehr, die Area gilt immer fuer diese Tabelle - // wenn hier verglichen werden soll, muss die Tabelle der Druckbereiche beim - // Einfuegen von Tabellen etc. angepasst werden ! + // hier kein Vergleich der Tabellen mehr, die Area gilt immer fuer diese Tabelle + // wenn hier verglichen werden soll, muss die Tabelle der Druckbereiche beim + // Einfuegen von Tabellen etc. angepasst werden ! nStartCol = rRange.aStart.Col(); nStartRow = rRange.aStart.Row(); nEndCol = rRange.aEnd .Col(); nEndRow = rRange.aEnd .Row(); - bAreaOk = AdjustPrintArea(FALSE); // begrenzen + bAreaOk = AdjustPrintArea(FALSE); // begrenzen } else bAreaOk = FALSE; } - else // aus Dokument suchen + else // aus Dokument suchen bAreaOk = AdjustPrintArea(TRUE); } @@ -2554,7 +2554,7 @@ long ScPrintFunc::CountPages() // setzt auch nPagesX, n } else { - CalcZoom(RANGENO_NORANGE); // Zoom berechnen + CalcZoom(RANGENO_NORANGE); // Zoom berechnen if ( aTableParam.bSkipEmpty ) for (nY=0; nY<nPagesY; nY++) nPages += pPageRows[nY].CountVisible(); @@ -2567,7 +2567,7 @@ long ScPrintFunc::CountPages() // setzt auch nPagesX, n } else { -// nZoom = 100; // nZoom auf letztem Wert stehenlassen !!! +// nZoom = 100; // nZoom auf letztem Wert stehenlassen !!! nPagesX = nPagesY = nTotalY = 0; return 0; } @@ -2584,9 +2584,9 @@ long ScPrintFunc::CountNotePages() BOOL bError = FALSE; if (!aAreaParam.bPrintArea) - bError = !AdjustPrintArea(TRUE); // komplett aus Dok suchen + bError = !AdjustPrintArea(TRUE); // komplett aus Dok suchen - USHORT nRepeats = 1; // wie oft durchgehen ? + USHORT nRepeats = 1; // wie oft durchgehen ? if (bMultiArea) nRepeats = pDoc->GetPrintRangeCount(nPrintTab); if (bError) @@ -2595,7 +2595,7 @@ long ScPrintFunc::CountNotePages() for (USHORT nStep=0; nStep<nRepeats; nStep++) { BOOL bDoThis = TRUE; - if (bMultiArea) // alle Areas durchgehen + if (bMultiArea) // alle Areas durchgehen { const ScRange* pThisRange = pDoc->GetPrintRange( nPrintTab, nStep ); if ( pThisRange ) @@ -2642,19 +2642,19 @@ long ScPrintFunc::CountNotePages() return nPages; } -void ScPrintFunc::InitModes() // aus nZoom etc. die MapModes setzen +void ScPrintFunc::InitModes() // aus nZoom etc. die MapModes setzen { aOffset = Point( aSrcOffset.X()*100/nZoom, aSrcOffset.Y()*100/nZoom ); long nEffZoom = nZoom * (long) nManualZoom; -// nScaleX = nScaleY = 1.0; // Ausgabe in Twips - nScaleX = nScaleY = HMM_PER_TWIPS; // Ausgabe in 1/100 mm +// nScaleX = nScaleY = 1.0; // Ausgabe in Twips + nScaleX = nScaleY = HMM_PER_TWIPS; // Ausgabe in 1/100 mm Fraction aZoomFract( nEffZoom,10000 ); Fraction aHorFract = aZoomFract; - if ( !pPrinter && !bIsRender ) // adjust scale for preview + if ( !pPrinter && !bIsRender ) // adjust scale for preview { double nFact = pDocShell->GetOutputFactor(); aHorFract = Fraction( (long)( nEffZoom / nFact ), 10000 ); @@ -2676,7 +2676,7 @@ void ScPrintFunc::ApplyPrintSettings() if ( pPrinter ) { // - // Printer zum Drucken umstellen + // Printer zum Drucken umstellen // Size aEnumSize = aPageSize; @@ -2710,9 +2710,9 @@ void ScPrintFunc::ApplyPrintSettings() } //-------------------------------------------------------------------- -// rPageRanges = Range fuer alle Tabellen -// nStartPage = in rPageRanges beginnen bei nStartPage -// nDisplayStart = lfd. Nummer fuer Anzeige der Seitennummer +// rPageRanges = Range fuer alle Tabellen +// nStartPage = in rPageRanges beginnen bei nStartPage +// nDisplayStart = lfd. Nummer fuer Anzeige der Seitennummer long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, long nStartPage, long nDisplayStart, BOOL bDoPrint, @@ -2745,14 +2745,14 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, long nPrinted = 0; long nEndPage = rPageRanges.GetTotalRange().Max(); - USHORT nRepeats = 1; // wie oft durchgehen ? + USHORT nRepeats = 1; // wie oft durchgehen ? if (bMultiArea) nRepeats = pDoc->GetPrintRangeCount(nPrintTab); for (USHORT nStep=0; nStep<nRepeats; nStep++) { - if (bMultiArea) // Bereich neu belegen ? + if (bMultiArea) // Bereich neu belegen ? { - CalcZoom(nStep); // setzt auch nStartCol etc. neu + CalcZoom(nStep); // setzt auch nStartCol etc. neu InitModes(); } @@ -2763,7 +2763,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, size_t nCountX; size_t nCountY; - if (aTableParam.bTopDown) // von oben nach unten + if (aTableParam.bTopDown) // von oben nach unten { nX1 = nStartCol; for (nCountX=0; nCountX<nPagesX; nCountX++) @@ -2793,7 +2793,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, nX1 = nX2 + 1; } } - else // von links nach rechts + else // von links nach rechts { for (nCountY=0; nCountY<nPagesY; nCountY++) { @@ -2847,7 +2847,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, if (bPageSelected) { ++nPrinted; - bSourceRangeValid = FALSE; // last page was no cell range + bSourceRangeValid = FALSE; // last page was no cell range } ++nPageNo; } @@ -2858,12 +2858,12 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, while (nNoteAdd); if ( bMultiArea ) - ResetBreaks(nPrintTab); // Breaks fuer Anzeige richtig + ResetBreaks(nPrintTab); // Breaks fuer Anzeige richtig return nPrinted; } -void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom berechnen +void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom berechnen { USHORT nRCount = pDoc->GetPrintRangeCount( nPrintTab ); const ScRange* pThisRange = NULL; @@ -2877,7 +2877,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom bere nEndRow = pThisRange->aEnd .Row(); } - if (!AdjustPrintArea(FALSE)) // leer + if (!AdjustPrintArea(FALSE)) // leer { nZoom = 100; nPagesX = nPagesY = nTotalY = 0; @@ -2905,7 +2905,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom bere if (nZoom == 100) // If it fits at 100 %, it's good enough for me. break; - + nLastFitZoom = nZoom; nZoom = (nLastNonFitZoom + nZoom) / 2; @@ -2947,7 +2947,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom bere if (nZoom == 100) // If it fits at 100 %, it's good enough for me. break; - + nLastFitZoom = nZoom; nZoom = (nLastNonFitZoom + nZoom) / 2; @@ -2988,17 +2988,17 @@ Size ScPrintFunc::GetDocPageSize() { // Hoehe Kopf-/Fusszeile anpassen - InitModes(); // aTwipMode aus nZoom initialisieren - pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips + InitModes(); // aTwipMode aus nZoom initialisieren + pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips UpdateHFHeight( aHdr ); UpdateHFHeight( aFtr ); // Seitengroesse in Document-Twips - // Berechnung Left / Right auch in PrintPage + // Berechnung Left / Right auch in PrintPage aPageRect = Rectangle( Point(), aPageSize ); - aPageRect.Left() = ( aPageRect.Left() + nLeftMargin ) * 100 / nZoom; - aPageRect.Right() = ( aPageRect.Right() - nRightMargin ) * 100 / nZoom; + aPageRect.Left() = ( aPageRect.Left() + nLeftMargin ) * 100 / nZoom; + aPageRect.Right() = ( aPageRect.Right() - nRightMargin ) * 100 / nZoom; aPageRect.Top() = ( aPageRect.Top() + nTopMargin ) * 100 / nZoom + aHdr.nHeight; aPageRect.Bottom() = ( aPageRect.Bottom() - nBottomMargin ) * 100 / nZoom - aFtr.nHeight; @@ -3029,7 +3029,7 @@ Size ScPrintFunc::GetDocPageSize() return aDocPageSize; } -void ScPrintFunc::ResetBreaks( SCTAB nTab ) // Breaks fuer Anzeige richtig setzen +void ScPrintFunc::ResetBreaks( SCTAB nTab ) // Breaks fuer Anzeige richtig setzen { pDoc->SetPageSize( nTab, GetDocPageSize() ); pDoc->UpdatePageBreaks( nTab, NULL ); @@ -3153,7 +3153,7 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten au SCROW nLastRow = -1; if (!pDoc->RowHidden(nRow, nPrintTab, NULL, &nLastRow)) - { + { bVisRow = true; nLastVisibleRow = nLastRow; } @@ -3181,14 +3181,14 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten au } //------------------------------------------------------------------------ -// class ScJobSetup +// class ScJobSetup //------------------------------------------------------------------------ ScJobSetup::ScJobSetup( SfxPrinter* pPrinter ) { eOrientation = pPrinter->GetOrientation(); - nPaperBin = pPrinter->GetPaperBin(); - ePaper = pPrinter->GetPaper(); + nPaperBin = pPrinter->GetPaperBin(); + ePaper = pPrinter->GetPaper(); if ( PAPER_USER == ePaper ) { diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 21d66c5a39be..6c31e3b41d32 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.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,18 +76,18 @@ SFX_IMPL_CHILDWINDOW(ScArgumentDlgWrapper, SID_OPENDLG_ARGUMENT ) //SFX_IMPL_MODELESSDIALOG(ScValidityRefChildWin, SID_VALIDITY_REFERENCE ) SFX_IMPL_CHILDWINDOW(ScValidityRefChildWin, SID_VALIDITY_REFERENCE) SfxChildWinInfo __EXPORT ScValidityRefChildWin::GetInfo() const -{ +{ SfxChildWinInfo anInfo = SfxChildWindow::GetInfo(); - + if( Window *pWnd = GetWindow() ) - { + { anInfo.aSize = pWnd->GetSizePixel(); - + if( pWnd->IsDialog() ) if ( static_cast<Dialog*>(pWnd)->IsRollUp() ) anInfo.nFlags |= SFX_CHILDWIN_ZOOMIN; } - + return anInfo; } @@ -95,28 +95,28 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); } //<!--Added by PengYunQuan for Validity Cell Range Picker #define IMPL_CHILD_CTOR(Class,sid) \ - Class::Class( Window* pParentP, \ - USHORT nId, \ - SfxBindings* p, \ - SfxChildWinInfo* pInfo ) \ - : SfxChildWindow(pParentP, nId) \ - { \ + Class::Class( Window* pParentP, \ + USHORT nId, \ + SfxBindings* p, \ + SfxChildWinInfo* pInfo ) \ + : SfxChildWindow(pParentP, nId) \ + { \ /*//<!--Added by PengYunQuan for Validity Cell Range Picker*/\ /************************************************************************************/\ - /* When a new document is creating, the SfxViewFrame may be ready, */\ - /* But the ScTabViewShell may have not been activated yet. In this */\ - /* situation, SfxViewShell::Current() does not get the correct shell, */\ - /* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current() */\ + /* When a new document is creating, the SfxViewFrame may be ready, */\ + /* But the ScTabViewShell may have not been activated yet. In this */\ + /* situation, SfxViewShell::Current() does not get the correct shell, */\ + /* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current() */\ /************************************************************************************/\ ScTabViewShell* pViewShell = lcl_GetTabViewShell( p ); \ /*//-->Added by PengYunQuan for Validity Cell Range Picker*/\ if (!pViewShell) \ pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); \ - DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ - pWindow = pViewShell ? \ - pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : NULL; \ - if (pViewShell && !pWindow) \ - pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ + DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ + pWindow = pViewShell ? \ + pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : NULL; \ + if (pViewShell && !pWindow) \ + pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ } @@ -205,21 +205,21 @@ IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION ) // ScSimpleRefDlgWrapper //------------------------------------------------------------------------- -static BOOL bScSimpleRefFlag; -static long nScSimpleRefHeight; -static long nScSimpleRefWidth; -static long nScSimpleRefX; -static long nScSimpleRefY; -static BOOL bAutoReOpen=TRUE; +static BOOL bScSimpleRefFlag; +static long nScSimpleRefHeight; +static long nScSimpleRefWidth; +static long nScSimpleRefX; +static long nScSimpleRefY; +static BOOL bAutoReOpen=TRUE; ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP, - USHORT nId, - SfxBindings* p, - SfxChildWinInfo* pInfo ) + USHORT nId, + SfxBindings* p, + SfxChildWinInfo* pInfo ) : SfxChildWindow(pParentP, nId) { -// ScTabViewShell* pViewShell = -// PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); +// ScTabViewShell* pViewShell = +// PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); ScTabViewShell* pViewShell = NULL; SfxDispatcher* pDisp = p->GetDispatcher(); @@ -325,7 +325,7 @@ void ScSimpleRefDlgWrapper::StartRefInput() // ScAcceptChgDlgWrapper //Kommentar: sollte in die ViewShell //------------------------------------------------------------------------- -ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, +ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -396,29 +396,29 @@ namespace if( SfxViewFrame *pFrm = pDisp->GetFrame() ) if( SfxViewShell* pViewSh = pFrm->GetViewShell() ) return dynamic_cast<ScTabViewShell*>( pViewSh ); - + return NULL; } } -ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, \ - USHORT nId, \ - SfxBindings* p, \ - SfxChildWinInfo* /*pInfo*/ ) \ +ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, \ + USHORT nId, \ + SfxBindings* p, \ + SfxChildWinInfo* /*pInfo*/ ) \ : SfxChildWindow(pParentP, nId), m_bVisibleLock( false ), m_bFreeWindowLock( false ), m_pSavedWndParent( NULL ) { SetWantsFocus( FALSE );\ - ScTabViewShell* pViewShell = \ + ScTabViewShell* pViewShell = \ NULL != ( pWindow = ScValidationDlg::Find1AliveObject( pParentP ) ) ? static_cast<ScValidationDlg*>(pWindow)->GetTabViewShell() : lcl_GetTabViewShell( p ); if (!pViewShell) pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); - DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ - if (pViewShell && !pWindow) \ - pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ + DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ + if (pViewShell && !pWindow) \ + pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ else if( pWindow /*&& pWindow->ISA(ScValidationDlg)*/ ) {}//pWindow = new Window( pParentP, WB_HIDE ); diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx index c9af56f00d33..1d0fb518e09c 100644 --- a/sc/source/ui/view/scextopt.cxx +++ b/sc/source/ui/view/scextopt.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/view/select.cxx b/sc/source/ui/view/select.cxx index 52139ccb8f04..cae66699b717 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.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 @@ -46,19 +46,19 @@ #include "docsh.hxx" #include "tabprotection.hxx" -extern USHORT nScFillModeMouseModifier; // global.cxx +extern USHORT nScFillModeMouseModifier; // global.cxx using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- -static Point aSwitchPos; //! Member +static Point aSwitchPos; //! Member static BOOL bDidSwitch = FALSE; // ----------------------------------------------------------------------- // -// View (Gridwin / Tastatur) +// View (Gridwin / Tastatur) // ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) : @@ -83,7 +83,7 @@ void ScViewFunctionSet::SetSelectionEngine( ScViewSelectionEngine* pSelEngine ) pEngine = pSelEngine; } -// Drag & Drop +// Drag & Drop void __EXPORT ScViewFunctionSet::BeginDrag() { @@ -106,7 +106,7 @@ void __EXPORT ScViewFunctionSet::BeginDrag() BOOL bRefMode = pScMod->IsFormulaMode(); if (!bRefMode) { - pViewData->GetView()->FakeButtonUp( GetWhich() ); // ButtonUp is swallowed + pViewData->GetView()->FakeButtonUp( GetWhich() ); // ButtonUp is swallowed ScMarkData& rMark = pViewData->GetMarkData(); rMark.MarkToSimple(); @@ -143,22 +143,22 @@ void __EXPORT ScViewFunctionSet::BeginDrag() Window* pWindow = pViewData->GetActiveWin(); if ( pWindow->IsTracking() ) - pWindow->EndTracking( ENDTRACK_CANCEL ); // abort selecting + pWindow->EndTracking( ENDTRACK_CANCEL ); // abort selecting - SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D + SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D pTransferObj->StartDrag( pWindow, nDragActions ); - return; // dragging started + return; // dragging started } else delete pClipDoc; } } - Sound::Beep(); // can't drag + Sound::Beep(); // can't drag } -// Selection +// Selection void __EXPORT ScViewFunctionSet::CreateAnchor() { @@ -236,15 +236,15 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO if ( bDidSwitch ) { if ( rPointPixel == aSwitchPos ) - return FALSE; // nicht auf falschem Fenster scrollen + return FALSE; // nicht auf falschem Fenster scrollen else bDidSwitch = FALSE; } - aSwitchPos = rPointPixel; // nur wichtig, wenn bDidSwitch + aSwitchPos = rPointPixel; // nur wichtig, wenn bDidSwitch - // treat position 0 as -1, so scrolling is always possible - // (with full screen and hidden headers, the top left border may be at 0) - // (moved from ScViewData::GetPosFromPixel) + // treat position 0 as -1, so scrolling is always possible + // (with full screen and hidden headers, the top left border may be at 0) + // (moved from ScViewData::GetPosFromPixel) Point aEffPos = rPointPixel; if ( aEffPos.X() == 0 ) @@ -252,7 +252,7 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO if ( aEffPos.Y() == 0 ) aEffPos.Y() = -1; - // Scrolling + // Scrolling Size aWinSize = pEngine->GetWindow()->GetOutputSizePixel(); BOOL bRightScroll = ( aEffPos.X() >= aWinSize.Width() ); @@ -260,13 +260,13 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO BOOL bNegScroll = ( aEffPos.X() < 0 || aEffPos.Y() < 0 ); BOOL bScroll = bRightScroll || bBottomScroll || bNegScroll; - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aEffPos.X(), aEffPos.Y(), GetWhich(), - nPosX, nPosY, TRUE, TRUE ); // mit Repair + nPosX, nPosY, TRUE, TRUE ); // mit Repair - // fuer AutoFill in der Mitte der Zelle umschalten - // dabei aber nicht das Scrolling nach rechts/unten verhindern + // fuer AutoFill in der Mitte der Zelle umschalten + // dabei aber nicht das Scrolling nach rechts/unten verhindern if ( pViewData->IsFillMode() || pViewData->GetFillMode() == SC_FILL_MATRIX ) { BOOL bLeft, bTop; @@ -284,10 +284,10 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO nPosY = -1; } } - // negativ ist erlaubt + // negativ ist erlaubt } - // ueber Fixier-Grenze bewegt? + // ueber Fixier-Grenze bewegt? ScSplitPos eWhich = GetWhich(); if ( eWhich == pViewData->GetActivePart() ) @@ -377,7 +377,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol else if (pViewData->IsFillMode() || (pViewData->GetFillMode() == SC_FILL_MATRIX && (nScFillModeMouseModifier & KEY_MOD1) )) { - // Wenn eine Matrix angefasst wurde, kann mit Ctrl auf AutoFill zurueckgeschaltet werden + // Wenn eine Matrix angefasst wurde, kann mit Ctrl auf AutoFill zurueckgeschaltet werden SCCOL nStartX, nEndX; SCROW nStartY, nEndY; // Block @@ -395,9 +395,9 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol if ( nPosX+1 >= (SCsCOL) nStartX && nPosX <= (SCsCOL) nEndX && nPosY+1 >= (SCsROW) nStartY && nPosY <= (SCsROW) nEndY && - ( nPosX != nEndX || nPosY != nEndY ) ) // verkleinern ? + ( nPosX != nEndX || nPosY != nEndY ) ) // verkleinern ? { - // Richtung (links oder oben) + // Richtung (links oder oben) long nSizeX = 0; for (SCCOL i=nPosX+1; i<=nEndX; i++) @@ -417,7 +417,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol if ( nDelStartY < nStartY ) nDelStartY = nStartY; - // Bereich setzen + // Bereich setzen pViewData->SetDelMark( ScRange( nDelStartX,nDelStartY,nTab, nEndX,nEndY,nTab ) ); @@ -426,10 +426,10 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol pViewData->GetView()-> PaintArea( nStartX,nDelStartY, nEndX,nEndY, SC_UPDATE_MARKS ); - nPosX = nEndX; // roten Rahmen um ganzen Bereich lassen + nPosX = nEndX; // roten Rahmen um ganzen Bereich lassen nPosY = nEndY; - // Referenz wieder richtigherum, falls unten umgedreht + // Referenz wieder richtigherum, falls unten umgedreht if ( nStartX != pViewData->GetRefStartX() || nStartY != pViewData->GetRefStartY() ) { pViewData->GetView()->DoneRefMode(); @@ -450,8 +450,8 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol long nSizeX = 0; if ( bNegX ) { - // #94321# in SetCursorAtPoint hidden columns are skipped. - // They must be skipped here too, or the result will always be the first hidden column. + // #94321# in SetCursorAtPoint hidden columns are skipped. + // They must be skipped here too, or the result will always be the first hidden column. do ++nPosX; while ( nPosX<nStartX && pDoc->ColHidden(nPosX, nTab) ); for (SCCOL i=nPosX; i<nStartX; i++) nSizeX += pDoc->GetColWidth( i, nTab ); @@ -463,8 +463,8 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol long nSizeY = 0; if ( bNegY ) { - // #94321# in SetCursorAtPoint hidden rows are skipped. - // They must be skipped here too, or the result will always be the first hidden row. + // #94321# in SetCursorAtPoint hidden rows are skipped. + // They must be skipped here too, or the result will always be the first hidden row. if (++nPosY < nStartY) { nPosY = pDoc->FirstVisibleRow(nPosY, nStartY-1, nTab); @@ -476,7 +476,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol else nSizeY += pDoc->GetRowHeight( nEndY+1, nPosY, nTab ); - if ( nSizeX > nSizeY ) // Fill immer nur in einer Richtung + if ( nSizeX > nSizeY ) // Fill immer nur in einer Richtung { nPosY = nEndY; bNegY = FALSE; @@ -538,12 +538,12 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol } // else neue Modi } - else // normales Markieren + else // normales Markieren { BOOL bHideCur = bAnchor && ( (SCCOL)nPosX != pViewData->GetCurX() || (SCROW)nPosY != pViewData->GetCurY() ); if (bHideCur) - pView->HideAllCursors(); // sonst zweimal: Block und SetCursor + pView->HideAllCursors(); // sonst zweimal: Block und SetCursor if (bAnchor) { @@ -576,18 +576,18 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol aAnchorPos.Set( nPosX, nPosY, nTab ); bStarted = TRUE; } - // #i3875# *Hack* When a new cell is Ctrl-clicked with no pre-selected cells, - // it highlights that new cell as well as the old cell where the cursor is - // positioned prior to the click. A selection mode via Shift-F8 should also + // #i3875# *Hack* When a new cell is Ctrl-clicked with no pre-selected cells, + // it highlights that new cell as well as the old cell where the cursor is + // positioned prior to the click. A selection mode via Shift-F8 should also // follow the same behavior. else if ( pViewData->IsSelCtrlMouseClick() ) { SCCOL nOldX = pViewData->GetCurX(); SCROW nOldY = pViewData->GetCurY(); - + pView->InitBlockMode( nOldX, nOldY, nTab, TRUE ); pView->MarkCursor( (SCCOL) nOldX, (SCROW) nOldY, nTab ); - + if ( nOldX != nPosX || nOldY != nPosY ) { pView->DoneBlockMode( TRUE ); @@ -595,7 +595,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab ); aAnchorPos.Set( nPosX, nPosY, nTab ); } - + bStarted = TRUE; } pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY ); @@ -624,8 +624,8 @@ BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) ScMarkData& rMark = pViewData->GetMarkData(); if (bAnchor || !rMark.IsMultiMarked()) { - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), GetWhich(), nPosX, nPosY ); return pViewData->GetMarkData().IsCellMarked( (SCCOL) nPosX, (SCROW) nPosY ); } @@ -635,7 +635,7 @@ BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) void __EXPORT ScViewFunctionSet::DeselectAtPoint( const Point& /* rPointPixel */ ) { - // gibt's nicht + // gibt's nicht } void __EXPORT ScViewFunctionSet::DeselectAll() @@ -664,7 +664,7 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView, SelectionEngine( pWindow, pView->GetFunctionSet() ), eWhich( eSplitPos ) { - // Parameter einstellen + // Parameter einstellen SetSelectionMode( MULTIPLE_SELECTION ); EnableDrag( TRUE ); } @@ -673,7 +673,7 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView, //------------------------------------------------------------------------ // -// Spalten- / Zeilenheader +// Spalten- / Zeilenheader // ScHeaderFunctionSet::ScHeaderFunctionSet( ScViewData* pNewViewData ) : @@ -731,14 +731,14 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B { if ( bDidSwitch ) { - // die naechste gueltige Position muss vom anderen Fenster kommen + // die naechste gueltige Position muss vom anderen Fenster kommen if ( rPointPixel == aSwitchPos ) - return FALSE; // nicht auf falschem Fenster scrollen + return FALSE; // nicht auf falschem Fenster scrollen else bDidSwitch = FALSE; } - // Scrolling + // Scrolling Size aWinSize = pViewData->GetActiveWin()->GetOutputSizePixel(); BOOL bScroll; @@ -747,7 +747,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B else bScroll = ( rPointPixel.Y() < 0 || rPointPixel.Y() >= aWinSize.Height() ); - // ueber Fixier-Grenze bewegt? + // ueber Fixier-Grenze bewegt? BOOL bSwitched = FALSE; if ( bColumn ) @@ -763,7 +763,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B } } } - else // Zeilenkoepfe + else // Zeilenkoepfe { if ( pViewData->GetVSplitMode() == SC_SPLIT_FIX ) { @@ -780,13 +780,13 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B { aSwitchPos = rPointPixel; bDidSwitch = TRUE; - return FALSE; // nicht mit falschen Positionen rechnen + return FALSE; // nicht mit falschen Positionen rechnen } // - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), pViewData->GetActivePart(), nPosX, nPosY, FALSE ); if (bColumn) @@ -813,7 +813,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B if ( !bAnchor || !pView->IsBlockMode() ) { pView->DoneBlockMode( TRUE ); - pViewData->GetMarkData().MarkToMulti(); //! wer verstellt das ??? + pViewData->GetMarkData().MarkToMulti(); //! wer verstellt das ??? pView->InitBlockMode( nPosX, nPosY, pViewData->GetTabNo(), TRUE, bColumn, !bColumn ); bAnchor = TRUE; @@ -821,7 +821,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B pView->MarkCursor( nPosX, nPosY, pViewData->GetTabNo(), bColumn, !bColumn ); - // SelectionChanged innerhalb von HideCursor wegen UpdateAutoFillMark + // SelectionChanged innerhalb von HideCursor wegen UpdateAutoFillMark pView->SelectionChanged(); if (bHide) @@ -832,8 +832,8 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B BOOL __EXPORT ScHeaderFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) { - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), pViewData->GetActivePart(), nPosX, nPosY, FALSE ); @@ -859,7 +859,7 @@ void __EXPORT ScHeaderFunctionSet::DeselectAll() ScHeaderSelectionEngine::ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ) : SelectionEngine( pWindow, pFuncSet ) { - // Parameter einstellen + // Parameter einstellen SetSelectionMode( MULTIPLE_SELECTION ); EnableDrag( FALSE ); } diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx index 3412dd53f03a..0fd4a1720959 100644 --- a/sc/source/ui/view/selectionstate.cxx +++ b/sc/source/ui/view/selectionstate.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/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index f2100ba6d918..69070bea47f2 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.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/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 457395fd9deb..bbfb856848a9 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.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/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index daea22b78027..14d0a334caaf 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.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 @@ -155,8 +155,8 @@ void ScTabControl::MouseButtonDown( const MouseEvent& rMEvt ) ScModule* pScMod = SC_MOD(); if ( !pScMod->IsModalMode() && !pScMod->IsFormulaMode() && !IsInEditMode() ) { - // View aktivieren - pViewData->GetViewShell()->SetActive(); // Appear und SetViewFrame + // View aktivieren + pViewData->GetViewShell()->SetActive(); // Appear und SetViewFrame pViewData->GetView()->ActiveGrabFocus(); } @@ -226,9 +226,9 @@ void ScTabControl::Select() SCTAB nCount = pDoc->GetTableCount(); SCTAB i; - if ( pScMod->IsTableLocked() ) // darf jetzt nicht umgeschaltet werden ? + if ( pScMod->IsTableLocked() ) // darf jetzt nicht umgeschaltet werden ? { - // den alten Zustand des TabControls wiederherstellen: + // den alten Zustand des TabControls wiederherstellen: for (i=0; i<nCount; i++) SelectPage( static_cast<sal_uInt16>(i)+1, rMark.GetTableSelect(i) ); @@ -239,14 +239,14 @@ void ScTabControl::Select() } USHORT nCurId = GetCurPageId(); - if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist + if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist USHORT nPage = nCurId - 1; // OLE-inplace deaktivieren if ( nPage != static_cast<sal_uInt16>(pViewData->GetTabNo()) ) pViewData->GetView()->DrawMarkListHasChanged(); - // InputEnterHandler nur wenn nicht Referenzeingabe + // InputEnterHandler nur wenn nicht Referenzeingabe BOOL bRefMode = pScMod->IsFormulaMode(); if (!bRefMode) @@ -255,7 +255,7 @@ void ScTabControl::Select() for (i=0; i<nCount; i++) rMark.SelectTable( i, IsPageSelected(static_cast<sal_uInt16>(i)+1) ); -/* Markierungen werden per Default nicht pro Tabelle gehalten +/* Markierungen werden per Default nicht pro Tabelle gehalten USHORT nSelCnt = GetSelectPageCount(); if (nSelCnt>1) pDoc->ExtendMarksFromTable( nPage ); @@ -266,7 +266,7 @@ void ScTabControl::Select() pViewData->GetView()->SetTabNo( static_cast<SCTAB>(nPage) ); else { - // Tabelle fuer Basic ist 1-basiert + // Tabelle fuer Basic ist 1-basiert SfxUInt16Item aItem( SID_CURRENTTAB, nPage + 1 ); rDisp.Execute( SID_CURRENTTAB, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, (void*) NULL ); @@ -285,9 +285,9 @@ void ScTabControl::Select() rBind.Invalidate( FID_TABLE_HIDE ); rBind.Invalidate( FID_TAB_SET_TAB_BG_COLOR ); - // SetReference nur wenn der Konsolidieren-Dialog offen ist - // (fuer Referenzen ueber mehrere Tabellen) - // bei anderen gibt das nur unnoetiges Gezappel + // SetReference nur wenn der Konsolidieren-Dialog offen ist + // (fuer Referenzen ueber mehrere Tabellen) + // bei anderen gibt das nur unnoetiges Gezappel if ( bRefMode && pViewData->GetRefType() == SC_REFTYPE_REF ) if ( pViewData->GetViewShell()->GetViewFrame()->HasChildWindow(SID_OPENDLG_CONSOLIDATE) ) @@ -296,7 +296,7 @@ void ScTabControl::Select() pViewData->GetRefStartX(), pViewData->GetRefStartY(), pViewData->GetRefStartZ(), pViewData->GetRefEndX(), pViewData->GetRefEndY(), pViewData->GetRefEndZ() ); pScMod->SetReference( aRange, pDoc, &rMark ); - pScMod->EndReference(); // wegen Auto-Hide + pScMod->EndReference(); // wegen Auto-Hide } } @@ -323,7 +323,7 @@ void ScTabControl::UpdateStatus() SCTAB nMaxCnt = Max( nCount, static_cast<SCTAB>(GetMaxId()) ); Color aTabBgColor; - BOOL bModified = FALSE; // Tabellen-Namen + BOOL bModified = FALSE; // Tabellen-Namen for (i=0; i<nMaxCnt && !bModified; i++) { if (pDoc->IsVisible(i)) @@ -366,7 +366,7 @@ void ScTabControl::UpdateStatus() if (bActive) { - bModified = FALSE; // Selektion + bModified = FALSE; // Selektion for (i=0; i<nMaxCnt && !bModified; i++) if ( rMark.GetTableSelect(i) != IsPageSelected(static_cast<sal_uInt16>(i)+1) ) bModified = TRUE; @@ -384,14 +384,14 @@ void ScTabControl::UpdateStatus() void ScTabControl::ActivateView(BOOL bActivate) { -// ScDocument* pDoc = pViewData->GetDocument(); +// ScDocument* pDoc = pViewData->GetDocument(); ScMarkData& rMark = pViewData->GetMarkData(); -// ResetMark direkt in TabView -// pDoc->ResetMark(); +// ResetMark direkt in TabView +// pDoc->ResetMark(); USHORT nCurId = GetCurPageId(); - if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist + if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist USHORT nPage = nCurId - 1; // USHORT nCount = GetMaxId(); @@ -421,9 +421,9 @@ void ScTabControl::SetSheetLayoutRTL( BOOL bSheetRTL ) void ScTabControl::Command( const CommandEvent& rCEvt ) { - ScModule* pScMod = SC_MOD(); + ScModule* pScMod = SC_MOD(); ScTabViewShell* pViewSh = pViewData->GetViewShell(); - BOOL bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(); + BOOL bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(); // ViewFrame erstmal aktivieren (Bug 19493): pViewSh->SetActive(); @@ -457,8 +457,8 @@ void ScTabControl::Command( const CommandEvent& rCEvt ) // #i52073# OLE inplace editing has to be stopped before showing the sheet tab context menu pViewSh->DeactivateOle(); - // Popup-Menu: - // get Dispatcher from ViewData (ViewFrame) instead of Shell (Frame), so it can't be null + // Popup-Menu: + // get Dispatcher from ViewData (ViewFrame) instead of Shell (Frame), so it can't be null pViewData->GetDispatcher().ExecutePopup( ScResId(RID_POPUP_TAB) ); } } @@ -472,7 +472,7 @@ void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) if (!bDisable) { Region aRegion( Rectangle(0,0,0,0) ); - CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, TRUE ); // needed for StartDrag + CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, TRUE ); // needed for StartDrag if (TabBar::StartDrag( aCEvt, aRegion )) DoDrag( aRegion ); } @@ -485,7 +485,7 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ ) SCTAB nTab = pViewData->GetTabNo(); ScMarkData aTabMark = pViewData->GetMarkData(); - aTabMark.ResetMark(); // doesn't change marked table information + aTabMark.ResetMark(); // doesn't change marked table information aTabMark.SetMarkArea( ScRange(0,0,nTab,MAXCOL,MAXROW,nTab) ); ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); @@ -505,7 +505,7 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ ) pTransferObj->SetDragSource( pDocSh, aTabMark ); Window* pWindow = pViewData->GetActiveWin(); - SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D + SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } @@ -586,10 +586,10 @@ sal_Int8 ScTabControl::AcceptDrop( const AcceptDropEvent& rEvt ) return rEvt.mnAction; } } - else // switch sheets for all formats + else // switch sheets for all formats { - SwitchPage( rEvt.maPosPixel ); // switch sheet after timeout - return 0; // nothing can be dropped here + SwitchPage( rEvt.maPosPixel ); // switch sheet after timeout + return 0; // nothing can be dropped here } return 0; @@ -619,16 +619,16 @@ long ScTabControl::AllowRenaming() nRet = TABBAR_RENAMING_YES; else if ( bErrorShown ) { - // if the error message from this TabControl is currently visible, - // don't end edit mode now, to avoid problems when returning to - // the other call (showing the error) - this should not happen + // if the error message from this TabControl is currently visible, + // don't end edit mode now, to avoid problems when returning to + // the other call (showing the error) - this should not happen DBG_ERROR("ScTabControl::AllowRenaming: nested calls"); nRet = TABBAR_RENAMING_NO; } else if ( Application::IsInModalMode() ) { - // #73472# don't show error message above any modal dialog - // instead cancel renaming without error message + // #73472# don't show error message above any modal dialog + // instead cancel renaming without error message nRet = TABBAR_RENAMING_CANCEL; } else diff --git a/sc/source/ui/view/tabpopsh.cxx b/sc/source/ui/view/tabpopsh.cxx index bb610ada84c0..7974bb8acbf4 100644 --- a/sc/source/ui/view/tabpopsh.cxx +++ b/sc/source/ui/view/tabpopsh.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/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index 7babaad6d154..eda248c8fcb0 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.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/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 58da4e399c5a..d465f80ac9db 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.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,11 +41,11 @@ // Dieses define entfernt die VCControls aus SI.HXX -#define _SI_HXX // VCControls +#define _SI_HXX // VCControls ////////////////////// Umsetzen der Standard-Defines ////////////////////// -//#define _SVDDRAG_HXX // SdrDragStat +//#define _SVDDRAG_HXX // SdrDragStat #define _SVDPAGE_HXX // SdrPage #ifdef _SDR_NOSURROGATEOBJ @@ -117,7 +117,7 @@ #endif //#ifdef _SDR_NOVIEWS -// #define _SVDDRAG_HXX +// #define _SVDDRAG_HXX //#endif ////////////////////// Ende der SVDRAW-Modifikationen ///////////////////// @@ -155,14 +155,14 @@ #include <string> #include <algorithm> -#define SPLIT_MARGIN 30 -#define SC_ICONSIZE 36 +#define SPLIT_MARGIN 30 +#define SC_ICONSIZE 36 -#define SC_SCROLLBAR_MIN 30 -#define SC_TABBAR_MIN 6 +#define SC_SCROLLBAR_MIN 30 +#define SC_TABBAR_MIN 6 -// fuer Rad-Maus -#define SC_DELTA_ZOOM 10 +// fuer Rad-Maus +#define SC_DELTA_ZOOM 10 using namespace ::com::sun::star; @@ -171,7 +171,7 @@ using namespace ::com::sun::star; //================================================================== -// Corner-Button +// Corner-Button ScCornerButton::ScCornerButton( Window* pParent, ScViewData* pData, BOOL bAdditional ) : Window( pParent, WinBits( 0 ) ), @@ -226,7 +226,7 @@ void __EXPORT ScCornerButton::Paint( const Rectangle& rRect ) DrawRect( Rectangle( 0, nCenterY, nCenterX-1, nPosY ) ); } - // both buttons have the same look now - only dark right/bottom lines + // both buttons have the same look now - only dark right/bottom lines SetLineColor( rStyleSettings.GetDarkShadowColor() ); DrawLine( Point(0,nPosY), Point(nPosX,nPosY) ); DrawLine( Point(nDarkX,0), Point(nDarkX,nPosY) ); @@ -265,7 +265,7 @@ void __EXPORT ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt ) if (!bDisable) { ScTabViewShell* pViewSh = pViewData->GetViewShell(); - pViewSh->SetActive(); // Appear und SetViewFrame + pViewSh->SetActive(); // Appear und SetViewFrame pViewSh->ActiveGrabFocus(); BOOL bControl = rMEvt.IsMod1(); @@ -301,42 +301,42 @@ BOOL lcl_HasRowOutline( const ScViewData& rViewData ) //================================================================== -// Init und Konstruktoren -// ScTabView::Init() in tabview5.cxx wegen out of keys - - -#define TABVIEW_INIT \ - pSelEngine( NULL ), \ - aFunctionSet( &aViewData ), \ - pHdrSelEng( NULL ), \ - aHdrFunc( &aViewData ), \ - pDrawView( NULL ), \ - bDrawSelMode( FALSE ), \ - aVScrollTop( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \ - aVScrollBottom( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \ - aHScrollLeft( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \ - aHScrollRight( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \ - aCornerButton( pFrameWin, &aViewData, FALSE ), \ - aTopButton( pFrameWin, &aViewData, TRUE ), \ - aScrollBarBox( pFrameWin, WB_SIZEABLE ), \ - pInputHintWindow( NULL ), \ - pPageBreakData( NULL ), \ - pHighlightRanges( NULL ), \ +// Init und Konstruktoren +// ScTabView::Init() in tabview5.cxx wegen out of keys + + +#define TABVIEW_INIT \ + pSelEngine( NULL ), \ + aFunctionSet( &aViewData ), \ + pHdrSelEng( NULL ), \ + aHdrFunc( &aViewData ), \ + pDrawView( NULL ), \ + bDrawSelMode( FALSE ), \ + aVScrollTop( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \ + aVScrollBottom( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \ + aHScrollLeft( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \ + aHScrollRight( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \ + aCornerButton( pFrameWin, &aViewData, FALSE ), \ + aTopButton( pFrameWin, &aViewData, TRUE ), \ + aScrollBarBox( pFrameWin, WB_SIZEABLE ), \ + pInputHintWindow( NULL ), \ + pPageBreakData( NULL ), \ + pHighlightRanges( NULL ), \ pBrushDocument( NULL ), \ pDrawBrushSet( NULL ), \ bLockPaintBrush( FALSE ), \ - pTimerWindow( NULL ), \ - nTipVisible( 0 ), \ - bDragging( FALSE ), \ - bIsBlockMode( FALSE ), \ - bBlockNeg( FALSE ), \ - bBlockCols( FALSE ), \ - bBlockRows( FALSE ), \ + pTimerWindow( NULL ), \ + nTipVisible( 0 ), \ + bDragging( FALSE ), \ + bIsBlockMode( FALSE ), \ + bBlockNeg( FALSE ), \ + bBlockCols( FALSE ), \ + bBlockRows( FALSE ), \ mfPendingTabBarWidth( -1.0 ), \ - bMinimized( FALSE ), \ - bInUpdateHeader( FALSE ), \ - bInActivatePart( FALSE ), \ - bInZoomUpdate( FALSE ), \ + bMinimized( FALSE ), \ + bInUpdateHeader( FALSE ), \ + bInActivatePart( FALSE ), \ + bInZoomUpdate( FALSE ), \ bMoveIsShift( FALSE ) @@ -355,14 +355,14 @@ void ScTabView::InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ) { rScrollBar.SetRange( Range( 0, nMaxVal ) ); rScrollBar.SetLineSize( 1 ); - rScrollBar.SetPageSize( 1 ); // wird getrennt abgefragt - rScrollBar.SetVisibleSize( 10 ); // wird bei Resize neu gesetzt + rScrollBar.SetPageSize( 1 ); // wird getrennt abgefragt + rScrollBar.SetVisibleSize( 10 ); // wird bei Resize neu gesetzt rScrollBar.SetScrollHdl( LINK(this, ScTabView, ScrollHdl) ); rScrollBar.SetEndScrollHdl( LINK(this, ScTabView, EndScrollHdl) ); } -// Scroll-Timer +// Scroll-Timer void ScTabView::SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt ) { @@ -379,7 +379,7 @@ void ScTabView::ResetTimer() IMPL_LINK( ScTabView, TimerHdl, Timer*, EMPTYARG ) { -// aScrollTimer.Stop(); +// aScrollTimer.Stop(); if (pTimerWindow) pTimerWindow->MouseMove( aTimerMEvt ); @@ -397,8 +397,8 @@ void lcl_SetPosSize( Window& rWindow, const Point& rPos, const Size& rSize, aNewPos.X() = nTotalWidth - rPos.X() - rSize.Width(); if ( aNewPos == rWindow.GetPosPixel() && rSize.Width() != rWindow.GetSizePixel().Width() ) { - // Document windows are manually painted right-to-left, so they need to - // be repainted if the size changes. + // Document windows are manually painted right-to-left, so they need to + // be repainted if the size changes. rWindow.Invalidate(); } } @@ -418,19 +418,19 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( bLayoutRTL ) nTotalWidth += 2*rOffset.X(); - BOOL bVScroll = aViewData.IsVScrollMode(); - BOOL bHScroll = aViewData.IsHScrollMode(); + BOOL bVScroll = aViewData.IsVScrollMode(); + BOOL bHScroll = aViewData.IsHScrollMode(); BOOL bTabControl = aViewData.IsTabMode(); - BOOL bHeaders = aViewData.IsHeaderMode(); - BOOL bOutlMode = aViewData.IsOutlineMode(); - BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + BOOL bHeaders = aViewData.IsHeaderMode(); + BOOL bOutlMode = aViewData.IsOutlineMode(); + BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); - // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: + // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode(); if ( eMode == SCROLLING_NO ) bHScroll = bVScroll = FALSE; - else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? + else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? bHScroll = bVScroll = TRUE; if ( aViewData.GetDocShell()->IsPreview() ) @@ -460,7 +460,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX ) nSplitSizeY = 1; - const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel(); + const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel(); aBorderPos = rOffset; aFrameSize = rSize; @@ -472,7 +472,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( WhichH( aViewData.GetActivePart() ) == SC_SPLIT_RIGHT ) ActivatePart( SC_SPLIT_BOTTOMLEFT ); InvalidateSplit(); -// UpdateShow(); +// UpdateShow(); } if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ) if ( aViewData.GetVSplitPos() > nSizeY - SPLIT_MARGIN ) @@ -481,32 +481,32 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( WhichV( aViewData.GetActivePart() ) == SC_SPLIT_TOP ) ActivatePart( SC_SPLIT_BOTTOMLEFT ); InvalidateSplit(); -// UpdateShow(); +// UpdateShow(); } UpdateShow(); - if (bHScroll || bVScroll) // Scrollbars horizontal oder vertikal + if (bHScroll || bVScroll) // Scrollbars horizontal oder vertikal { long nScrollBarSize = pFrameWin->GetSettings().GetStyleSettings().GetScrollBarSize(); if (bVScroll) { -// nBarX = aVScrollBottom.GetSizePixel().Width(); +// nBarX = aVScrollBottom.GetSizePixel().Width(); nBarX = nScrollBarSize; nSizeX -= nBarX - nOverlap; } if (bHScroll) { -// nBarY = aHScrollLeft.GetSizePixel().Height(); +// nBarY = aHScrollLeft.GetSizePixel().Height(); nBarY = nScrollBarSize; nSizeY -= nBarY - nOverlap; } - // window at the bottom right + // window at the bottom right lcl_SetPosSize( aScrollBarBox, Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ), nTotalWidth, bLayoutRTL ); - if (bHScroll) // Scrollbars horizontal + if (bHScroll) // Scrollbars horizontal { long nSizeLt = 0; // left scroll bar long nSizeRt = 0; // right scroll bar @@ -516,7 +516,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) { case SC_SPLIT_NONE: nSizeSp = nSplitSizeX; - nSizeLt = nSizeX - nSizeSp + nOverlap; // Ecke ueberdecken + nSizeLt = nSizeX - nSizeSp + nOverlap; // Ecke ueberdecken break; case SC_SPLIT_NORMAL: nSizeSp = nSplitSizeX; @@ -541,13 +541,13 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nTabSize = pTabControl->GetSizePixel().Width()-nOverlap; - if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // bei linkem Scrollbar + if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // bei linkem Scrollbar { if (nTabSize > nSizeLt-SC_SCROLLBAR_MIN) nTabSize = nSizeLt-SC_SCROLLBAR_MIN; if (nTabSize < SC_TABBAR_MIN) nTabSize = SC_TABBAR_MIN; nSizeLt -= nTabSize; } - else // bei rechtem Scrollbar + else // bei rechtem Scrollbar { if (nTabSize > nSizeRt-SC_SCROLLBAR_MIN) nTabSize = nSizeRt-SC_SCROLLBAR_MIN; if (nTabSize < SC_TABBAR_MIN) nTabSize = SC_TABBAR_MIN; @@ -567,14 +567,14 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nPosY+nSizeY), Size(nSizeRt+2*nOverlap, nBarY), nTotalWidth, bLayoutRTL ); - // SetDragRectPixel is done below + // SetDragRectPixel is done below } - if (bVScroll) // Scrollbars vertikal + if (bVScroll) // Scrollbars vertikal { long nSizeUp = 0; // upper scroll bar long nSizeSp = 0; // splitter - long nSizeDn; // unterer Scrollbar + long nSizeDn; // unterer Scrollbar switch (aViewData.GetVSplitMode()) { @@ -601,11 +601,11 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nPosY+nSizeUp+nSizeSp-nOverlap), Size(nBarX, nSizeDn+2*nOverlap), nTotalWidth, bLayoutRTL ); - // SetDragRectPixel is done below + // SetDragRectPixel is done below } } - // SetDragRectPixel auch ohne Scrollbars etc., wenn schon gesplittet ist + // SetDragRectPixel auch ohne Scrollbars etc., wenn schon gesplittet ist if ( bHScroll || aViewData.GetHSplitMode() != SC_SPLIT_NONE ) pHSplitter->SetDragRectPixel( Rectangle( nPosX, nPosY, nPosX+nSizeX, nPosY+nSizeY ), pFrameWin ); @@ -654,7 +654,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nPosY += nOutlineY; } - if (bHeaders) // Spalten/Zeilen-Header + if (bHeaders) // Spalten/Zeilen-Header { nBarX = pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width(); nBarY = pColBar[SC_SPLIT_LEFT]->GetSizePixel().Height(); @@ -667,12 +667,12 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nBarX = nBarY = 0; // - // Splitter auswerten + // Splitter auswerten // long nLeftSize = nSizeX; long nRightSize = 0; - long nTopSize = 0; + long nTopSize = 0; long nBottomSize = nSizeY; long nSplitPosX = nPosX; long nSplitPosY = nPosY; @@ -682,7 +682,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) long nSplitHeight = rSize.Height(); if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX ) { - // Fixier-Splitter nicht mit Scrollbar/TabBar ueberlappen lassen + // Fixier-Splitter nicht mit Scrollbar/TabBar ueberlappen lassen if ( bHScroll ) nSplitHeight -= aHScrollLeft.GetSizePixel().Height(); else if ( bTabControl && pTabControl ) @@ -708,9 +708,9 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nBottomSize = nSizeY - nTopSize - nSplitSizeY; } - // ShowHide fuer pColOutline / pRowOutline passiert in UpdateShow + // ShowHide fuer pColOutline / pRowOutline passiert in UpdateShow - if (bHOutline) // Outline-Controls + if (bHOutline) // Outline-Controls { if (pColOutline[SC_SPLIT_LEFT]) { @@ -720,7 +720,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) } if (pColOutline[SC_SPLIT_RIGHT]) { - pColOutline[SC_SPLIT_RIGHT]->SetHeaderSize( 0 ); // always call to update RTL flag + pColOutline[SC_SPLIT_RIGHT]->SetHeaderSize( 0 ); // always call to update RTL flag lcl_SetPosSize( *pColOutline[SC_SPLIT_RIGHT], Point(nSplitPosX,nOutPosY), Size(nRightSize,nOutlineY), nTotalWidth, bLayoutRTL ); } @@ -754,7 +754,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) else aTopButton.Hide(); - if (bHeaders) // Spalten/Zeilen-Header + if (bHeaders) // Spalten/Zeilen-Header { lcl_SetPosSize( *pColBar[SC_SPLIT_LEFT], Point(nPosX,nPosY-nBarY), Size(nLeftSize,nBarY), nTotalWidth, bLayoutRTL ); @@ -776,7 +776,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) else { aCornerButton.Hide(); - pColBar[SC_SPLIT_LEFT]->Hide(); // immer da + pColBar[SC_SPLIT_LEFT]->Hide(); // immer da pRowBar[SC_SPLIT_BOTTOM]->Hide(); } @@ -804,21 +804,21 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) } // - // Scrollbars updaten + // Scrollbars updaten // if (!bInUpdateHeader) { - UpdateScrollBars(); // Scrollbars nicht beim Scrollen neu setzen + UpdateScrollBars(); // Scrollbars nicht beim Scrollen neu setzen UpdateHeaderWidth(); - InterpretVisible(); // #69343# have everything calculated before painting + InterpretVisible(); // #69343# have everything calculated before painting } if (bHasHint) - TestHintWindow(); // neu positionieren + TestHintWindow(); // neu positionieren - UpdateVarZoom(); // update variable zoom types (after resizing GridWindows) + UpdateVarZoom(); // update variable zoom types (after resizing GridWindows) if (aViewData.GetViewShell()->HasAccessibilityObjects()) aViewData.GetViewShell()->BroadcastAccessibility(SfxSimpleHint(SC_HINT_ACC_WINDOWRESIZED)); @@ -826,7 +826,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) void ScTabView::UpdateVarZoom() { - // update variable zoom types + // update variable zoom types SvxZoomType eZoomType = GetZoomType(); if ( eZoomType != SVX_ZOOM_PERCENT && !bInZoomUpdate ) @@ -885,21 +885,21 @@ void ScTabView::RepeatResize( BOOL bUpdateFix ) DoResize( aBorderPos, aFrameSize ); - //! Border muss neu gesetzt werden ??? + //! Border muss neu gesetzt werden ??? } void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ ) { BOOL bScrollBars = aViewData.IsVScrollMode(); - BOOL bHeaders = aViewData.IsHeaderMode(); - BOOL bOutlMode = aViewData.IsOutlineMode(); - BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + BOOL bHeaders = aViewData.IsHeaderMode(); + BOOL bOutlMode = aViewData.IsOutlineMode(); + BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); rBorder = SvBorder(); - if (bScrollBars) // Scrollbars horizontal oder vertikal + if (bScrollBars) // Scrollbars horizontal oder vertikal { rBorder.Right() += aVScrollBottom.GetSizePixel().Width(); rBorder.Bottom() += aHScrollLeft.GetSizePixel().Height(); @@ -911,7 +911,7 @@ void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ ) if (bHOutline && pColOutline[SC_SPLIT_LEFT]) rBorder.Top() += pColOutline[SC_SPLIT_LEFT]->GetDepthSize(); - if (bHeaders) // Spalten/Zeilen-Header + if (bHeaders) // Spalten/Zeilen-Header { rBorder.Left() += pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width(); rBorder.Top() += pColBar[SC_SPLIT_LEFT]->GetSizePixel().Height(); @@ -925,16 +925,16 @@ IMPL_LINK( ScTabView, TabBarResize, void*, EMPTYARG ) { BOOL bHScrollMode = aViewData.IsHScrollMode(); - // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: + // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode(); if ( eMode == SCROLLING_NO ) bHScrollMode = FALSE; - else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? + else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? bHScrollMode = TRUE; if( bHScrollMode ) { - const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel(); + const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel(); long nSize = pTabControl->GetSplitSize(); if (aViewData.GetHSplitMode() != SC_SPLIT_FIX) @@ -1016,7 +1016,7 @@ void ScTabView::SetActivePointer( const Pointer& rPointer ) if (pGridWin[i]) pGridWin[i]->SetPointer( rPointer ); -/* ScSplitPos ePos = aViewData.GetActivePart(); +/* ScSplitPos ePos = aViewData.GetActivePart(); if (pGridWin[ePos]) pGridWin[ePos]->SetPointer( rPointer ); */ @@ -1033,7 +1033,7 @@ void ScTabView::ActiveGrabFocus() ScSplitPos ScTabView::FindWindow( Window* pWindow ) const { - ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default + ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default for (USHORT i=0; i<4; i++) if ( pGridWin[i] == pWindow ) eVal = (ScSplitPos) i; @@ -1047,10 +1047,10 @@ Point ScTabView::GetGridOffset() const // Groessen hier wie in DoResize - BOOL bHeaders = aViewData.IsHeaderMode(); - BOOL bOutlMode = aViewData.IsOutlineMode(); - BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + BOOL bHeaders = aViewData.IsHeaderMode(); + BOOL bOutlMode = aViewData.IsOutlineMode(); + BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); // Outline-Controls if (bVOutline && pRowOutline[SC_SPLIT_BOTTOM]) @@ -1058,7 +1058,7 @@ Point ScTabView::GetGridOffset() const if (bHOutline && pColOutline[SC_SPLIT_LEFT]) aPos.Y() += pColOutline[SC_SPLIT_LEFT]->GetDepthSize(); - if (bHeaders) // Spalten/Zeilen-Header + if (bHeaders) // Spalten/Zeilen-Header { if (pRowBar[SC_SPLIT_BOTTOM]) aPos.X() += pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width(); @@ -1081,8 +1081,8 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ) { if ( !aViewData.GetViewShell()->GetViewFrame()->GetFrame().IsInPlace() ) { - // for ole inplace editing, the scale is defined by the visarea and client size - // and can't be changed directly + // for ole inplace editing, the scale is defined by the visarea and client size + // and can't be changed directly const Fraction& rOldY = aViewData.GetZoomY(); long nOld = (long)(( rOldY.GetNumerator() * 100 ) / rOldY.GetDenominator()); @@ -1124,15 +1124,15 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ) IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll ) { - BOOL bOnlineScroll = TRUE; //! Optionen + BOOL bOnlineScroll = TRUE; //! Optionen if ( bDragging ) { - if ( bOnlineScroll ) // nur Ranges aktualisieren + if ( bOnlineScroll ) // nur Ranges aktualisieren UpdateScrollBars(); else { - long nScrollMin = 0; // RangeMin simulieren + long nScrollMin = 0; // RangeMin simulieren if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight ) nScrollMin = aViewData.GetFixPosX(); if ( aViewData.GetVSplitMode()==SC_SPLIT_FIX && pScroll == &aVScrollBottom ) @@ -1143,9 +1143,9 @@ IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll ) BOOL bMirror = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ) != Application::GetSettings().GetLayoutRTL(); ScHSplitPos eWhich = (pScroll == &aHScrollLeft) ? SC_SPLIT_LEFT : SC_SPLIT_RIGHT; long nDelta = GetScrollBarPos( *pScroll, bMirror ) + nScrollMin - aViewData.GetPosX(eWhich); - if (nDelta) ScrollX( nDelta, eWhich ); + if (nDelta) ScrollX( nDelta, eWhich ); } - else // VScroll... + else // VScroll... { ScVSplitPos eWhich = (pScroll == &aVScrollTop) ? SC_SPLIT_TOP : SC_SPLIT_BOTTOM; long nDelta = GetScrollBarPos( *pScroll, FALSE ) + nScrollMin - aViewData.GetPosY(eWhich); @@ -1159,7 +1159,7 @@ IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll ) IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) { - BOOL bOnlineScroll = TRUE; //! Optionen + BOOL bOnlineScroll = TRUE; //! Optionen BOOL bHoriz = ( pScroll == &aHScrollLeft || pScroll == &aHScrollRight ); long nViewPos; @@ -1182,8 +1182,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) nPrevDragPos = nViewPos; } - // Scroll-Position anzeigen - // (nur QuickHelp, in der Statuszeile gibt es keinen Eintrag dafuer) + // Scroll-Position anzeigen + // (nur QuickHelp, in der Statuszeile gibt es keinen Eintrag dafuer) if (Help::IsQuickHelpEnabled()) { @@ -1204,7 +1204,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) Point aPos = pScroll->OutputToNormalizedScreenPixel( Point() ); // get scrollbar scroll position for help text (row number/column name) - long nScrollMin = 0; // RangeMin simulieren + long nScrollMin = 0; // RangeMin simulieren if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight ) nScrollMin = aViewData.GetFixPosX(); if ( aViewData.GetVSplitMode()==SC_SPLIT_FIX && pScroll == &aVScrollBottom ) @@ -1221,8 +1221,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) aHelpStr += ScColToAlpha((SCCOL) nScrollPos); aRect.Left() = aMousePos.X(); - aRect.Top() = aPos.Y() - 4; - nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; + aRect.Top() = aPos.Y() - 4; + nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; } else { @@ -1232,11 +1232,11 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) // show quicktext always inside sheet area aRect.Left() = bLayoutRTL ? (aPos.X() + aSize.Width() + 8) : (aPos.X() - 8); - aRect.Top() = aMousePos.Y(); + aRect.Top() = aMousePos.Y(); nAlign = (bLayoutRTL ? QUICKHELP_LEFT : QUICKHELP_RIGHT) | QUICKHELP_VCENTER; } - aRect.Right() = aRect.Left(); - aRect.Bottom() = aRect.Top(); + aRect.Right() = aRect.Left(); + aRect.Bottom() = aRect.Top(); Help::ShowQuickHelp(pScroll->GetParent(), aRect, aHelpStr, nAlign); } @@ -1249,10 +1249,10 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) // change scroll type so visible/previous cells calculation below remains the same switch ( eType ) { - case SCROLL_LINEUP: eType = SCROLL_LINEDOWN; break; - case SCROLL_LINEDOWN: eType = SCROLL_LINEUP; break; - case SCROLL_PAGEUP: eType = SCROLL_PAGEDOWN; break; - case SCROLL_PAGEDOWN: eType = SCROLL_PAGEUP; break; + case SCROLL_LINEUP: eType = SCROLL_LINEDOWN; break; + case SCROLL_LINEDOWN: eType = SCROLL_LINEUP; break; + case SCROLL_PAGEUP: eType = SCROLL_PAGEDOWN; break; + case SCROLL_PAGEDOWN: eType = SCROLL_PAGEUP; break; default: { // added to avoid warnings @@ -1284,10 +1284,10 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) break; case SCROLL_DRAG: { - // nur in die richtige Richtung scrollen, nicht um ausgeblendete - // Bereiche herumzittern + // nur in die richtige Richtung scrollen, nicht um ausgeblendete + // Bereiche herumzittern - long nScrollMin = 0; // RangeMin simulieren + long nScrollMin = 0; // RangeMin simulieren if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight ) nScrollMin = aViewData.GetFixPosX(); if ( aViewData.GetVSplitMode()==SC_SPLIT_FIX && pScroll == &aVScrollBottom ) @@ -1316,7 +1316,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) if (nDelta) { - BOOL bUpdate = ( eType != SCROLL_DRAG ); // bei Drag die Ranges nicht aendern + BOOL bUpdate = ( eType != SCROLL_DRAG ); // bei Drag die Ranges nicht aendern if ( bHoriz ) ScrollX( nDelta, (pScroll == &aHScrollLeft) ? SC_SPLIT_LEFT : SC_SPLIT_RIGHT, bUpdate ); else @@ -1353,12 +1353,12 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars ) nNewX+nDir >= 0 && nNewX+nDir <= MAXCOL ) nNewX = sal::static_int_cast<SCsCOL>( nNewX + nDir ); - // Fixierung + // Fixierung if (aViewData.GetHSplitMode() == SC_SPLIT_FIX) { if (eWhich == SC_SPLIT_LEFT) - nNewX = static_cast<SCsCOL>(nOldX); // links immer stehenlassen + nNewX = static_cast<SCsCOL>(nOldX); // links immer stehenlassen else { SCsCOL nFixX = static_cast<SCsCOL>(aViewData.GetFixPosX()); @@ -1375,10 +1375,10 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars ) { SCCOL nTrackX = std::max( nOldX, static_cast<SCCOL>(nNewX) ); - // Mit VCL wirkt Update() im Moment immer auf alle Fenster, beim Update - // nach dem Scrollen des GridWindow's wuerde darum der Col-/RowBar evtl. - // mit schon geaenderter Pos. gepainted werden - - // darum vorher einmal Update am Col-/RowBar + // Mit VCL wirkt Update() im Moment immer auf alle Fenster, beim Update + // nach dem Scrollen des GridWindow's wuerde darum der Col-/RowBar evtl. + // mit schon geaenderter Pos. gepainted werden - + // darum vorher einmal Update am Col-/RowBar if (pColBar[eWhich]) pColBar[eWhich]->Update(); @@ -1399,7 +1399,7 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars ) if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ) pGridWin[SC_SPLIT_TOPRIGHT]->ScrollPixel( nDiff, 0 ); } - if (pColBar[eWhich]) { pColBar[eWhich]->Scroll( nDiff,0 ); pColBar[eWhich]->Update(); } + if (pColBar[eWhich]) { pColBar[eWhich]->Scroll( nDiff,0 ); pColBar[eWhich]->Update(); } if (pColOutline[eWhich]) pColOutline[eWhich]->ScrollPixel( nDiff ); if (bUpdBars) UpdateScrollBars(); @@ -1410,10 +1410,10 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars ) ShowAllCursors(); - SetNewVisArea(); // MapMode muss schon gesetzt sein + SetNewVisArea(); // MapMode muss schon gesetzt sein if (bHasHint) - TestHintWindow(); // neu positionieren + TestHintWindow(); // neu positionieren } void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) @@ -1442,12 +1442,12 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) nNewY+nDir >= 0 && nNewY+nDir <= MAXROW ) nNewY += nDir; - // Fixierung + // Fixierung if (aViewData.GetVSplitMode() == SC_SPLIT_FIX) { if (eWhich == SC_SPLIT_TOP) - nNewY = static_cast<SCsROW>(nOldY); // oben immer stehenlassen + nNewY = static_cast<SCsROW>(nOldY); // oben immer stehenlassen else { SCsROW nFixY = static_cast<SCsROW>(aViewData.GetFixPosY()); @@ -1464,11 +1464,11 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) { SCROW nTrackY = std::max( nOldY, static_cast<SCROW>(nNewY) ); - // Zeilenkoepfe anpassen vor dem eigentlichen Scrolling, damit nicht - // doppelt gepainted werden muss - // PosY darf dann auch noch nicht umgesetzt sein, neuen Wert uebergeben + // Zeilenkoepfe anpassen vor dem eigentlichen Scrolling, damit nicht + // doppelt gepainted werden muss + // PosY darf dann auch noch nicht umgesetzt sein, neuen Wert uebergeben SCROW nUNew = static_cast<SCROW>(nNewY); - UpdateHeaderWidth( &eWhich, &nUNew ); // Zeilenkoepfe anpassen + UpdateHeaderWidth( &eWhich, &nUNew ); // Zeilenkoepfe anpassen if (pRowBar[eWhich]) pRowBar[eWhich]->Update(); @@ -1489,7 +1489,7 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) if ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ) pGridWin[SC_SPLIT_BOTTOMRIGHT]->ScrollPixel( 0, nDiff ); } - if (pRowBar[eWhich]) { pRowBar[eWhich]->Scroll( 0,nDiff ); pRowBar[eWhich]->Update(); } + if (pRowBar[eWhich]) { pRowBar[eWhich]->Scroll( 0,nDiff ); pRowBar[eWhich]->Update(); } if (pRowOutline[eWhich]) pRowOutline[eWhich]->ScrollPixel( nDiff ); if (bUpdBars) UpdateScrollBars(); @@ -1500,10 +1500,10 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) ShowAllCursors(); - SetNewVisArea(); // MapMode muss schon gesetzt sein + SetNewVisArea(); // MapMode muss schon gesetzt sein if (bHasHint) - TestHintWindow(); // neu positionieren + TestHintWindow(); // neu positionieren } void ScTabView::ScrollLines( long nDeltaX, long nDeltaY ) @@ -1517,9 +1517,9 @@ void ScTabView::ScrollLines( long nDeltaX, long nDeltaY ) SCROW lcl_LastVisible( ScViewData& rViewData ) { - // wenn am Dokumentende viele Zeilen ausgeblendet sind (welcher Trottel macht sowas?), - // soll dadurch nicht auf breite Zeilenkoepfe geschaltet werden - //! als Member ans Dokument ??? + // wenn am Dokumentende viele Zeilen ausgeblendet sind (welcher Trottel macht sowas?), + // soll dadurch nicht auf breite Zeilenkoepfe geschaltet werden + //! als Member ans Dokument ??? ScDocument* pDoc = rViewData.GetDocument(); SCTAB nTab = rViewData.GetTabNo(); @@ -1538,13 +1538,13 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY SCROW nEndPos = MAXROW; if ( !aViewData.GetViewShell()->GetViewFrame()->GetFrame().IsInPlace() ) { - // fuer OLE Inplace immer MAXROW + // fuer OLE Inplace immer MAXROW if ( pWhich && *pWhich == SC_SPLIT_BOTTOM && pPosY ) nEndPos = *pPosY; else nEndPos = aViewData.GetPosY( SC_SPLIT_BOTTOM ); - nEndPos += aViewData.CellsAtY( nEndPos, 1, SC_SPLIT_BOTTOM, SC_SIZE_NONE ); // VisibleCellsY + nEndPos += aViewData.CellsAtY( nEndPos, 1, SC_SPLIT_BOTTOM, SC_SIZE_NONE ); // VisibleCellsY if (nEndPos > MAXROW) nEndPos = lcl_LastVisible( aViewData ); @@ -1570,7 +1570,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY if (nEndPos>10000) nEndPos = 10000; - else if (nEndPos<1) // avoid extra step at 0 (when only one row is visible) + else if (nEndPos<1) // avoid extra step at 0 (when only one row is visible) nEndPos = 1; long nWidth = nBig - ( 10000 - nEndPos ) * nDiff / 10000; @@ -1585,7 +1585,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY RepeatResize(); // auf VCL gibt's Update ohne Ende (jedes Update gilt fuer alle Fenster) - //aCornerButton.Update(); // der bekommt sonst nie ein Update + //aCornerButton.Update(); // der bekommt sonst nie ein Update bInUpdateHeader = FALSE; } @@ -1602,27 +1602,27 @@ void ScTabView::UpdateShow() { BOOL bHScrollMode = aViewData.IsHScrollMode(); BOOL bVScrollMode = aViewData.IsVScrollMode(); - BOOL bTabMode = aViewData.IsTabMode(); - BOOL bOutlMode = aViewData.IsOutlineMode(); - BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); - BOOL bHeader = aViewData.IsHeaderMode(); + BOOL bTabMode = aViewData.IsTabMode(); + BOOL bOutlMode = aViewData.IsOutlineMode(); + BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + BOOL bHeader = aViewData.IsHeaderMode(); BOOL bShowH = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); BOOL bShowV = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); - // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: + // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode(); if ( eMode == SCROLLING_NO ) bHScrollMode = bVScrollMode = FALSE; - else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? + else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? bHScrollMode = bVScrollMode = TRUE; if ( aViewData.GetDocShell()->IsPreview() ) bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = FALSE; // - // Windows anlegen + // Windows anlegen // if (bShowH && !pGridWin[SC_SPLIT_BOTTOMRIGHT]) @@ -1659,7 +1659,7 @@ void ScTabView::UpdateShow() &aHdrFunc, pHdrSelEng ); // - // Windows anzeigen + // Windows anzeigen // ShowHide( &aHScrollLeft, bHScrollMode ); @@ -1668,7 +1668,7 @@ void ScTabView::UpdateShow() ShowHide( &aVScrollTop, bShowV && bVScrollMode ); ShowHide( &aScrollBarBox, bVScrollMode || bHScrollMode ); - ShowHide( pHSplitter, bHScrollMode || bShowH ); // immer angelegt + ShowHide( pHSplitter, bHScrollMode || bShowH ); // immer angelegt ShowHide( pVSplitter, bVScrollMode || bShowV ); ShowHide( pTabControl, bTabMode ); @@ -1688,7 +1688,7 @@ void ScTabView::UpdateShow() ShowHide( pRowBar[SC_SPLIT_TOP], bShowV && bHeader ); - //! neue Gridwindows eintragen + //! neue Gridwindows eintragen } void ScTabView::UpdateVisibleRange() @@ -1721,8 +1721,8 @@ IMPL_LINK( ScTabView, SplitHdl, Splitter*, pSplitter ) void ScTabView::DoHSplit(long nSplitPos) { - // nSplitPos is the real pixel position on the frame window, - // mirroring for RTL has to be done here. + // nSplitPos is the real pixel position on the frame window, + // mirroring for RTL has to be done here. BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); if ( bLayoutRTL ) @@ -1749,7 +1749,7 @@ void ScTabView::DoHSplit(long nSplitPos) if ( aNewMode != aOldMode ) { - UpdateShow(); // vor ActivatePart !! + UpdateShow(); // vor ActivatePart !! if ( aNewMode == SC_SPLIT_NONE ) { @@ -1761,7 +1761,7 @@ void ScTabView::DoHSplit(long nSplitPos) else { nOldDelta = aViewData.GetPosX( SC_SPLIT_LEFT ); -// aViewData.SetPosX( SC_SPLIT_LEFT, nOldDelta ); +// aViewData.SetPosX( SC_SPLIT_LEFT, nOldDelta ); long nLeftWidth = nSplitPos - pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width(); if ( nLeftWidth < 0 ) nLeftWidth = 0; nNewDelta = nOldDelta + aViewData.CellsAtX( nOldDelta, 1, SC_SPLIT_LEFT, @@ -1777,8 +1777,8 @@ void ScTabView::DoHSplit(long nSplitPos) SC_SPLIT_BOTTOMRIGHT : SC_SPLIT_TOPRIGHT ); } - // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen - // dafuer muss hier schon der MapMode stimmen + // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen + // dafuer muss hier schon der MapMode stimmen for (USHORT i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() ); @@ -1814,7 +1814,7 @@ void ScTabView::DoVSplit(long nSplitPos) if ( aNewMode != aOldMode ) { - UpdateShow(); // vor ActivatePart !! + UpdateShow(); // vor ActivatePart !! if ( aNewMode == SC_SPLIT_NONE ) { @@ -1849,8 +1849,8 @@ void ScTabView::DoVSplit(long nSplitPos) SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT ); } - // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen - // dafuer muss hier schon der MapMode stimmen + // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen + // dafuer muss hier schon der MapMode stimmen for (USHORT i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() ); @@ -2110,8 +2110,8 @@ BOOL lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin ) { if (pWin) { - // SPLIT_HANDLE_SIZE draufaddieren, damit das Einrasten genau - // auf dem Splitter nicht aussetzt + // SPLIT_HANDLE_SIZE draufaddieren, damit das Einrasten genau + // auf dem Splitter nicht aussetzt Point aRel = pWin->NormalizedScreenToOutputPixel( rScreenPosPixel ); Size aWinSize = pWin->GetOutputSizePixel(); @@ -2133,7 +2133,7 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel ) if (!bOverWin) return; - // #74761# don't snap to cells if the scale will be modified afterwards + // #74761# don't snap to cells if the scale will be modified afterwards if ( GetZoomType() != SVX_ZOOM_PERCENT ) return; @@ -2151,7 +2151,7 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel ) Point aMouse = pWin->NormalizedScreenToOutputPixel( rScreenPosPixel ); SCsCOL nPosX; SCsROW nPosY; - // #52949# bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des Fensters + // #52949# bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des Fensters aViewData.GetPosFromPixel( aMouse.X(), aMouse.Y(), ePos, nPosX, nPosY, TRUE, FALSE, FALSE ); BOOL bLeft; BOOL bTop; @@ -2225,7 +2225,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze ) } aSplit = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, TRUE ); - if (nPosX > aViewData.GetPosX(SC_SPLIT_LEFT)) // (aSplit.X() > 0) doesn't work for RTL + if (nPosX > aViewData.GetPosX(SC_SPLIT_LEFT)) // (aSplit.X() > 0) doesn't work for RTL { long nSplitPos = aSplit.X() + aWinStart.X(); if ( bLayoutRTL ) @@ -2252,7 +2252,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze ) else aViewData.SetVSplitMode( SC_SPLIT_NONE ); } - else // Fixierung aufheben + else // Fixierung aufheben { if ( eOldH == SC_SPLIT_FIX ) aViewData.SetHSplitMode( SC_SPLIT_NORMAL ); @@ -2260,8 +2260,8 @@ void ScTabView::FreezeSplitters( BOOL bFreeze ) aViewData.SetVSplitMode( SC_SPLIT_NORMAL ); } - // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen - // dafuer muss hier schon der MapMode stimmen + // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen + // dafuer muss hier schon der MapMode stimmen for (USHORT i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() ); @@ -2274,7 +2274,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze ) PaintTop(); PaintGrid(); - // SC_FOLLOW_NONE: only update active part + // SC_FOLLOW_NONE: only update active part AlignToCursor( aViewData.GetCurX(), aViewData.GetCurY(), SC_FOLLOW_NONE ); UpdateAutoFillMark(); @@ -2310,9 +2310,9 @@ void ScTabView::SplitAtCursor() RepeatResize(); } -void ScTabView::SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ) // fuer API +void ScTabView::SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ) // fuer API { - // Pixel ist auf die ganze View bezogen, nicht auf das erste GridWin + // Pixel ist auf die ganze View bezogen, nicht auf das erste GridWin if (bHor) { @@ -2343,8 +2343,8 @@ void ScTabView::InvalidateSplit() void ScTabView::SetNewVisArea() { - // #63854# fuer die Controls muss bei VisAreaChanged der Draw-MapMode eingestellt sein - // (auch wenn ansonsten der Edit-MapMode gesetzt ist) + // #63854# fuer die Controls muss bei VisAreaChanged der Draw-MapMode eingestellt sein + // (auch wenn ansonsten der Edit-MapMode gesetzt ist) MapMode aOldMode[4]; MapMode aDrawMode[4]; USHORT i; @@ -2362,7 +2362,7 @@ void ScTabView::SetNewVisArea() aViewData.GetViewShell()->VisAreaChanged( pActive->PixelToLogic(Rectangle(Point(),pActive->GetOutputSizePixel())) ); if (pDrawView) - pDrawView->VisAreaChanged(); // kein Window uebergeben -> alle Fenster + pDrawView->VisAreaChanged(); // kein Window uebergeben -> alle Fenster UpdateAllOverlays(); // #i79909# with drawing MapMode set diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index a3692828c10f..a42cb4667c1a 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.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,9 +62,9 @@ #include "scmod.hxx" #include "tabprotection.hxx" -#define SC_BLOCKMODE_NONE 0 -#define SC_BLOCKMODE_NORMAL 1 -#define SC_BLOCKMODE_OWN 2 +#define SC_BLOCKMODE_NONE 0 +#define SC_BLOCKMODE_NORMAL 1 +#define SC_BLOCKMODE_OWN 2 @@ -104,14 +104,14 @@ void ScTabView::InitOwnBlockMode() { if (!bIsBlockMode) { - // Wenn keine (alte) Markierung mehr da ist, Anker in SelectionEngine loeschen: + // Wenn keine (alte) Markierung mehr da ist, Anker in SelectionEngine loeschen: ScMarkData& rMark = aViewData.GetMarkData(); if (!rMark.IsMarked() && !rMark.IsMultiMarked()) GetSelEngine()->CursorPosChanging( FALSE, FALSE ); -// bIsBlockMode = TRUE; - bIsBlockMode = SC_BLOCKMODE_OWN; //! Variable umbenennen! +// bIsBlockMode = TRUE; + bIsBlockMode = SC_BLOCKMODE_OWN; //! Variable umbenennen! nBlockStartX = 0; nBlockStartY = 0; nBlockStartZ = 0; @@ -119,7 +119,7 @@ void ScTabView::InitOwnBlockMode() nBlockEndY = 0; nBlockEndZ = 0; - SelectionChanged(); // Status wird mit gesetzer Markierung abgefragt + SelectionChanged(); // Status wird mit gesetzer Markierung abgefragt } } @@ -134,7 +134,7 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScMarkData& rMark = aViewData.GetMarkData(); SCTAB nTab = aViewData.GetTabNo(); - // Teil von Markierung aufheben? + // Teil von Markierung aufheben? if (bTestNeg) { if ( bCols ) @@ -148,8 +148,8 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, bBlockNeg = FALSE; rMark.SetMarkNegative(bBlockNeg); -// bIsBlockMode = TRUE; - bIsBlockMode = SC_BLOCKMODE_NORMAL; //! Variable umbenennen! +// bIsBlockMode = TRUE; + bIsBlockMode = SC_BLOCKMODE_NORMAL; //! Variable umbenennen! bBlockCols = bCols; bBlockRows = bRows; nBlockStartX = nBlockStartXOrig = nCurX; @@ -182,9 +182,9 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE { - // Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird, - // wird evtl. DeselectAll gerufen, weil die andere Engine keinen Anker hat. - // Mit bMoveIsShift wird verhindert, dass dann die Selektion aufgehoben wird. + // Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird, + // wird evtl. DeselectAll gerufen, weil die andere Engine keinen Anker hat. + // Mit bMoveIsShift wird verhindert, dass dann die Selektion aufgehoben wird. if (bIsBlockMode && !bMoveIsShift) { @@ -199,19 +199,19 @@ void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE rMark.MarkToMulti(); else { - // Die Tabelle kann an dieser Stelle ungueltig sein, weil DoneBlockMode - // aus SetTabNo aufgerufen wird - // (z.B. wenn die aktuelle Tabelle von einer anderen View aus geloescht wird) + // Die Tabelle kann an dieser Stelle ungueltig sein, weil DoneBlockMode + // aus SetTabNo aufgerufen wird + // (z.B. wenn die aktuelle Tabelle von einer anderen View aus geloescht wird) SCTAB nTab = aViewData.GetTabNo(); ScDocument* pDoc = aViewData.GetDocument(); if ( pDoc->HasTable(nTab) ) - PaintBlock( TRUE ); // TRUE -> Block loeschen + PaintBlock( TRUE ); // TRUE -> Block loeschen else rMark.ResetMark(); } -// bIsBlockMode = FALSE; - bIsBlockMode = SC_BLOCKMODE_NONE; //! Variable umbenennen! +// bIsBlockMode = FALSE; + bIsBlockMode = SC_BLOCKMODE_NONE; //! Variable umbenennen! rMark.SetMarking(bFlag); rMark.SetMarkNegative(FALSE); @@ -243,13 +243,13 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ( aMarkRange.aStart.Row() != nBlockStartY && aMarkRange.aEnd.Row() != nBlockStartY ) || ( bIsBlockMode == SC_BLOCKMODE_OWN )) { - // Markierung ist veraendert worden - // (z.B. MarkToSimple, wenn per negativ alles bis auf ein Rechteck geloescht wurde) - // oder nach InitOwnBlockMode wird mit Shift-Klick weitermarkiert... + // Markierung ist veraendert worden + // (z.B. MarkToSimple, wenn per negativ alles bis auf ein Rechteck geloescht wurde) + // oder nach InitOwnBlockMode wird mit Shift-Klick weitermarkiert... BOOL bOldShift = bMoveIsShift; - bMoveIsShift = FALSE; // wirklich umsetzen - DoneBlockMode(FALSE); //! direkt Variablen setzen? (-> kein Geflacker) + bMoveIsShift = FALSE; // wirklich umsetzen + DoneBlockMode(FALSE); //! direkt Variablen setzen? (-> kein Geflacker) bMoveIsShift = bOldShift; InitBlockMode( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), @@ -263,13 +263,13 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, { // Current cursor has moved - SCTAB nTab = nCurZ; + SCTAB nTab = nCurZ; #ifdef OLD_SELECTION_PAINT - SCCOL nDrawStartCol; - SCROW nDrawStartRow; - SCCOL nDrawEndCol; - SCROW nDrawEndRow; + SCCOL nDrawStartCol; + SCROW nDrawStartRow; + SCCOL nDrawEndCol; + SCROW nDrawEndRow; #endif // Set old selection area @@ -380,8 +380,8 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, nDrawEndCol, nDrawEndRow, bCont ); if ( bDraw ) { -//? PutInOrder( nDrawStartCol, nDrawEndCol ); -//? PutInOrder( nDrawStartRow, nDrawEndRow ); +//? PutInOrder( nDrawStartCol, nDrawEndCol ); +//? PutInOrder( nDrawStartRow, nDrawEndRow ); HideAllCursors(); InvertBlockMark( nDrawStartCol, nDrawStartRow, nDrawEndCol, nDrawEndRow ); @@ -399,7 +399,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, nOldCurY = nCurY; aViewData.GetViewShell()->UpdateInputHandler(); -// InvalidateAttribs(); +// InvalidateAttribs(); } if ( !bCols && !bRows ) @@ -884,7 +884,7 @@ void ScTabView::UpdateAllOverlays() } //! -//! PaintBlock in zwei Methoden aufteilen: RepaintBlock und RemoveBlock o.ae. +//! PaintBlock in zwei Methoden aufteilen: RepaintBlock und RemoveBlock o.ae. //! void ScTabView::PaintBlock( BOOL bReset ) @@ -948,7 +948,7 @@ void ScTabView::PaintBlock( BOOL bReset ) #ifdef OLD_SELECTION_PAINT // (mis)use InvertBlockMark to remove all of the selection // -> set bBlockNeg (like when removing parts of a selection) - // and convert everything to Multi + // and convert everything to Multi rMark.MarkToMulti(); BOOL bOld = bBlockNeg; @@ -966,7 +966,7 @@ void ScTabView::PaintBlock( BOOL bReset ) bDidReset = TRUE; } - // repaint if controls are touched (#69680# in both cases) + // repaint if controls are touched (#69680# in both cases) // #i74768# Forms are rendered by DrawingLayer's EndDrawLayers() static bool bSuppressControlExtraStuff(true); @@ -979,7 +979,7 @@ void ScTabView::PaintBlock( BOOL bReset ) { if (pGridWin[i] && pGridWin[i]->IsVisible()) { - // MapMode muss logischer (1/100mm) sein !!! + // MapMode muss logischer (1/100mm) sein !!! pDoc->InvalidateControls( pGridWin[i], nTab, aMMRect ); pGridWin[i]->Update(); } @@ -1031,8 +1031,8 @@ void ScTabView::SelectAllTables() for (SCTAB i=0; i<nCount; i++) rMark.SelectTable( i, TRUE ); - // Markierungen werden per Default nicht pro Tabelle gehalten -// pDoc->ExtendMarksFromTable( nTab ); + // Markierungen werden per Default nicht pro Tabelle gehalten +// pDoc->ExtendMarksFromTable( nTab ); aViewData.GetDocShell()->PostPaintExtras(); SfxBindings& rBind = aViewData.GetBindings(); @@ -1070,7 +1070,7 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom, SCCOL nCol; for (nCol=0; nCol<nFixPosX; nCol++) { - // for frozen panes, add both parts + // for frozen panes, add both parts USHORT nColTwips = pDoc->GetColWidth( nCol, nTab ); if (nColTwips) { @@ -1096,7 +1096,7 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom, if (pDoc->RowHidden(nRow, nTab)) continue; - // for frozen panes, add both parts + // for frozen panes, add both parts USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab); if (nRowTwips) { @@ -1129,26 +1129,26 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) nZoom = nOldZoom; break; - case SVX_ZOOM_OPTIMAL: // nZoom entspricht der optimalen Gr"o\se + case SVX_ZOOM_OPTIMAL: // nZoom entspricht der optimalen Gr"o\se { ScMarkData& rMark = aViewData.GetMarkData(); ScDocument* pDoc = aViewData.GetDocument(); if (!rMark.IsMarked() && !rMark.IsMultiMarked()) - nZoom = 100; // nothing selected + nZoom = 100; // nothing selected else { - SCTAB nTab = aViewData.GetTabNo(); + SCTAB nTab = aViewData.GetTabNo(); ScRange aMarkRange; if ( aViewData.GetSimpleArea( aMarkRange ) != SC_MARK_SIMPLE ) rMark.GetMultiMarkArea( aMarkRange ); - SCCOL nStartCol = aMarkRange.aStart.Col(); - SCROW nStartRow = aMarkRange.aStart.Row(); - SCTAB nStartTab = aMarkRange.aStart.Tab(); - SCCOL nEndCol = aMarkRange.aEnd.Col(); - SCROW nEndRow = aMarkRange.aEnd.Row(); - SCTAB nEndTab = aMarkRange.aEnd.Tab(); + SCCOL nStartCol = aMarkRange.aStart.Col(); + SCROW nStartRow = aMarkRange.aStart.Row(); + SCTAB nStartTab = aMarkRange.aStart.Tab(); + SCCOL nEndCol = aMarkRange.aEnd.Col(); + SCROW nEndRow = aMarkRange.aEnd.Row(); + SCTAB nEndTab = aMarkRange.aEnd.Tab(); if ( nTab < nStartTab && nTab > nEndTab ) nTab = nStartTab; @@ -1159,7 +1159,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) SCROW nFixPosY = 0; if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX ) { - // use right part + // use right part eUsedPart = (WhichV(eUsedPart)==SC_SPLIT_TOP) ? SC_SPLIT_TOPRIGHT : SC_SPLIT_BOTTOMRIGHT; nFixPosX = aViewData.GetFixPosX(); if ( nStartCol < nFixPosX ) @@ -1167,7 +1167,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) } if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX ) { - // use bottom part + // use bottom part eUsedPart = (WhichH(eUsedPart)==SC_SPLIT_LEFT) ? SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT; nFixPosY = aViewData.GetFixPosY(); if ( nStartRow < nFixPosY ) @@ -1176,12 +1176,12 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) if (pGridWin[eUsedPart]) { - // Because scale is rounded to pixels, the only reliable way to find - // the right scale is to check if a zoom fits + // Because scale is rounded to pixels, the only reliable way to find + // the right scale is to check if a zoom fits Size aWinSize = pGridWin[eUsedPart]->GetOutputSizePixel(); - // for frozen panes, use sum of both parts for calculation + // for frozen panes, use sum of both parts for calculation if ( nFixPosX != 0 ) aWinSize.Width() += GetGridWidth( SC_SPLIT_LEFT ); @@ -1223,13 +1223,13 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) } break; - case SVX_ZOOM_WHOLEPAGE: // nZoom entspricht der ganzen Seite oder - case SVX_ZOOM_PAGEWIDTH: // nZoom entspricht der Seitenbreite + case SVX_ZOOM_WHOLEPAGE: // nZoom entspricht der ganzen Seite oder + case SVX_ZOOM_PAGEWIDTH: // nZoom entspricht der Seitenbreite { - SCTAB nCurTab = aViewData.GetTabNo(); - ScDocument* pDoc = aViewData.GetDocument(); - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = + SCTAB nCurTab = aViewData.GetTabNo(); + ScDocument* pDoc = aViewData.GetDocument(); + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nCurTab ), SFX_STYLE_FAMILY_PAGE ); @@ -1243,11 +1243,11 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) Size aPageSize = aPrintFunc.GetDataSize(); - // use the size of the largest GridWin for normal split, - // or both combined for frozen panes, with the (document) size - // of the frozen part added to the page size - // (with frozen panes, the size of the individual parts - // depends on the scale that is to be calculated) + // use the size of the largest GridWin for normal split, + // or both combined for frozen panes, with the (document) size + // of the frozen part added to the page size + // (with frozen panes, the size of the individual parts + // depends on the scale that is to be calculated) if ( !pGridWin[SC_SPLIT_BOTTOMLEFT] ) return 0; Size aWinSize = pGridWin[SC_SPLIT_BOTTOMLEFT]->GetOutputSizePixel(); @@ -1307,7 +1307,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) return nZoom; } -// wird z.B. gerufen, wenn sich das View-Fenster verschiebt: +// wird z.B. gerufen, wenn sich das View-Fenster verschiebt: void ScTabView::StopMarking() { @@ -1337,7 +1337,7 @@ void ScTabView::MakeDrawLayer() { aViewData.GetDocShell()->MakeDrawLayer(); - // pDrawView wird per Notify gesetzt + // pDrawView wird per Notify gesetzt DBG_ASSERT(pDrawView,"ScTabView::MakeDrawLayer funktioniert nicht"); // #114409# @@ -1359,7 +1359,7 @@ void ScTabView::ErrorMessage( USHORT nGlobStrId ) return; } - StopMarking(); // falls per Focus aus MouseButtonDown aufgerufen + StopMarking(); // falls per Focus aus MouseButtonDown aufgerufen Window* pParent = aViewData.GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); @@ -1413,14 +1413,14 @@ void ScTabView::UpdatePageBreakData( BOOL bForcePaint ) pNewData = new ScPageBreakData(nCount); ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab, 0,0,NULL, NULL, pNewData ); - // ScPrintFunc fuellt im ctor die PageBreakData + // ScPrintFunc fuellt im ctor die PageBreakData if ( nCount > 1 ) { aPrintFunc.ResetBreaks(nTab); pNewData->AddPages(); } - // Druckbereiche veraendert? + // Druckbereiche veraendert? if ( bForcePaint || ( pPageBreakData && !pPageBreakData->IsEqual( *pNewData ) ) ) PaintGrid(); } diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index e9659ef962cd..d5a6f41f4aa7 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -113,7 +113,7 @@ using namespace com::sun::star; // ----------------------------------------------------------------------- // -// --- Public-Funktionen +// --- Public-Funktionen // void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ) @@ -160,9 +160,9 @@ void ScTabView::UpdateAutoFillMark() pRowBar[i]->SetMark( bMarked, aMarkRange.aStart.Row(), aMarkRange.aEnd.Row() ); } - // selection transfer object is checked together with AutoFill marks, - // because it has the same requirement of a single continuous block. - CheckSelectionTransfer(); // update selection transfer object + // selection transfer object is checked together with AutoFill marks, + // because it has the same requirement of a single continuous block. + CheckSelectionTransfer(); // update selection transfer object } void ScTabView::FakeButtonUp( ScSplitPos eWhich ) @@ -270,13 +270,13 @@ void ScTabView::InvalidateAttribs() rBindings.Invalidate( SID_NUMBER_PERCENT ); rBindings.Invalidate( SID_NUMBER_TIME ); -// rBindings.Invalidate( SID_RANGE_VALUE ); -// rBindings.Invalidate( SID_RANGE_FORMULA ); +// rBindings.Invalidate( SID_RANGE_VALUE ); +// rBindings.Invalidate( SID_RANGE_FORMULA ); } -// SetCursor - Cursor setzen, zeichnen, InputWin updaten -// oder Referenz verschicken -// ohne Optimierung wegen BugId 29307 +// SetCursor - Cursor setzen, zeichnen, InputWin updaten +// oder Referenz verschicken +// ohne Optimierung wegen BugId 29307 #ifdef _MSC_VER #pragma optimize ( "", off ) @@ -287,7 +287,7 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew ) SCCOL nOldX = aViewData.GetCurX(); SCROW nOldY = aViewData.GetCurY(); - // DeactivateIP nur noch bei MarkListHasChanged + // DeactivateIP nur noch bei MarkListHasChanged if ( nPosX != nOldX || nPosY != nOldY || bNew ) { @@ -315,7 +315,7 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew ) void ScTabView::CheckSelectionTransfer() { - if ( aViewData.IsActive() ) // only for active view + if ( aViewData.IsActive() ) // only for active view { ScModule* pScMod = SC_MOD(); ScSelectionTransferObj* pOld = pScMod->GetSelectionTransfer(); @@ -328,22 +328,22 @@ void ScTabView::CheckSelectionTransfer() ScSelectionTransferObj* pNew = ScSelectionTransferObj::CreateFromView( this ); if ( pNew ) { - // create new selection + // create new selection if (pOld) pOld->ForgetView(); uno::Reference<datatransfer::XTransferable> xRef( pNew ); pScMod->SetSelectionTransfer( pNew ); - pNew->CopyToSelection( GetActiveWin() ); // may delete pOld + pNew->CopyToSelection( GetActiveWin() ); // may delete pOld } else if ( pOld && pOld->GetView() == this ) { - // remove own selection + // remove own selection pOld->ForgetView(); pScMod->SetSelectionTransfer( NULL ); - TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld + TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld } // else: selection from outside: leave unchanged } @@ -351,19 +351,19 @@ void ScTabView::CheckSelectionTransfer() } // Eingabezeile / Menues updaten -// CursorPosChanged ruft SelectionChanged -// SelectionChanged ruft CellContentChanged +// CursorPosChanged ruft SelectionChanged +// SelectionChanged ruft CellContentChanged void ScTabView::CellContentChanged() { SfxBindings& rBindings = aViewData.GetBindings(); - rBindings.Invalidate( SID_ATTR_SIZE ); // -> Fehlermeldungen anzeigen + rBindings.Invalidate( SID_ATTR_SIZE ); // -> Fehlermeldungen anzeigen rBindings.Invalidate( SID_THESAURUS ); rBindings.Invalidate( SID_HYPERLINK_GETLINK ); - InvalidateAttribs(); // Attribut-Updates - TestHintWindow(); // Eingabemeldung (Gueltigkeit) + InvalidateAttribs(); // Attribut-Updates + TestHintWindow(); // Eingabemeldung (Gueltigkeit) aViewData.GetViewShell()->UpdateInputHandler(); } @@ -382,16 +382,16 @@ void ScTabView::SelectionChanged() } } - UpdateAutoFillMark(); // also calls CheckSelectionTransfer + UpdateAutoFillMark(); // also calls CheckSelectionTransfer SfxBindings& rBindings = aViewData.GetBindings(); - rBindings.Invalidate( SID_CURRENTCELL ); // -> Navigator - rBindings.Invalidate( SID_AUTO_FILTER ); // -> Menue + rBindings.Invalidate( SID_CURRENTCELL ); // -> Navigator + rBindings.Invalidate( SID_AUTO_FILTER ); // -> Menue rBindings.Invalidate( FID_NOTE_VISIBLE ); rBindings.Invalidate( SID_DELETE_NOTE ); - // Funktionen, die evtl disabled werden muessen + // Funktionen, die evtl disabled werden muessen rBindings.Invalidate( FID_INS_ROWBRK ); rBindings.Invalidate( FID_INS_COLBRK ); @@ -402,7 +402,7 @@ void ScTabView::SelectionChanged() rBindings.Invalidate( FID_MERGE_TOGGLE ); rBindings.Invalidate( SID_AUTOFILTER_HIDE ); rBindings.Invalidate( SID_UNFILTER ); -// rBindings.Invalidate( SID_IMPORT_DATA ); // jetzt wieder immer moeglich +// rBindings.Invalidate( SID_IMPORT_DATA ); // jetzt wieder immer moeglich rBindings.Invalidate( SID_REIMPORT_DATA ); rBindings.Invalidate( SID_REFRESH_DBAREA ); rBindings.Invalidate( SID_OUTLINE_SHOW ); @@ -426,12 +426,12 @@ void ScTabView::SelectionChanged() rBindings.Invalidate( FID_INS_ROW ); rBindings.Invalidate( FID_INS_COLUMN ); rBindings.Invalidate( FID_INS_CELL ); - rBindings.Invalidate( FID_INS_CELLSDOWN ); + rBindings.Invalidate( FID_INS_CELLSDOWN ); rBindings.Invalidate( FID_INS_CELLSRIGHT ); rBindings.Invalidate( FID_CHG_COMMENT ); - // nur wegen Zellschutz: + // nur wegen Zellschutz: rBindings.Invalidate( SID_CELL_FORMAT_RESET ); rBindings.Invalidate( SID_DELETE ); @@ -442,7 +442,7 @@ void ScTabView::SelectionChanged() rBindings.Invalidate( SID_INSERT_POSTIT ); rBindings.Invalidate( SID_CHARMAP ); rBindings.Invalidate( SID_OPENDLG_FUNCTION ); -// rBindings.Invalidate( FID_CONDITIONAL_FORMAT ); +// rBindings.Invalidate( FID_CONDITIONAL_FORMAT ); rBindings.Invalidate( SID_OPENDLG_CONDFRMT ); rBindings.Invalidate( FID_VALIDATION ); rBindings.Invalidate( SID_EXTERNAL_SOURCE ); @@ -462,14 +462,14 @@ void ScTabView::CursorPosChanged() if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert aViewData.GetDocShell()->Broadcast( SfxSimpleHint( FID_KILLEDITVIEW ) ); - // Broadcast, damit andere Views des Dokuments auch umschalten + // Broadcast, damit andere Views des Dokuments auch umschalten ScDocument* pDoc = aViewData.GetDocument(); bool bDP = NULL != pDoc->GetDPAtCursor( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo() ); aViewData.GetViewShell()->SetPivotShell(bDP); - // UpdateInputHandler jetzt in CellContentChanged + // UpdateInputHandler jetzt in CellContentChanged SelectionChanged(); @@ -491,12 +491,12 @@ void ScTabView::TestHintWindow() ATTR_VALIDDATA ); if ( pItem->GetValue() ) { - const ScValidationData* pData = pDoc->GetValidationEntry( pItem->GetValue() ); + const ScValidationData* pData = pDoc->GetValidationEntry( pItem->GetValue() ); DBG_ASSERT(pData,"ValidationData nicht gefunden"); String aTitle, aMessage; if ( pData && pData->GetInput( aTitle, aMessage ) && aMessage.Len() > 0 ) { - //! Abfrage, ob an gleicher Stelle !!!! + //! Abfrage, ob an gleicher Stelle !!!! DELETEZ(pInputHintWindow); @@ -506,12 +506,12 @@ void ScTabView::TestHintWindow() SCROW nRow = aViewData.GetCurY(); Point aPos = aViewData.GetScrPos( nCol, nRow, eWhich ); Size aWinSize = pWin->GetOutputSizePixel(); - // Cursor sichtbar? + // Cursor sichtbar? if ( nCol >= aViewData.GetPosX(WhichH(eWhich)) && nRow >= aViewData.GetPosY(WhichV(eWhich)) && aPos.X() < aWinSize.Width() && aPos.Y() < aWinSize.Height() ) { - aPos += pWin->GetPosPixel(); // Position auf Frame + aPos += pWin->GetPosPixel(); // Position auf Frame long nSizeXPix; long nSizeYPix; aViewData.GetMergeSizePixel( nCol, nRow, nSizeXPix, nSizeYPix ); @@ -522,7 +522,7 @@ void ScTabView::TestHintWindow() Size aFrameWinSize = pFrameWin->GetOutputSizePixel(); // passende Position finden - // erster Versuch: unter dem Cursor + // erster Versuch: unter dem Cursor Point aHintPos( aPos.X() + nSizeXPix / 2, aPos.Y() + nSizeYPix + 3 ); if ( aHintPos.Y() + aHintSize.Height() > aFrameWinSize.Height() ) { @@ -543,10 +543,10 @@ void ScTabView::TestHintWindow() } } - // X anpassen + // X anpassen if ( aHintPos.X() + aHintSize.Width() > aFrameWinSize.Width() ) aHintPos.X() = aFrameWinSize.Width() - aHintSize.Width(); - // Y anpassen + // Y anpassen if ( aHintPos.Y() + aHintSize.Height() > aFrameWinSize.Height() ) aHintPos.Y() = aFrameWinSize.Height() - aHintSize.Height(); @@ -582,9 +582,9 @@ void ScTabView::RemoveHintWindow() // find window that should not be over the cursor Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) { - //! auch Spelling ??? (dann beim Aufruf Membervariable setzen) + //! auch Spelling ??? (dann beim Aufruf Membervariable setzen) - // Suchen & Ersetzen + // Suchen & Ersetzen if ( pViewFrm->HasChildWindow(SID_SEARCH_DLG) ) { SfxChildWindow* pChild = pViewFrm->GetChildWindow(SID_SEARCH_DLG); @@ -596,7 +596,7 @@ Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) } } - // Aenderungen uebernehmen + // Aenderungen uebernehmen if ( pViewFrm->HasChildWindow(FID_CHG_ACCEPT) ) { SfxChildWindow* pChild = pViewFrm->GetChildWindow(FID_CHG_ACCEPT); @@ -612,14 +612,14 @@ Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) } // - // Bildschirm an Cursorposition anpassen + // Bildschirm an Cursorposition anpassen // void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, const ScSplitPos* pWhich ) { // - // aktiven Teil umschalten jetzt hier + // aktiven Teil umschalten jetzt hier // ScSplitPos eActive = aViewData.GetActivePart(); @@ -641,7 +641,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } // - // eigentliches Align + // eigentliches Align // if ( eMode != SC_FOLLOW_NONE ) @@ -668,17 +668,17 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, Size aScrSize = aViewData.GetScrSize(); long nSpaceX = ( aScrSize.Width() - nCellSizeX ) / 2; long nSpaceY = ( aScrSize.Height() - nCellSizeY ) / 2; - // nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes + // nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes - BOOL bForceNew = FALSE; // force new calculation of JUMP position (vertical only) + BOOL bForceNew = FALSE; // force new calculation of JUMP position (vertical only) // VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY ) //------------------------------------------------------------------------------- - // falls z.B. Suchen-Dialog offen ist, Cursor nicht hinter den Dialog stellen - // wenn moeglich, die Zeile mit dem Cursor oberhalb oder unterhalb des Dialogs + // falls z.B. Suchen-Dialog offen ist, Cursor nicht hinter den Dialog stellen + // wenn moeglich, die Zeile mit dem Cursor oberhalb oder unterhalb des Dialogs - //! nicht, wenn schon komplett sichtbar + //! nicht, wenn schon komplett sichtbar if ( eMode == SC_FOLLOW_JUMP ) { @@ -693,21 +693,21 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, { aDlgPixel = pCare->GetWindowExtentsRelative( pWin ); aWinSize = pWin->GetOutputSizePixel(); - // ueberdeckt der Dialog das GridWin? + // ueberdeckt der Dialog das GridWin? if ( aDlgPixel.Right() >= 0 && aDlgPixel.Left() < aWinSize.Width() ) { if ( nCurX < nDeltaX || nCurX >= nDeltaX+nSizeX || nCurY < nDeltaY || nCurY >= nDeltaY+nSizeY ) - bLimit = TRUE; // es wird sowieso gescrollt + bLimit = TRUE; // es wird sowieso gescrollt else { - // Cursor ist auf dem Bildschirm + // Cursor ist auf dem Bildschirm Point aStart = aViewData.GetScrPos( nCurX, nCurY, eAlign ); long nCSX, nCSY; aViewData.GetMergeSizePixel( nCurX, nCurY, nCSX, nCSY ); Rectangle aCursor( aStart, Size( nCSX, nCSY ) ); if ( aCursor.IsOver( aDlgPixel ) ) - bLimit = TRUE; // Zelle vom Dialog ueberdeckt + bLimit = TRUE; // Zelle vom Dialog ueberdeckt } } } @@ -723,10 +723,10 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, SCsCOL nWPosX; SCsROW nWPosY; aViewData.GetPosFromPixel( 0,nDlgBot, eAlign, nWPosX, nWPosY ); - ++nWPosY; // unter der letzten betroffenen Zelle + ++nWPosY; // unter der letzten betroffenen Zelle SCsROW nDiff = nWPosY - nDeltaY; - if ( nCurY >= nDiff ) // Pos. kann nicht negativ werden + if ( nCurY >= nDiff ) // Pos. kann nicht negativ werden { nSpaceY = nDlgBot + ( nBotSpace - nCellSizeY ) / 2; bBottom = TRUE; @@ -781,7 +781,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, nSizeY = (SCsROW) aViewData.CellsAtY( nNewDeltaY, 1, eAlignY ); } - // like old version of SC_FOLLOW_JUMP: + // like old version of SC_FOLLOW_JUMP: if ( nCurX < nNewDeltaX || nCurX >= nNewDeltaX+nSizeX ) { @@ -845,7 +845,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } // - // nochmal aktiven Teil umschalten + // nochmal aktiven Teil umschalten // if (bHFix) @@ -883,7 +883,7 @@ BOOL ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) } // - // MoveCursor - mit Anpassung des Bildausschnitts + // MoveCursor - mit Anpassung des Bildausschnitts // void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, @@ -899,14 +899,14 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, HideAllCursors(); - // aktiven Teil umschalten jetzt in AlignToCursor + // aktiven Teil umschalten jetzt in AlignToCursor AlignToCursor( nCurX, nCurY, eMode ); - //! auf OS/2: SC_FOLLOW_JUMP statt SC_FOLLOW_LINE, um Nachlaufen zu verhindern ??? + //! auf OS/2: SC_FOLLOW_JUMP statt SC_FOLLOW_LINE, um Nachlaufen zu verhindern ??? if (bKeepSel) { - SetCursor( nCurX, nCurY ); // Markierung stehenlassen + SetCursor( nCurX, nCurY ); // Markierung stehenlassen // If the cursor is in existing selection, it's a cursor movement by // ENTER or TAB. If not, then it's a new selection during ADD @@ -935,8 +935,8 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, bMoveIsShift = FALSE; aFunctionSet.SetCursorAtCell( nCurX, nCurY, FALSE ); - // Wenn der Cursor nicht bewegt wurde, muss das SelectionChanged fuer das - // Aufheben der Selektion hier einzeln passieren: + // Wenn der Cursor nicht bewegt wurde, muss das SelectionChanged fuer das + // Aufheben der Selektion hier einzeln passieren: if (bSame) SelectionChanged(); } @@ -1022,12 +1022,12 @@ void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, B SCCOL nUsedX = 0; SCROW nUsedY = 0; if ( nMovX > 0 || nMovY > 0 ) - pDoc->GetPrintArea( nTab, nUsedX, nUsedY ); // Ende holen + pDoc->GetPrintArea( nTab, nUsedX, nUsedY ); // Ende holen if (nMovX<0) nNewX=0; else if (nMovX>0) - nNewX=nUsedX; // letzter benutzter Bereich + nNewX=nUsedX; // letzter benutzter Bereich if (nMovY<0) nNewY=0; @@ -1075,7 +1075,7 @@ void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode MoveCursorAbs( nNewX, nNewY, eMode, bShift, FALSE, TRUE ); } -void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter +void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter { const ScInputOptions& rOpt = SC_MOD()->GetInputOptions(); if (!rOpt.GetMoveSelection()) @@ -1118,7 +1118,7 @@ void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, SC_FOLLOW_LINE, FALSE, TRUE ); - // update input line even if cursor was not moved + // update input line even if cursor was not moved if ( nNewX == nCurX && nNewY == nCurY ) aViewData.UpdateInputHandler(TRUE); } @@ -1126,7 +1126,7 @@ void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter { if ( nMoveY != 0 && !nMoveX ) { - // nach Tab und Enter wieder zur Ausgangsspalte + // nach Tab und Enter wieder zur Ausgangsspalte SCCOL nTabCol = aViewData.GetTabStartCol(); if (nTabCol != SC_TABSTART_NONE) { @@ -1237,12 +1237,12 @@ void ScTabView::FindNextUnprot( BOOL bShift, BOOL bInSelection ) SCCOL nTabCol = aViewData.GetTabStartCol(); if ( nTabCol == SC_TABSTART_NONE ) - nTabCol = nCurX; // auf diese Spalte zurueck bei Enter + nTabCol = nCurX; // auf diese Spalte zurueck bei Enter MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, SC_FOLLOW_LINE, FALSE, TRUE ); - // in MoveCursorRel wird die TabCol zurueckgesetzt... + // in MoveCursorRel wird die TabCol zurueckgesetzt... aViewData.SetTabStartCol( nTabCol ); } @@ -1327,7 +1327,7 @@ void ScTabView::MarkMatrixFormula() ScRange aMatrix; if ( pDoc->GetMatrixFormulaRange( aCursor, aMatrix ) ) { - MarkRange( aMatrix, FALSE ); // cursor is already within the range + MarkRange( aMatrix, FALSE ); // cursor is already within the range } } @@ -1431,7 +1431,7 @@ void ScTabView::SelectNextTab( short nDir, BOOL bExtendSelection ) } -// SetTabNo - angezeigte Tabelle +// SetTabNo - angezeigte Tabelle void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) { @@ -1443,21 +1443,21 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) if ( nTab != aViewData.GetTabNo() || bNew ) { - // #57724# Die FormShell moechte vor dem Umschalten benachrichtigt werden + // #57724# Die FormShell moechte vor dem Umschalten benachrichtigt werden FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell(); if (pFormSh) { BOOL bAllowed = sal::static_int_cast<BOOL>( pFormSh->PrepareClose( TRUE ) ); if (!bAllowed) { - //! Fehlermeldung? oder macht das die FormShell selber? - //! Fehler-Flag zurueckgeben und Aktionen abbrechen + //! Fehlermeldung? oder macht das die FormShell selber? + //! Fehler-Flag zurueckgeben und Aktionen abbrechen - return; // Die FormShell sagt, es kann nicht umgeschaltet werden + return; // Die FormShell sagt, es kann nicht umgeschaltet werden } } - // nicht InputEnterHandler wegen Referenzeingabe ! + // nicht InputEnterHandler wegen Referenzeingabe ! ScDocument* pDoc = aViewData.GetDocument(); @@ -1469,7 +1469,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nOldPos = nTab; - while (!pDoc->IsVisible(nTab)) // naechste sichtbare suchen + while (!pDoc->IsVisible(nTab)) // naechste sichtbare suchen { BOOL bUp = (nTab>=nOldPos); if (bUp) @@ -1503,7 +1503,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert { DoneBlockMode(); - pSelEngine->Reset(); // reset all flags, including locked modifiers + pSelEngine->Reset(); // reset all flags, including locked modifiers aViewData.SetRefTabNo( nTab ); } @@ -1511,8 +1511,8 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) BOOL bFocus = pGridWin[eOldActive]->HasFocus(); aViewData.SetTabNo( nTab ); - // UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen - // Fenster findet (wird aus SetCursor gerufen) + // UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen + // Fenster findet (wird aus SetCursor gerufen) UpdateShow(); aViewData.ResetOldCursor(); SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), TRUE ); @@ -1565,10 +1565,10 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) pGridWin[i]->UpdateEditViewPos(); } - TabChanged(); // DrawView + TabChanged(); // DrawView UpdateVisibleRange(); - aViewData.GetViewShell()->WindowChanged(); // falls das aktive Fenster anders ist + aViewData.GetViewShell()->WindowChanged(); // falls das aktive Fenster anders ist if ( !bUnoRefDialog ) aViewData.GetViewShell()->DisconnectAllClients(); // important for floating frames else @@ -1606,7 +1606,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) if ( bFocus && aViewData.GetActivePart() != eOldActive && !bRefMode ) ActiveGrabFocus(); // grab focus to the pane that's active now - // Fixierungen + // Fixierungen BOOL bResize = FALSE; if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX ) @@ -1620,10 +1620,10 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) InvalidateSplit(); if ( aViewData.IsPagebreakMode() ) - UpdatePageBreakData(); //! asynchron ?? + UpdatePageBreakData(); //! asynchron ?? - // #53551# Form-Layer muss den sichtbaren Ausschnitt der neuen Tabelle kennen - // dafuer muss hier schon der MapMode stimmen + // #53551# Form-Layer muss den sichtbaren Ausschnitt der neuen Tabelle kennen + // dafuer muss hier schon der MapMode stimmen for (USHORT i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() ); @@ -1635,14 +1635,14 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) PaintExtras(); DoResize( aBorderPos, aFrameSize ); - rBindings.Invalidate( SID_DELETE_PRINTAREA ); // Menue + rBindings.Invalidate( SID_DELETE_PRINTAREA ); // Menue rBindings.Invalidate( FID_DEL_MANUALBREAKS ); rBindings.Invalidate( FID_RESET_PRINTZOOM ); - rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar - rBindings.Invalidate( SID_STATUS_PAGESTYLE ); // Statusbar - rBindings.Invalidate( SID_CURRENTTAB ); // Navigator - rBindings.Invalidate( SID_STYLE_FAMILY2 ); // Gestalter - rBindings.Invalidate( SID_STYLE_FAMILY4 ); // Gestalter + rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar + rBindings.Invalidate( SID_STATUS_PAGESTYLE ); // Statusbar + rBindings.Invalidate( SID_CURRENTTAB ); // Navigator + rBindings.Invalidate( SID_STYLE_FAMILY2 ); // Gestalter + rBindings.Invalidate( SID_STYLE_FAMILY4 ); // Gestalter rBindings.Invalidate( SID_TABLES_COUNT ); if(pScMod->IsRefDialogOpen()) @@ -1660,7 +1660,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) } // -// Paint-Funktionen - nur fuer diese View +// Paint-Funktionen - nur fuer diese View // void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ) @@ -1685,8 +1685,8 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW ( nCol >= nScrX && nCol <= nScrX + aViewData.VisibleCellsX(eHWhich) + 1 && nRow >= nScrY && nRow <= nScrY + aViewData.VisibleCellsY(eVWhich) + 1 ); - // #102421# for the active part, create edit view even if outside the visible area, - // so input isn't lost (and the edit view may be scrolled into the visible area) + // #102421# for the active part, create edit view even if outside the visible area, + // so input isn't lost (and the edit view may be scrolled into the visible area) // #i26433# during spelling, the spelling view must be active if ( bPosVisible || aViewData.GetActivePart() == (ScSplitPos) i || @@ -1708,8 +1708,8 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW if ( !bPosVisible ) { - // move the edit view area to the real (possibly negative) position, - // or hide if completely above or left of the window + // move the edit view area to the real (possibly negative) position, + // or hide if completely above or left of the window pGridWin[i]->UpdateEditViewPos(); } } @@ -1779,13 +1779,13 @@ void ScTabView::KillEditView( BOOL bNoPaint ) if (pDrawView) DrawEnableAnim( TRUE ); - // GrabFocus immer dann, wenn diese View aktiv ist und - // die Eingabezeile den Focus hat + // GrabFocus immer dann, wenn diese View aktiv ist und + // die Eingabezeile den Focus hat BOOL bGrabFocus = FALSE; if (aViewData.IsActive()) { - ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); + ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); if ( pInputHdl ) { ScInputWindow* pInputWin = pInputHdl->GetInputWindow(); @@ -1796,13 +1796,13 @@ void ScTabView::KillEditView( BOOL bNoPaint ) if (bGrabFocus) { -// So soll es gemacht werden, damit der Sfx es mitbekommt, klappt aber nicht: -//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); -// deshalb erstmal so: +// So soll es gemacht werden, damit der Sfx es mitbekommt, klappt aber nicht: +//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); +// deshalb erstmal so: GetActiveWin()->GrabFocus(); } - // Cursor-Abfrage erst nach GrabFocus + // Cursor-Abfrage erst nach GrabFocus for (i=0; i<4; i++) if (pGridWin[i] && pGridWin[i]->IsVisible()) @@ -1832,16 +1832,16 @@ void ScTabView::UpdateFormulas() pGridWin[i]->UpdateFormulas(); if ( aViewData.IsPagebreakMode() ) - UpdatePageBreakData(); //! asynchron + UpdatePageBreakData(); //! asynchron UpdateHeaderWidth(); - // if in edit mode, adjust edit view area because widths/heights may have changed + // if in edit mode, adjust edit view area because widths/heights may have changed if ( aViewData.HasEditView( aViewData.GetActivePart() ) ) UpdateEditView(); } -// PaintArea -Block neu zeichnen +// PaintArea -Block neu zeichnen void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScUpdateMode eMode ) @@ -1873,10 +1873,10 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO if (nCol1 < nScrX) nCol1 = nScrX; if (nCol2 < nScrX) { - if ( eMode == SC_UPDATE_ALL ) // #91240# for UPDATE_ALL, paint anyway - nCol2 = nScrX; // (because of extending strings to the right) + if ( eMode == SC_UPDATE_ALL ) // #91240# for UPDATE_ALL, paint anyway + nCol2 = nScrX; // (because of extending strings to the right) else - bOut = TRUE; // completely outside the window + bOut = TRUE; // completely outside the window } if (nRow1 < nScrY) nRow1 = nScrY; if (nRow2 < nScrY) bOut = TRUE; @@ -1892,7 +1892,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO { if ( eMode == SC_UPDATE_CHANGED ) pGridWin[i]->Draw( nCol1, nRow1, nCol2, nRow2, eMode ); - else // ALL oder MARKS + else // ALL oder MARKS { BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); long nLayoutSign = bLayoutRTL ? -1 : 1; @@ -1908,26 +1908,26 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO if ( eMode == SC_UPDATE_ALL && nRow2 >= MAXROW ) aEnd.Y() = pGridWin[i]->GetOutputSizePixel().Height(); - BOOL bShowChanges = TRUE; //! ... + BOOL bShowChanges = TRUE; //! ... if (bShowChanges) { - aStart.X() -= nLayoutSign; // include change marks + aStart.X() -= nLayoutSign; // include change marks aStart.Y() -= 1; } BOOL bMarkClipped = aViewData.GetOptions().GetOption( VOPT_CLIPMARKS ); if (bMarkClipped) { - // dazu muesste ScColumn::IsEmptyBlock optimiert werden - // (auf Search() umstellen) + // dazu muesste ScColumn::IsEmptyBlock optimiert werden + // (auf Search() umstellen) //!if ( nCol1 > 0 && !aViewData.GetDocument()->IsBlockEmpty( - //! aViewData.GetTabNo(), - //! 0, nRow1, nCol1-1, nRow2 ) ) + //! aViewData.GetTabNo(), + //! 0, nRow1, nCol1-1, nRow2 ) ) { long nMarkPixel = (long)( SC_CLIPMARK_SIZE * aViewData.GetPPTX() ); aStart.X() -= nMarkPixel * nLayoutSign; if (!bShowChanges) - aStart.X() -= nLayoutSign; // cell grid + aStart.X() -= nLayoutSign; // cell grid } } @@ -1962,9 +1962,9 @@ void ScTabView::PaintRangeFinder( long nNumber ) if (pData) { ScRange aRef = pData->aRef; - aRef.Justify(); // Justify fuer die Abfragen unten + aRef.Justify(); // Justify fuer die Abfragen unten - if ( aRef.aStart == aRef.aEnd ) //! Tab ignorieren? + if ( aRef.aStart == aRef.aEnd ) //! Tab ignorieren? aViewData.GetDocument()->ExtendMerge(aRef); if ( aRef.aStart.Tab() >= nTab && aRef.aEnd.Tab() <= nTab ) @@ -1974,8 +1974,8 @@ void ScTabView::PaintRangeFinder( long nNumber ) SCCOL nCol2 = aRef.aEnd.Col(); SCROW nRow2 = aRef.aEnd.Row(); - // wegnehmen -> Repaint - // SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende + // wegnehmen -> Repaint + // SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende BOOL bHiddenEdge = FALSE; SCROW nTmp; @@ -2010,13 +2010,13 @@ void ScTabView::PaintRangeFinder( long nNumber ) if ( nCol2 - nCol1 > 1 && nRow2 - nRow1 > 1 && !bHiddenEdge ) { - // nur an den Raendern entlang + // nur an den Raendern entlang PaintArea( nCol1, nRow1, nCol2, nRow1, SC_UPDATE_MARKS ); PaintArea( nCol1, nRow1+1, nCol1, nRow2-1, SC_UPDATE_MARKS ); PaintArea( nCol2, nRow1+1, nCol2, nRow2-1, SC_UPDATE_MARKS ); PaintArea( nCol1, nRow2, nCol2, nRow2, SC_UPDATE_MARKS ); } - else // alles am Stueck + else // alles am Stueck PaintArea( nCol1, nRow1, nCol2, nRow2, SC_UPDATE_MARKS ); } } @@ -2025,7 +2025,7 @@ void ScTabView::PaintRangeFinder( long nNumber ) } } -// fuer Chart-Daten-Markierung +// fuer Chart-Daten-Markierung void ScTabView::AddHighlightRange( const ScRange& rRange, const Color& rColor ) { @@ -2044,7 +2044,7 @@ void ScTabView::ClearHighlightRanges() if (pHighlightRanges) { ScHighlightRanges* pTemp = pHighlightRanges; - pHighlightRanges = NULL; // Repaint ohne Highlight + pHighlightRanges = NULL; // Repaint ohne Highlight SCTAB nTab = aViewData.GetTabNo(); ULONG nCount = pTemp->Count(); @@ -2088,7 +2088,7 @@ void ScTabView::DoChartSelection( } } -// PaintGrid - Datenbereiche neu zeichnen +// PaintGrid - Datenbereiche neu zeichnen void ScTabView::PaintGrid() { @@ -2099,7 +2099,7 @@ void ScTabView::PaintGrid() pGridWin[i]->Invalidate(); } -// PaintTop - obere Kontrollelemente neu zeichnen +// PaintTop - obere Kontrollelemente neu zeichnen void ScTabView::PaintTop() { @@ -2131,22 +2131,22 @@ void ScTabView::CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress) void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) { - // Pixel-Position der linken Kante + // Pixel-Position der linken Kante if ( nStartCol < aViewData.GetPosX(SC_SPLIT_LEFT) || nStartCol < aViewData.GetPosX(SC_SPLIT_RIGHT) ) aViewData.RecalcPixPos(); - // Fixierung anpassen (UpdateFixX setzt HSplitPos neu) + // Fixierung anpassen (UpdateFixX setzt HSplitPos neu) if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX && nStartCol < aViewData.GetFixPosX() ) if (aViewData.UpdateFixX()) RepeatResize(); - // zeichnen + // zeichnen if (nStartCol>0) - --nStartCol; //! allgemeiner ? + --nStartCol; //! allgemeiner ? BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); long nLayoutSign = bLayoutRTL ? -1 : 1; @@ -2172,7 +2172,7 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) } -// PaintLeft - linke Kontrollelemente neu zeichnen +// PaintLeft - linke Kontrollelemente neu zeichnen void ScTabView::PaintLeft() { @@ -2188,19 +2188,19 @@ void ScTabView::PaintLeft() void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow ) { - // Pixel-Position der oberen Kante + // Pixel-Position der oberen Kante if ( nStartRow < aViewData.GetPosY(SC_SPLIT_TOP) || nStartRow < aViewData.GetPosY(SC_SPLIT_BOTTOM) ) aViewData.RecalcPixPos(); - // Fixierung anpassen (UpdateFixY setzt VSplitPos neu) + // Fixierung anpassen (UpdateFixY setzt VSplitPos neu) if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX && nStartRow < aViewData.GetFixPosY() ) if (aViewData.UpdateFixY()) RepeatResize(); - // zeichnen + // zeichnen if (nStartRow>0) --nStartRow; @@ -2225,13 +2225,13 @@ void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow ) } } -// InvertBlockMark - Block invertieren +// InvertBlockMark - Block invertieren void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY) { if ( !aViewData.IsActive() ) - return; // invertiert wird nur auf aktiver View + return; // invertiert wird nur auf aktiver View PutInOrder( nStartX, nEndX ); PutInOrder( nStartY, nEndY ); @@ -2243,8 +2243,8 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, if ( pDocSh->GetLockCount() ) { - // if paint is locked, avoid repeated inverting - // add repaint areas to paint lock data instead + // if paint is locked, avoid repeated inverting + // add repaint areas to paint lock data instead pDocSh->PostPaint( nStartX,nStartY,nTab, nEndX,nEndY,nTab, PAINT_GRID ); return; } @@ -2274,7 +2274,7 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, if ( pDoc->IsLayoutRTL( nTab ) ) { long nTemp = aStartPoint.X(); - aStartPoint.X() = aEndPoint.X() + 1; // +1 - excluding start of nEndX+1 + aStartPoint.X() = aEndPoint.X() + 1; // +1 - excluding start of nEndX+1 aEndPoint.X() = nTemp; } else @@ -2292,10 +2292,10 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, } // - // wenn Controls betroffen, neu malen + // wenn Controls betroffen, neu malen // - BOOL bHide = TRUE; // wird Teil der Markierung aufgehoben ? + BOOL bHide = TRUE; // wird Teil der Markierung aufgehoben ? if (rMark.IsMarked()) { ScRange aMarkRange; @@ -2303,7 +2303,7 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, if ( aMarkRange.aStart.Col() <= nStartX && aMarkRange.aEnd.Col() >= nEndX && aMarkRange.aStart.Row() <= nStartY && aMarkRange.aEnd.Row() >= nEndY ) { - bHide = FALSE; // der ganze Bereich ist markiert + bHide = FALSE; // der ganze Bereich ist markiert } } } @@ -2313,20 +2313,20 @@ BOOL ScTabView::PaintExtras() BOOL bRet = FALSE; ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); - if (!pDoc->HasTable(nTab)) // Tabelle geloescht ? + if (!pDoc->HasTable(nTab)) // Tabelle geloescht ? { SCTAB nCount = pDoc->GetTableCount(); aViewData.SetTabNo(nCount-1); bRet = TRUE; } - pTabControl->UpdateStatus(); // TRUE = active + pTabControl->UpdateStatus(); // TRUE = active return bRet; } void ScTabView::RecalcPPT() { - // called after changes that require the PPT values to be recalculated - // (currently from detective operations) + // called after changes that require the PPT values to be recalculated + // (currently from detective operations) double nOldX = aViewData.GetPPTX(); double nOldY = aViewData.GetPPTY(); @@ -2337,8 +2337,8 @@ void ScTabView::RecalcPPT() BOOL bChangedY = ( aViewData.GetPPTY() != nOldY ); if ( bChangedX || bChangedY ) { - // call view SetZoom (including draw scale, split update etc) - // and paint only if values changed + // call view SetZoom (including draw scale, split update etc) + // and paint only if values changed Fraction aZoomX = aViewData.GetZoomX(); Fraction aZoomY = aViewData.GetZoomY(); @@ -2356,29 +2356,29 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) { if ( bActivate == aViewData.IsActive() && !bFirst ) { - // keine Assertion mehr - kommt vor, wenn vorher im Drag&Drop - // auf ein anderes Dokument umgeschaltet wurde + // keine Assertion mehr - kommt vor, wenn vorher im Drag&Drop + // auf ein anderes Dokument umgeschaltet wurde return; } // wird nur bei MDI-(De)Activate gerufen // aViewData.Activate hinten wegen Cursor-Show bei KillEditView - // Markierung nicht mehr loeschen - wenn an der ViewData Activate(FALSE) gesetzt ist, - // wird die Markierung nicht ausgegeben + // Markierung nicht mehr loeschen - wenn an der ViewData Activate(FALSE) gesetzt ist, + // wird die Markierung nicht ausgegeben if (!bActivate) { ScModule* pScMod = SC_MOD(); BOOL bRefMode = pScMod->IsFormulaMode(); - // Referenzeingabe nicht abbrechen, um Referenzen auf - // andere Dokumente zuzulassen + // Referenzeingabe nicht abbrechen, um Referenzen auf + // andere Dokumente zuzulassen if (!bRefMode) { //pScMod->InputEnterHandler(); - // #80843# pass view to GetInputHdl, this view may not be current anymore + // #80843# pass view to GetInputHdl, this view may not be current anymore ScInputHandler* pHdl = SC_MOD()->GetInputHdl(aViewData.GetViewShell()); if (pHdl) pHdl->EnterHandler(); @@ -2389,15 +2389,15 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) aViewData.Activate(bActivate); - PaintBlock(FALSE); // Repaint, Markierung je nach Active-Status + PaintBlock(FALSE); // Repaint, Markierung je nach Active-Status if (!bActivate) - HideAllCursors(); // Cursor + HideAllCursors(); // Cursor else if (!bFirst) ShowAllCursors(); //HMHif (pDrawView) - //HMH DrawShowMarkHdl(bActivate); // Drawing-Markierung + //HMH DrawShowMarkHdl(bActivate); // Drawing-Markierung if (bActivate) { @@ -2416,7 +2416,7 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) if ( pGridWin[i] ) { eWin = (ScSplitPos) i; - break; // for + break; // for } } DBG_ASSERT( i<4, "und BUMM" ); @@ -2424,9 +2424,9 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) aViewData.SetActivePart( eWin ); } } - // hier nicht mehr selber GrabFocus rufen! - // Wenn das Doc bearbeitet wird, ruft der Sfx selber GrabFocus am Fenster der Shell. - // Wenn es z.B. ein Mailbody ist, darf es den Focus nicht bekommen (Bug #43638#) + // hier nicht mehr selber GrabFocus rufen! + // Wenn das Doc bearbeitet wird, ruft der Sfx selber GrabFocus am Fenster der Shell. + // Wenn es z.B. ein Mailbody ist, darf es den Focus nicht bekommen (Bug #43638#) UpdateInputContext(); } @@ -2443,7 +2443,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) BOOL bRefMode = SC_MOD()->IsFormulaMode(); - // #40565# the HasEditView call during SetCursor would fail otherwise + // #40565# the HasEditView call during SetCursor would fail otherwise if ( aViewData.HasEditView(eOld) && !bRefMode ) UpdateInputLine(); @@ -2474,9 +2474,9 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) if ( bCapture || pGridWin[eWhich]->IsMouseCaptured() ) { - // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann - // (SelectionEngine ruft CaptureMouse beim SetWindow) - //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! + // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann + // (SelectionEngine ruft CaptureMouse beim SetWindow) + //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! pGridWin[eWhich]->ReleaseMouse(); pGridWin[eWhich]->StartTracking(); } @@ -2507,16 +2507,16 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) SfxInPlaceClient* pClient = aViewData.GetViewShell()->GetIPClient(); BOOL bOleActive = ( pClient && pClient->IsObjectInPlaceActive() ); - // #103823# don't switch ViewShell's active window during RefInput, because the focus - // might change, and subsequent SetReference calls wouldn't find the right EditView + // #103823# don't switch ViewShell's active window during RefInput, because the focus + // might change, and subsequent SetReference calls wouldn't find the right EditView if ( !bRefMode && !bOleActive ) aViewData.GetViewShell()->SetWindow( pGridWin[eWhich] ); if ( bFocus && !aViewData.IsAnyFillMode() && !bRefMode ) { - // GrabFocus nur, wenn vorher das andere GridWindow den Focus hatte - // (z.B. wegen Suchen & Ersetzen) -//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); + // GrabFocus nur, wenn vorher das andere GridWindow den Focus hatte + // (z.B. wegen Suchen & Ersetzen) +//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); pGridWin[eWhich]->GrabFocus(); } @@ -2541,7 +2541,7 @@ void ScTabView::UpdateInputContext() pTabControl->UpdateInputContext(); } -// GetGridWidth - Breite eines Ausgabebereichs (fuer ViewData) +// GetGridWidth - Breite eines Ausgabebereichs (fuer ViewData) long ScTabView::GetGridWidth( ScHSplitPos eWhich ) { @@ -2552,7 +2552,7 @@ long ScTabView::GetGridWidth( ScHSplitPos eWhich ) return 0; } -// GetGridHeight - Hoehe eines Ausgabebereichs (fuer ViewData) +// GetGridHeight - Hoehe eines Ausgabebereichs (fuer ViewData) long ScTabView::GetGridHeight( ScVSplitPos eWhich ) { @@ -2578,7 +2578,7 @@ void ScTabView::ZoomChanged() UpdateScrollBars(); - // VisArea... + // VisArea... // AW: Discussed with NN if there is a reason that new map mode was only set for one window, // but is not. Setting only on one window causes the first repaint to have the old mapMode // in three of four views, so the overlay will save the wrong content e.g. when zooming out. @@ -2599,11 +2599,11 @@ void ScTabView::ZoomChanged() ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()]; if (pWin) { - pWin->SetMapMode( pWin->GetDrawMapMode() ); // mit neuem Zoom - SetNewVisArea(); // benutzt den gesetzten MapMode + pWin->SetMapMode( pWin->GetDrawMapMode() ); // mit neuem Zoom + SetNewVisArea(); // benutzt den gesetzten MapMode } */ - InterpretVisible(); // #69343# have everything calculated before painting + InterpretVisible(); // #69343# have everything calculated before painting SfxBindings& rBindings = aViewData.GetBindings(); rBindings.Invalidate( SID_ATTR_ZOOM ); @@ -2619,8 +2619,8 @@ void ScTabView::ZoomChanged() // flush OverlayManager before changing the MapMode pWin->flushOverlayManager(); - // #93650# make sure the EditView's position and size are updated - // with the right (logic, not drawing) MapMode + // #93650# make sure the EditView's position and size are updated + // with the right (logic, not drawing) MapMode pWin->SetMapMode( aViewData.GetLogicMode() ); UpdateEditView(); } diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 13ef6ca977b0..100e641c396a 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.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,14 +47,14 @@ #include "cell.hxx" #include "dociter.hxx" -extern USHORT nScFillModeMouseModifier; // global.cxx +extern USHORT nScFillModeMouseModifier; // global.cxx // STATIC DATA ----------------------------------------------------------- //================================================================== // -// --- Referenz-Eingabe / Fill-Cursor +// --- Referenz-Eingabe / Fill-Cursor // void ScTabView::HideTip() @@ -75,7 +75,7 @@ void ScTabView::ShowRefTip() SCROW nStartY = aViewData.GetRefStartY(); SCCOL nEndX = aViewData.GetRefEndX(); SCROW nEndY = aViewData.GetRefEndY(); - if ( nEndX != nStartX || nEndY != nStartY ) // nicht fuer einzelne Zelle + if ( nEndX != nStartX || nEndY != nStartY ) // nicht fuer einzelne Zelle { BOOL bLeft = ( nEndX < nStartX ); BOOL bTop = ( nEndY < nStartY ); @@ -106,14 +106,14 @@ void ScTabView::ShowRefTip() if ( !bTop && aViewData.HasEditView( eWhich ) && nEndY+1 == aViewData.GetEditViewRow() ) { - // dann an der oberen Kante der editierten Zelle ausrichten - aPos.Y() -= 2; // die 3 von oben + // dann an der oberen Kante der editierten Zelle ausrichten + aPos.Y() -= 2; // die 3 von oben nFlags = ( nFlags & ~QUICKHELP_TOP ) | QUICKHELP_BOTTOM; } Rectangle aRect( pWin->OutputToScreenPixel( aPos ), Size(1,1) ); - //! Test, ob geaendert ?? + //! Test, ob geaendert ?? HideTip(); nTipVisible = Help::ShowTip( pWin, aRect, aHelp, nFlags ); @@ -150,7 +150,7 @@ void ScTabView::StopRefMode() } pSelEngine->Reset(); - pSelEngine->SetAddMode( FALSE ); //! sollte das nicht bei Reset passieren? + pSelEngine->SetAddMode( FALSE ); //! sollte das nicht bei Reset passieren? ScSplitPos eOld = pSelEngine->GetWhich(); ScSplitPos eNew = aViewData.GetActivePart(); @@ -164,11 +164,11 @@ void ScTabView::StopRefMode() } } - // AlignToCursor(SC_FOLLOW_NONE): Only switch active part. - // This must also be done if no RefMode was active (for RangeFinder dragging), - // but if RefMode was set, AlignToCursor must be after SelectionEngine reset, - // so the SelectionEngine SetWindow call from AlignToCursor doesn't capture - // the mouse again when called from Tracking/MouseButtonUp (#94562#). + // AlignToCursor(SC_FOLLOW_NONE): Only switch active part. + // This must also be done if no RefMode was active (for RangeFinder dragging), + // but if RefMode was set, AlignToCursor must be after SelectionEngine reset, + // so the SelectionEngine SetWindow call from AlignToCursor doesn't capture + // the mouse again when called from Tracking/MouseButtonUp (#94562#). AlignToCursor( aViewData.GetCurX(), aViewData.GetCurY(), SC_FOLLOW_NONE ); } @@ -184,7 +184,7 @@ void ScTabView::DoneRefMode( BOOL bContinue ) HideTip(); UpdateShrinkOverlay(); - // Paint: + // Paint: if ( bWasRef && aViewData.GetTabNo() >= aViewData.GetRefStartZ() && aViewData.GetTabNo() <= aViewData.GetRefEndZ() ) { @@ -205,8 +205,8 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) if (!aViewData.IsRefMode()) { - // Das kommt vor, wenn bei einem Referenz-Dialog als erstes mit Control in die - // die Tabelle geklickt wird. Dann die neue Referenz an den alten Inhalt anhaengen: + // Das kommt vor, wenn bei einem Referenz-Dialog als erstes mit Control in die + // die Tabelle geklickt wird. Dann die neue Referenz an den alten Inhalt anhaengen: ScModule* pScMod = SC_MOD(); if (pScMod->IsFormulaMode()) @@ -266,7 +266,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) PaintArea( nPaintStartX, nPaintStartY, nPaintEndX, nPaintEndY, SC_UPDATE_MARKS ); } - // Tip-Hilfe fuer Auto-Fill + // Tip-Hilfe fuer Auto-Fill if ( aViewData.GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() ) { @@ -279,7 +279,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) if ( aViewData.GetFillMode() == SC_FILL_MATRIX && !(nScFillModeMouseModifier & KEY_MOD1) ) { aHelpStr = ScGlobal::GetRscString( STR_TIP_RESIZEMATRIX ); - SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig + SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig SCROW nRows = nEndY + 1 - aViewData.GetRefStartY(); aHelpStr.SearchAndReplace( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("%1")), String::CreateFromInt32(nRows) ); @@ -291,7 +291,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) else if ( nEndX != aMarkRange.aEnd.Col() || nEndY != aMarkRange.aEnd.Row() ) aHelpStr = pDoc->GetAutoFillPreview( aMarkRange, nEndX, nEndY ); - // je nach Richtung die obere oder untere Ecke: + // je nach Richtung die obere oder untere Ecke: SCCOL nAddX = ( nEndX >= aMarkRange.aEnd.Col() ) ? 1 : 0; SCROW nAddY = ( nEndY >= aMarkRange.aEnd.Row() ) ? 1 : 0; Point aPos = aViewData.GetScrPos( nEndX+nAddX, nEndY+nAddY, aViewData.GetActivePart() ); @@ -324,10 +324,10 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT SCROW nEndY = nCurY; pDoc->ExtendMerge( nStartX, nStartY, nEndX, nEndY, aViewData.GetTabNo() ); - //! nur Markierung ueber Inhalte zeichnen! + //! nur Markierung ueber Inhalte zeichnen! PaintArea( nStartX,nStartY,nEndX,nEndY, SC_UPDATE_MARKS ); - // SetReference ohne Merge-Anpassung + // SetReference ohne Merge-Anpassung ScRange aRef( nCurX,nCurY,nCurZ, nCurX,nCurY,nCurZ ); SC_MOD()->SetReference( aRef, pDoc, &rMark ); } @@ -340,9 +340,9 @@ void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, if ( nVisible == 0 ) nVisible = 1; // #i59893# don't use visible size 0 - // RTL layout uses a negative range to simulate a mirrored scroll bar. - // SetScrollBar/GetScrollBarPos hide this so outside of these functions normal cell - // addresses can be used. + // RTL layout uses a negative range to simulate a mirrored scroll bar. + // SetScrollBar/GetScrollBarPos hide this so outside of these functions normal cell + // addresses can be used. if ( bLayoutRTL ) { @@ -367,9 +367,9 @@ long ScTabView::GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL ) return rScroll.GetThumbPos(); } -// UpdateScrollBars - sichtbaren Bereich und Scrollweite der Scrollbars einstellen +// UpdateScrollBars - sichtbaren Bereich und Scrollweite der Scrollbars einstellen -long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (komplette) Zellen +long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (komplette) Zellen { long nOldPos; long nNewPos; @@ -378,7 +378,7 @@ long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (kompl rScroll.SetPageSize( static_cast<long>(nSize) ); nNewPos = rScroll.GetThumbPos(); #ifndef UNX - rScroll.SetPageSize( 1 ); // immer moeglich ! + rScroll.SetPageSize( 1 ); // immer moeglich ! #endif return nNewPos - nOldPos; @@ -389,25 +389,25 @@ long lcl_GetScrollRange( SCCOLROW nDocEnd, SCCOLROW nPos, SCCOLROW nVis, SCCOLRO // get the end (positive) of a scroll bar range that always starts at 0 ++nVis; - ++nMax; // for partially visible cells + ++nMax; // for partially visible cells SCCOLROW nEnd = Max(nDocEnd, (SCCOLROW)(nPos+nVis)) + nVis; if (nEnd > nMax) nEnd = nMax; - return ( nEnd - nStart ); // for range starting at 0 + return ( nEnd - nStart ); // for range starting at 0 } void ScTabView::UpdateScrollBars() { - long nDiff; - BOOL bTop = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); - BOOL bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); - ScDocument* pDoc = aViewData.GetDocument(); - SCTAB nTab = aViewData.GetTabNo(); + long nDiff; + BOOL bTop = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); + BOOL bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); + ScDocument* pDoc = aViewData.GetDocument(); + SCTAB nTab = aViewData.GetTabNo(); BOOL bMirror = pDoc->IsLayoutRTL( nTab ) != Application::GetSettings().GetLayoutRTL(); - SCCOL nUsedX; - SCROW nUsedY; - pDoc->GetTableArea( nTab, nUsedX, nUsedY ); //! cachen !!!!!!!!!!!!!!! + SCCOL nUsedX; + SCROW nUsedY; + pDoc->GetTableArea( nTab, nUsedX, nUsedY ); //! cachen !!!!!!!!!!!!!!! SCCOL nVisXL = 0; SCCOL nVisXR = 0; @@ -443,7 +443,7 @@ void ScTabView::UpdateScrollBars() SetScrollBar( aVScrollTop, nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), FALSE ); } - // Bereich testen + // Bereich testen nDiff = lcl_UpdateBar( aHScrollLeft, nVisXL ); if (nDiff) ScrollX( nDiff, SC_SPLIT_LEFT ); @@ -461,7 +461,7 @@ void ScTabView::UpdateScrollBars() if (nDiff) ScrollY( nDiff, SC_SPLIT_TOP ); } - // set visible area for online spelling + // set visible area for online spelling if ( aViewData.IsActive() ) { @@ -476,12 +476,12 @@ void ScTabView::UpdateScrollBars() if ( nEndY > MAXROW ) nEndY = MAXROW; ScRange aVisible( nPosX, nPosY, nTab, nEndX, nEndY, nTab ); if ( pDoc->SetVisibleSpellRange( aVisible ) ) - SC_MOD()->AnythingChanged(); // if visible area has changed + SC_MOD()->AnythingChanged(); // if visible area has changed } } #ifndef HDR_SLIDERSIZE -#define HDR_SLIDERSIZE 2 +#define HDR_SLIDERSIZE 2 #endif void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos ) @@ -494,7 +494,7 @@ void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos ) { Rectangle aRect( 0,nDragPos, pWin->GetOutputSizePixel().Width()-1,nDragPos+HDR_SLIDERSIZE-1 ); pWin->Update(); - pWin->DoInvertRect( aRect ); // Pixel + pWin->DoInvertRect( aRect ); // Pixel } } } @@ -509,7 +509,7 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos ) { Rectangle aRect( nDragPos,0, nDragPos+HDR_SLIDERSIZE-1,pWin->GetOutputSizePixel().Height()-1 ); pWin->Update(); - pWin->DoInvertRect( aRect ); // Pixel + pWin->DoInvertRect( aRect ); // Pixel } } } @@ -518,8 +518,8 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos ) void ScTabView::InterpretVisible() { - // make sure all visible cells are interpreted, - // so the next paint will not execute a macro function + // make sure all visible cells are interpreted, + // so the next paint will not execute a macro function ScDocument* pDoc = aViewData.GetDocument(); if ( !pDoc->GetAutoCalc() ) @@ -528,18 +528,18 @@ void ScTabView::InterpretVisible() SCTAB nTab = aViewData.GetTabNo(); for (USHORT i=0; i<4; i++) { - // rely on gridwin pointers to find used panes - // no IsVisible test in case the whole view is not yet shown + // rely on gridwin pointers to find used panes + // no IsVisible test in case the whole view is not yet shown if (pGridWin[i]) { ScHSplitPos eHWhich = WhichH( ScSplitPos(i) ); ScVSplitPos eVWhich = WhichV( ScSplitPos(i) ); - SCCOL nX1 = aViewData.GetPosX( eHWhich ); - SCROW nY1 = aViewData.GetPosY( eVWhich ); - SCCOL nX2 = nX1 + aViewData.VisibleCellsX( eHWhich ); - SCROW nY2 = nY1 + aViewData.VisibleCellsY( eVWhich ); + SCCOL nX1 = aViewData.GetPosX( eHWhich ); + SCROW nY1 = aViewData.GetPosY( eVWhich ); + SCCOL nX2 = nX1 + aViewData.VisibleCellsX( eHWhich ); + SCROW nY2 = nY1 + aViewData.VisibleCellsY( eVWhich ); if (nX2 > MAXCOL) nX2 = MAXCOL; if (nY2 > MAXROW) nY2 = MAXROW; diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index c77034366c85..0c83060d1649 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.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 @@ -119,31 +119,31 @@ void __EXPORT ScTabView::Init() explicitly because the parent frame window is already RTL disabled. */ pTabControl->EnableRTL( Application::GetSettings().GetLayoutRTL() ); - InitScrollBar( aHScrollLeft, MAXCOL+1 ); - InitScrollBar( aHScrollRight, MAXCOL+1 ); - InitScrollBar( aVScrollTop, MAXROW+1 ); - InitScrollBar( aVScrollBottom, MAXROW+1 ); + InitScrollBar( aHScrollLeft, MAXCOL+1 ); + InitScrollBar( aHScrollRight, MAXCOL+1 ); + InitScrollBar( aVScrollTop, MAXROW+1 ); + InitScrollBar( aVScrollBottom, MAXROW+1 ); /* #i97900# scrollbars remain in correct RTL mode, needed mirroring etc. is now handled correctly at the respective places. */ - // Hier noch nichts anzeigen (Show), weil noch falsch angeordnet ist - // Show kommt dann aus UpdateShow beim ersten Resize - // pTabControl, pGridWin, aHScrollLeft, aVScrollBottom, - // aCornerButton, aScrollBarBox, pHSplitter, pVSplitter + // Hier noch nichts anzeigen (Show), weil noch falsch angeordnet ist + // Show kommt dann aus UpdateShow beim ersten Resize + // pTabControl, pGridWin, aHScrollLeft, aVScrollBottom, + // aCornerButton, aScrollBarBox, pHSplitter, pVSplitter - // Splitter + // Splitter pHSplitter->SetSplitHdl( LINK( this, ScTabView, SplitHdl ) ); pVSplitter->SetSplitHdl( LINK( this, ScTabView, SplitHdl ) ); - // UpdateShow kommt beim Resize, oder bei Kopie einer bestehenden View aus dem ctor + // UpdateShow kommt beim Resize, oder bei Kopie einer bestehenden View aus dem ctor pDrawActual = NULL; - pDrawOld = NULL; + pDrawOld = NULL; - // DrawView darf nicht im TabView - ctor angelegt werden, - // wenn die ViewShell noch nicht konstruiert ist... - // Das gilt auch fuer ViewOptionsHasChanged() + // DrawView darf nicht im TabView - ctor angelegt werden, + // wenn die ViewShell noch nicht konstruiert ist... + // Das gilt auch fuer ViewOptionsHasChanged() TestHintWindow(); } @@ -152,14 +152,14 @@ __EXPORT ScTabView::~ScTabView() { USHORT i; - // remove selection object + // remove selection object ScModule* pScMod = SC_MOD(); ScSelectionTransferObj* pOld = pScMod->GetSelectionTransfer(); if ( pOld && pOld->GetView() == this ) { pOld->ForgetView(); pScMod->SetSelectionTransfer( NULL ); - TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld + TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld } DELETEZ(pBrushDocument); @@ -171,7 +171,7 @@ __EXPORT ScTabView::~ScTabView() DELETEZ(pDrawOld); DELETEZ(pDrawActual); - aViewData.KillEditView(); // solange GridWin's noch existieren + aViewData.KillEditView(); // solange GridWin's noch existieren DELETEZ(pInputHintWindow); @@ -231,19 +231,19 @@ void ScTabView::MakeDrawView( BYTE nForceDesignMode ) { pGridWin[i]->SetMapMode(pGridWin[i]->GetDrawMapMode()); - pGridWin[i]->Update(); // wegen Invalidate im DrawView ctor (ShowPage), + pGridWin[i]->Update(); // wegen Invalidate im DrawView ctor (ShowPage), // damit gleich gezeichnet werden kann } SfxRequest aSfxRequest(SID_OBJECT_SELECT, 0,aViewData.GetViewShell()->GetPool()); SetDrawFuncPtr(new FuSelection( aViewData.GetViewShell(), GetActiveWin(), pDrawView, pLayer,aSfxRequest)); - // #106334# used when switching back from page preview: restore saved design mode state - // (otherwise, keep the default from the draw view ctor) + // #106334# used when switching back from page preview: restore saved design mode state + // (otherwise, keep the default from the draw view ctor) if ( nForceDesignMode != SC_FORCEMODE_NONE ) pDrawView->SetDesignMode( (BOOL)nForceDesignMode ); - // an der FormShell anmelden + // an der FormShell anmelden FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell(); if (pFormSh) pFormSh->SetView(pDrawView); @@ -272,12 +272,12 @@ void ScTabView::TabChanged() { if (pDrawView) { - DrawDeselectAll(); // beendet auch Text-Edit-Modus + DrawDeselectAll(); // beendet auch Text-Edit-Modus USHORT i; for (i=0; i<4; i++) if (pGridWin[i]) - pDrawView->VCRemoveWin(pGridWin[i]); // fuer alte Page + pDrawView->VCRemoveWin(pGridWin[i]); // fuer alte Page SCTAB nTab = aViewData.GetTabNo(); pDrawView->HideSdrPage(); @@ -286,17 +286,17 @@ void ScTabView::TabChanged() UpdateLayerLocks(); pDrawView->RecalcScale(); - pDrawView->UpdateWorkArea(); // #54782# PageSize ist pro Page unterschiedlich + pDrawView->UpdateWorkArea(); // #54782# PageSize ist pro Page unterschiedlich for (i=0; i<4; i++) if (pGridWin[i]) - pDrawView->VCAddWin(pGridWin[i]); // fuer neue Page + pDrawView->VCAddWin(pGridWin[i]); // fuer neue Page } SfxBindings& rBindings = aViewData.GetBindings(); - // Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren - // (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles... + // Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren + // (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles... rBindings.InvalidateAll(FALSE); if (aViewData.GetViewShell()->HasAccessibilityObjects()) @@ -396,7 +396,7 @@ void ScTabView::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll aViewData.SetZoom( rNewX, rNewY, bAll ); if (pDrawView) pDrawView->RecalcScale(); - ZoomChanged(); // einzeln wegen CLOOKs + ZoomChanged(); // einzeln wegen CLOOKs } void ScTabView::RefreshZoom() @@ -412,7 +412,7 @@ void ScTabView::SetPagebreakMode( BOOL bSet ) aViewData.SetPagebreakMode(bSet); if (pDrawView) pDrawView->RecalcScale(); - ZoomChanged(); // einzeln wegen CLOOKs + ZoomChanged(); // einzeln wegen CLOOKs } void ScTabView::ResetDrawDragMode() @@ -423,7 +423,7 @@ void ScTabView::ResetDrawDragMode() void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChanged ) { - // DrawView erzeugen, wenn Gitter angezeigt werden soll + // DrawView erzeugen, wenn Gitter angezeigt werden soll if ( !pDrawView && aViewData.GetOptions().GetGridOptions().GetGridVisible() ) MakeDrawLayer(); @@ -431,7 +431,7 @@ void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChang pDrawView->UpdateUserViewOptions(); if (bGraphicsChanged) - DrawEnableAnim(TRUE); // DrawEnableAnim checks the options state + DrawEnableAnim(TRUE); // DrawEnableAnim checks the options state // if TabBar is set to visible, make sure its size is not 0 BOOL bGrow = ( aViewData.IsTabMode() && pTabControl->GetSizePixel().Width() <= 0 ); @@ -443,8 +443,8 @@ void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChang if ( bGrow || bShrink ) { Size aSize = pTabControl->GetSizePixel(); - aSize.Width() = SC_TABBAR_DEFWIDTH; // initial size - pTabControl->SetSizePixel(aSize); // DoResize is called later... + aSize.Width() = SC_TABBAR_DEFWIDTH; // initial size + pTabControl->SetSizePixel(aSize); // DoResize is called later... } } @@ -475,7 +475,7 @@ void ScTabView::UpdateIMap( SdrObject* pObj ) void ScTabView::DrawMarkRect( const Rectangle& rRect ) { - //! store rectangle for repaint during drag + //! store rectangle for repaint during drag for (USHORT i=0; i<4; i++) { @@ -483,7 +483,7 @@ void ScTabView::DrawMarkRect( const Rectangle& rRect ) { RasterOp aROp = pGridWin[i]->GetRasterOp(); BOOL bHasLine = pGridWin[i]->IsLineColor(); - Color aLine = pGridWin[i]->GetLineColor(); + Color aLine = pGridWin[i]->GetLineColor(); BOOL bHasFill = pGridWin[i]->IsFillColor(); Color aFill = pGridWin[i]->GetFillColor(); @@ -511,15 +511,15 @@ void ScTabView::DrawEnableAnim(BOOL bSet) USHORT i; if ( pDrawView ) { - // #71040# dont start animations if display of graphics is disabled - // graphics are controlled by VOBJ_TYPE_OLE + // #71040# dont start animations if display of graphics is disabled + // graphics are controlled by VOBJ_TYPE_OLE if ( bSet && aViewData.GetOptions().GetObjMode(VOBJ_TYPE_OLE) == VOBJ_MODE_SHOW ) { if ( !pDrawView->IsAnimationEnabled() ) { pDrawView->SetAnimationEnabled(TRUE); - // Animierte GIFs muessen wieder gestartet werden: + // Animierte GIFs muessen wieder gestartet werden: ScDocument* pDoc = aViewData.GetDocument(); for (i=0; i<4; i++) if ( pGridWin[i] && pGridWin[i]->IsVisible() ) @@ -536,15 +536,15 @@ void ScTabView::DrawEnableAnim(BOOL bSet) //HMHvoid ScTabView::DrawShowMarkHdl(BOOL bShow) //HMH{ //HMHif (!pDrawView) - //HMH return; + //HMH return; //HMHif (bShow) //HMH{ - //HMH if (!pDrawView->IsDisableHdl()) - //HMH pDrawView->ShowMarkHdl(); + //HMH if (!pDrawView->IsDisableHdl()) + //HMH pDrawView->ShowMarkHdl(); //HMH} //HMHelse - //HMH pDrawView->HideMarkHdl(); + //HMH pDrawView->HideMarkHdl(); //HMH} void ScTabView::UpdateDrawTextOutliner() @@ -581,25 +581,25 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect ) Rectangle aRect = pWin->LogicToPixel( rHMMRect ); - long nScrollX=0, nScrollY=0; // Pixel + long nScrollX=0, nScrollY=0; // Pixel - if ( aRect.Right() >= aWinSize.Width() ) // rechts raus + if ( aRect.Right() >= aWinSize.Width() ) // rechts raus { - nScrollX = aRect.Right() - aWinSize.Width() + 1; // rechter Rand sichtbar + nScrollX = aRect.Right() - aWinSize.Width() + 1; // rechter Rand sichtbar if ( aRect.Left() < nScrollX ) - nScrollX = aRect.Left(); // links sichtbar (falls zu gross) + nScrollX = aRect.Left(); // links sichtbar (falls zu gross) } - if ( aRect.Bottom() >= aWinSize.Height() ) // unten raus + if ( aRect.Bottom() >= aWinSize.Height() ) // unten raus { - nScrollY = aRect.Bottom() - aWinSize.Height() + 1; // unterer Rand sichtbar + nScrollY = aRect.Bottom() - aWinSize.Height() + 1; // unterer Rand sichtbar if ( aRect.Top() < nScrollY ) - nScrollY = aRect.Top(); // oben sichtbar (falls zu gross) + nScrollY = aRect.Top(); // oben sichtbar (falls zu gross) } - if ( aRect.Left() < 0 ) // links raus - nScrollX = aRect.Left(); // linker Rand sichtbar - if ( aRect.Top() < 0 ) // oben raus - nScrollY = aRect.Top(); // oberer Rand sichtbar + if ( aRect.Left() < 0 ) // links raus + nScrollX = aRect.Left(); // linker Rand sichtbar + if ( aRect.Top() < 0 ) // oben raus + nScrollY = aRect.Top(); // oberer Rand sichtbar if (nScrollX || nScrollY) { @@ -613,7 +613,7 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect ) SCCOL nPosX = aViewData.GetPosX(WhichH(eWhich)); SCROW nPosY = aViewData.GetPosY(WhichV(eWhich)); - long nLinesX=0, nLinesY=0; // Spalten/Zeilen - um mindestens nScrollX/Y scrollen + long nLinesX=0, nLinesY=0; // Spalten/Zeilen - um mindestens nScrollX/Y scrollen if (nScrollX > 0) while (nScrollX > 0 && nPosX < MAXCOL) @@ -645,7 +645,7 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect ) --nLinesY; } - ScrollLines( nLinesX, nLinesY ); // ausfuehren + ScrollLines( nLinesX, nLinesY ); // ausfuehren } } diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index d5e166d121a7..fdbd07b86cff 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.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,7 +58,7 @@ #define ScTabViewShell #include "scslots.hxx" -#define SearchSettings +#define SearchSettings #include <svx/svxslots.hxx> TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener); diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 81a011516cbd..c9069b543ad5 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.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 @@ SdrView* __EXPORT ScTabViewShell::GetDrawView() const { - return ((ScTabViewShell*)this)->GetScDrawView(); // GetScDrawView ist nicht-const + return ((ScTabViewShell*)this)->GetScDrawView(); // GetScDrawView ist nicht-const } void ScTabViewShell::WindowChanged() @@ -84,12 +84,12 @@ void ScTabViewShell::WindowChanged() if (pDrView) pDrView->SetActualWin(pWin); - FuPoor* pFunc = GetDrawFuncPtr(); + FuPoor* pFunc = GetDrawFuncPtr(); if (pFunc) pFunc->SetWindow(pWin); - // when font from InputContext is used, - // this must be moved to change of cursor position: + // when font from InputContext is used, + // this must be moved to change of cursor position: UpdateInputContext(); } @@ -103,9 +103,9 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) ScTabView* pTabView = GetViewData()->GetView(); SfxBindings& rBindings = GetViewFrame()->GetBindings(); - Window* pWin = pTabView->GetActiveWin(); - ScDrawView* pView = pTabView->GetScDrawView(); - SdrModel* pDoc = pView->GetModel(); + Window* pWin = pTabView->GetActiveWin(); + ScDrawView* pView = pTabView->GetScDrawView(); + SdrModel* pDoc = pView->GetModel(); const SfxItemSet *pArgs = rReq.GetArgs(); USHORT nNewId = rReq.GetSlot(); @@ -118,8 +118,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) } // - // Pseudo-Slots von Draw-Toolbox auswerten - //! wird das ueberhaupt noch gebraucht ????? + // Pseudo-Slots von Draw-Toolbox auswerten + //! wird das ueberhaupt noch gebraucht ????? // if (nNewId == SID_INSERT_DRAW && pArgs) @@ -131,20 +131,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) SvxDrawToolEnum eSel = (SvxDrawToolEnum)((const SvxDrawToolItem*)pItem)->GetValue(); switch (eSel) { - case SVX_SNAP_DRAW_SELECT: nNewId = SID_OBJECT_SELECT; break; - case SVX_SNAP_DRAW_LINE: nNewId = SID_DRAW_LINE; break; - case SVX_SNAP_DRAW_RECT: nNewId = SID_DRAW_RECT; break; - case SVX_SNAP_DRAW_ELLIPSE: nNewId = SID_DRAW_ELLIPSE; break; - case SVX_SNAP_DRAW_POLYGON_NOFILL: nNewId = SID_DRAW_POLYGON_NOFILL; break; - case SVX_SNAP_DRAW_BEZIER_NOFILL: nNewId = SID_DRAW_BEZIER_NOFILL; break; - case SVX_SNAP_DRAW_FREELINE_NOFILL: nNewId = SID_DRAW_FREELINE_NOFILL; break; - case SVX_SNAP_DRAW_ARC: nNewId = SID_DRAW_ARC; break; - case SVX_SNAP_DRAW_PIE: nNewId = SID_DRAW_PIE; break; - case SVX_SNAP_DRAW_CIRCLECUT: nNewId = SID_DRAW_CIRCLECUT; break; - case SVX_SNAP_DRAW_TEXT: nNewId = SID_DRAW_TEXT; break; - case SVX_SNAP_DRAW_TEXT_VERTICAL: nNewId = SID_DRAW_TEXT_VERTICAL; break; - case SVX_SNAP_DRAW_TEXT_MARQUEE: nNewId = SID_DRAW_TEXT_MARQUEE; break; - case SVX_SNAP_DRAW_CAPTION: nNewId = SID_DRAW_CAPTION; break; + case SVX_SNAP_DRAW_SELECT: nNewId = SID_OBJECT_SELECT; break; + case SVX_SNAP_DRAW_LINE: nNewId = SID_DRAW_LINE; break; + case SVX_SNAP_DRAW_RECT: nNewId = SID_DRAW_RECT; break; + case SVX_SNAP_DRAW_ELLIPSE: nNewId = SID_DRAW_ELLIPSE; break; + case SVX_SNAP_DRAW_POLYGON_NOFILL: nNewId = SID_DRAW_POLYGON_NOFILL; break; + case SVX_SNAP_DRAW_BEZIER_NOFILL: nNewId = SID_DRAW_BEZIER_NOFILL; break; + case SVX_SNAP_DRAW_FREELINE_NOFILL: nNewId = SID_DRAW_FREELINE_NOFILL; break; + case SVX_SNAP_DRAW_ARC: nNewId = SID_DRAW_ARC; break; + case SVX_SNAP_DRAW_PIE: nNewId = SID_DRAW_PIE; break; + case SVX_SNAP_DRAW_CIRCLECUT: nNewId = SID_DRAW_CIRCLECUT; break; + case SVX_SNAP_DRAW_TEXT: nNewId = SID_DRAW_TEXT; break; + case SVX_SNAP_DRAW_TEXT_VERTICAL: nNewId = SID_DRAW_TEXT_VERTICAL; break; + case SVX_SNAP_DRAW_TEXT_MARQUEE: nNewId = SID_DRAW_TEXT_MARQUEE; break; + case SVX_SNAP_DRAW_CAPTION: nNewId = SID_DRAW_CAPTION; break; case SVX_SNAP_DRAW_CAPTION_VERTICAL: nNewId = SID_DRAW_CAPTION_VERTICAL; break; } } @@ -176,20 +176,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) } bool bSwitchCustom = ( sStringItemValue.Len() && sDrawCustom.Len() && sStringItemValue != sDrawCustom ); - if (nNewId == SID_INSERT_FRAME) // vom Tbx-Button + if (nNewId == SID_INSERT_FRAME) // vom Tbx-Button nNewId = SID_DRAW_TEXT; - // #97016# CTRL-SID_OBJECT_SELECT is used to select the first object, - // but not if SID_OBJECT_SELECT is the result of clicking a create function again, - // so this must be tested before changing nNewId below. + // #97016# CTRL-SID_OBJECT_SELECT is used to select the first object, + // but not if SID_OBJECT_SELECT is the result of clicking a create function again, + // so this must be tested before changing nNewId below. BOOL bSelectFirst = ( nNewId == SID_OBJECT_SELECT && (rReq.GetModifier() & KEY_MOD1) ); BOOL bEx = IsDrawSelMode(); if ( rReq.GetModifier() & KEY_MOD1 ) { - // #97016# always allow keyboard selection also on background layer - // #98185# also allow creation of default objects if the same object type - // was already active + // #97016# always allow keyboard selection also on background layer + // #98185# also allow creation of default objects if the same object type + // was already active bEx = TRUE; } else if ( nNewId == nDrawSfxId && ( nNewId != SID_FM_CREATE_CONTROL || @@ -198,14 +198,14 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) // #i52871# if a different custom shape is selected, the slot id can be the same, // so the custom shape type string has to be compared, too. - // SID_FM_CREATE_CONTROL mit nNewFormId==0 (ohne Parameter) kommt beim Deaktivieren - // aus FuConstruct::SimpleMouseButtonUp - // #59280# Execute fuer die Form-Shell, um im Controller zu deselektieren + // SID_FM_CREATE_CONTROL mit nNewFormId==0 (ohne Parameter) kommt beim Deaktivieren + // aus FuConstruct::SimpleMouseButtonUp + // #59280# Execute fuer die Form-Shell, um im Controller zu deselektieren if ( nNewId == SID_FM_CREATE_CONTROL ) { GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE); GetViewFrame()->GetBindings().InvalidateAll(FALSE); - //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? + //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? } bEx = !bEx; @@ -216,10 +216,10 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( nDrawSfxId == SID_FM_CREATE_CONTROL && nNewId != nDrawSfxId ) { - // Wechsel von Control- zu Zeichenfunktion -> im Control-Controller deselektieren + // Wechsel von Control- zu Zeichenfunktion -> im Control-Controller deselektieren GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE); GetViewFrame()->GetBindings().InvalidateAll(FALSE); - //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? + //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? } SetDrawSelMode(bEx); @@ -228,7 +228,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( bSelectFirst ) { - // #97016# select first draw object if none is selected yet + // #97016# select first draw object if none is selected yet if(!pView->AreObjectsMarked()) { // select first object @@ -244,7 +244,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) nDrawSfxId = nNewId; sDrawCustom.Erase(); // value is set below for custom shapes - if ( nNewId != SID_DRAW_CHART ) // Chart nicht mit DrawShell + if ( nNewId != SID_DRAW_CHART ) // Chart nicht mit DrawShell { if ( nNewId == SID_DRAW_TEXT || nNewId == SID_DRAW_TEXT_VERTICAL || nNewId == SID_DRAW_TEXT_MARQUEE || nNewId == SID_DRAW_NOTEEDIT ) @@ -361,7 +361,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) // #98185# Create default drawing objects via keyboard // with qualifier construct directly - FuPoor* pFuActual = GetDrawFuncPtr(); + FuPoor* pFuActual = GetDrawFuncPtr(); if(pFuActual && (rReq.GetModifier() & KEY_MOD1)) { @@ -395,9 +395,9 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( nNewId == SID_DRAW_CAPTION || nNewId == SID_DRAW_CAPTION_VERTICAL ) { - // #105815# use KeyInput to start edit mode (FuText is created). - // For FuText objects, edit mode is handled within CreateDefaultObject. - // KEY_F2 is handled in FuDraw::KeyInput. + // #105815# use KeyInput to start edit mode (FuText is created). + // For FuText objects, edit mode is handled within CreateDefaultObject. + // KEY_F2 is handled in FuDraw::KeyInput. pFuActual->KeyInput( KeyEvent( 0, KeyCode( KEY_F2 ) ) ); } @@ -409,8 +409,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) void ScTabViewShell::GetDrawState(SfxItemSet &rSet) { - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); while ( nWhich ) { @@ -418,7 +418,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) { case SID_INSERT_DRAW: { - // SID_OBJECT_SELECT nur, wenn "harter" Selektionsmodus + // SID_OBJECT_SELECT nur, wenn "harter" Selektionsmodus USHORT nPutId = nDrawSfxId; if ( nPutId == SID_OBJECT_SELECT && !IsDrawSelMode() ) nPutId = USHRT_MAX; @@ -457,7 +457,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) } break; - case SID_OBJECT_SELECT: // wichtig fuer den ollen Control-Controller + case SID_OBJECT_SELECT: // wichtig fuer den ollen Control-Controller rSet.Put( SfxBoolItem( nWhich, nDrawSfxId == SID_OBJECT_SELECT && IsDrawSelMode() ) ); break; } diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 7eb78c81d003..d12aa430fbfa 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.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 @@ -119,14 +119,14 @@ USHORT lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocumen void ScTabViewShell::Execute( SfxRequest& rReq ) { - SfxViewFrame* pThisFrame = GetViewFrame(); - SfxBindings& rBindings = pThisFrame->GetBindings(); - ScModule* pScMod = SC_MOD(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + SfxViewFrame* pThisFrame = GetViewFrame(); + SfxBindings& rBindings = pThisFrame->GetBindings(); + ScModule* pScMod = SC_MOD(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); - if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp - HideListBox(); // Autofilter-DropDown-Listbox + if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp + HideListBox(); // Autofilter-DropDown-Listbox switch ( nSlot ) { @@ -146,7 +146,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) else aInsertPos = GetInsertPos(); - // als Link? + // als Link? BOOL bAsLink = FALSE; if ( pReqArgs->GetItemState(FN_PARAM_2,TRUE,&pItem) == SFX_ITEM_SET ) @@ -161,7 +161,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_EDIT_PRINTAREA: { - USHORT nId = ScPrintAreasDlgWrapper::GetChildWindowId(); + USHORT nId = ScPrintAreasDlgWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE ); @@ -170,7 +170,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_CHANGE_PRINTAREA: { - if ( pReqArgs ) // OK aus Dialog + if ( pReqArgs ) // OK aus Dialog { String aPrintStr; String aRowStr; @@ -194,7 +194,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) break; case SID_ADD_PRINTAREA: - case SID_DEFINE_PRINTAREA: // Menue oder Basic + case SID_DEFINE_PRINTAREA: // Menue oder Basic { BOOL bAdd = ( nSlot == SID_ADD_PRINTAREA ); if ( pReqArgs ) @@ -232,7 +232,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) break; case FID_RESET_PRINTZOOM: - SetPrintZoom( 100, 0 ); // 100%, nicht auf Seiten + SetPrintZoom( 100, 0 ); // 100%, nicht auf Seiten rReq.Done(); break; @@ -255,10 +255,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) SID_JUMPTOMARK, TRUE, &pItem ) == SFX_ITEM_SET ) aAddress = ((const SfxStringItem*)pItem)->GetValue(); - // #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1 - // isn't set (for recorded macros, because IsAPI is no longer available). - // ScGridWindow::MouseButtonUp no longer executes the slot for a single - // cell if there is a multi selection. + // #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1 + // isn't set (for recorded macros, because IsAPI is no longer available). + // ScGridWindow::MouseButtonUp no longer executes the slot for a single + // cell if there is a multi selection. BOOL bUnmark = ( nSlot == SID_CURRENTCELL ); if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET ) bUnmark = ((const SfxBoolItem*)pItem)->GetValue(); @@ -269,7 +269,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if ( nSlot == SID_JUMPTOMARK ) { - // #106586# URL has to be decoded for escaped characters (%20) + // #106586# URL has to be decoded for escaped characters (%20) aAddress = INetURLObject::decode( aAddress, INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 ); @@ -277,13 +277,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) BOOL bFound = FALSE; ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - ScMarkData& rMark = pViewData->GetMarkData(); - ScRange aScRange; - ScAddress aScAddress; + ScDocument* pDoc = pViewData->GetDocument(); + ScMarkData& rMark = pViewData->GetMarkData(); + ScRange aScRange; + ScAddress aScAddress; USHORT nResult = lcl_ParseRange(aScRange, aAddress, pDoc, nSlot); - SCTAB nTab = pViewData->GetTabNo(); - BOOL bMark = TRUE; + SCTAB nTab = pViewData->GetTabNo(); + BOOL bMark = TRUE; // Is this a range ? if( nResult & SCA_VALID ) @@ -317,9 +317,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // Ist es benahmster Bereich (erst Namen dann DBBereiche) ? else { - ScRangeUtil aRangeUtil; + ScRangeUtil aRangeUtil; formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) || + if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) || aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_DBASE, eConv ) ) { nResult |= SCA_VALID; @@ -334,13 +334,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) sal_Int32 nNumeric = aAddress.ToInt32(); if ( nNumeric > 0 && nNumeric <= MAXROW+1 ) { - // 1-basierte Zeilennummer + // 1-basierte Zeilennummer aScAddress.SetRow( (SCROW)(nNumeric - 1) ); aScAddress.SetCol( pViewData->GetCurX() ); aScAddress.SetTab( nTab ); aScRange = ScRange( aScAddress, aScAddress ); - bMark = FALSE; + bMark = FALSE; nResult = SCA_VALID; } } @@ -359,7 +359,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // markieren if( bMark ) { - if (rMark.IsMarked()) // ist derselbe Bereich schon markiert? + if (rMark.IsMarked()) // ist derselbe Bereich schon markiert? { ScRange aOldMark; rMark.GetMarkArea( aOldMark ); @@ -372,11 +372,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) bNothing = FALSE; if (!bNothing) - MarkRange( aScRange, FALSE ); // Cursor kommt hinterher... + MarkRange( aScRange, FALSE ); // Cursor kommt hinterher... } else { - // remove old selection, unless bUnmark argument is FALSE (from navigator) + // remove old selection, unless bUnmark argument is FALSE (from navigator) if( bUnmark ) { MoveCursorAbs( nCol, nRow, @@ -389,14 +389,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // zusammengefasste Zellen beruecksichtigen: pDoc->SkipOverlapped(nCol, nRow, nTab); - // Navigator-Aufrufe sind nicht API!!! + // Navigator-Aufrufe sind nicht API!!! if( bNothing ) { if (rReq.IsAPI()) - rReq.Ignore(); // wenn Makro, dann gar nix + rReq.Ignore(); // wenn Makro, dann gar nix else - rReq.Done(); // sonst wenigstens aufzeichnen + rReq.Done(); // sonst wenigstens aufzeichnen } else { @@ -419,9 +419,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) ); } - if (!bFound) // kein gueltiger Bereich + if (!bFound) // kein gueltiger Bereich { - // wenn es ein Tabellenname ist, umschalten (fuer Navigator/URL's) + // wenn es ein Tabellenname ist, umschalten (fuer Navigator/URL's) SCTAB nNameTab; if ( pDoc->GetTable( aAddress, nNameTab ) ) @@ -434,7 +434,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if ( !bFound && nSlot == SID_JUMPTOMARK ) { - // Grafik-Objekte probieren (nur bei URL's) + // Grafik-Objekte probieren (nur bei URL's) bFound = SelectObject( aAddress ); } @@ -455,7 +455,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_CURRENTTAB: if ( pReqArgs ) { - // Tabelle fuer Basic ist 1-basiert + // Tabelle fuer Basic ist 1-basiert SCTAB nTab = ((const SfxUInt16Item&)pReqArgs->Get(nSlot)).GetValue() - 1; ScDocument* pDoc = GetViewData()->GetDocument(); if ( nTab < pDoc->GetTableCount() ) @@ -466,7 +466,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if( ! rReq.IsAPI() ) rReq.Done(); } - //! sonst Fehler ? + //! sonst Fehler ? } break; @@ -476,9 +476,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) String aStrDocName( ((const SfxStringItem&)pReqArgs-> Get(nSlot)).GetValue() ); - SfxViewFrame* pViewFrame = NULL; - ScDocShell* pDocSh = (ScDocShell*)SfxObjectShell::GetFirst(); - BOOL bFound = FALSE; + SfxViewFrame* pViewFrame = NULL; + ScDocShell* pDocSh = (ScDocShell*)SfxObjectShell::GetFirst(); + BOOL bFound = FALSE; // zu aktivierenden ViewFrame suchen @@ -507,16 +507,16 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { if ( !pThisFrame->GetFrame().IsInPlace() ) // nicht bei OLE { - // print preview is now always in the same frame as the tab view - // -> always switch this frame back to normal view - // (ScPreviewShell ctor reads view data) + // print preview is now always in the same frame as the tab view + // -> always switch this frame back to normal view + // (ScPreviewShell ctor reads view data) // #102785#; finish input pScMod->InputEnterHandler(); pThisFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_ASYNCHRON ); } - // else Fehler (z.B. Ole) + // else Fehler (z.B. Ole) } break; @@ -525,8 +525,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - // SID_TABLE_ACTIVATE und SID_MARKAREA werden von Basic aus an der versteckten - // View aufgerufen, um auf der sichtbaren View zu markieren/umzuschalten: + // SID_TABLE_ACTIVATE und SID_MARKAREA werden von Basic aus an der versteckten + // View aufgerufen, um auf der sichtbaren View zu markieren/umzuschalten: case SID_TABLE_ACTIVATE: DBG_ERROR("old slot SID_TABLE_ACTIVATE"); @@ -635,7 +635,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_TOGGLEINPUTLINE: { - USHORT nId = ScInputWindowWrapper::GetChildWindowId(); + USHORT nId = ScInputWindowWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); BOOL bSet = ( pWnd == NULL ); const SfxPoolItem* pItem; @@ -653,9 +653,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_SCALE: { BOOL bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom(); - SvxZoomType eOldZoomType = GetZoomType(); - SvxZoomType eNewZoomType = eOldZoomType; - const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt + SvxZoomType eOldZoomType = GetZoomType(); + SvxZoomType eNewZoomType = eOldZoomType; + const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt USHORT nOldZoom = (USHORT)(( rOldY.GetNumerator() * 100 ) / rOldY.GetDenominator()); USHORT nZoom = nOldZoom; @@ -667,15 +667,15 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pReqArgs->Get(SID_ATTR_ZOOM); eNewZoomType = rZoomItem.GetType(); - nZoom = rZoomItem.GetValue(); + nZoom = rZoomItem.GetValue(); } else { - SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); - SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM ); + SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); + SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM ); AbstractSvxZoomDialog* pDlg = NULL; - ScMarkData& rMark = GetViewData()->GetMarkData(); - USHORT nBtnFlags = SVX_ZOOM_ENABLE_50 + ScMarkData& rMark = GetViewData()->GetMarkData(); + USHORT nBtnFlags = SVX_ZOOM_ENABLE_50 | SVX_ZOOM_ENABLE_75 | SVX_ZOOM_ENABLE_100 | SVX_ZOOM_ENABLE_150 @@ -700,12 +700,12 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if ( !bCancel ) { - const SvxZoomItem& rZoomItem = (const SvxZoomItem&) + const SvxZoomItem& rZoomItem = (const SvxZoomItem&) pDlg->GetOutputItemSet()-> Get( SID_ATTR_ZOOM ); eNewZoomType = rZoomItem.GetType(); - nZoom = rZoomItem.GetValue(); + nZoom = rZoomItem.GetValue(); } delete pDlg; @@ -715,8 +715,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { if ( eNewZoomType == SVX_ZOOM_PERCENT ) { - if ( nZoom < MINZOOM ) nZoom = MINZOOM; - if ( nZoom > MAXZOOM ) nZoom = MAXZOOM; + if ( nZoom < MINZOOM ) nZoom = MINZOOM; + if ( nZoom > MAXZOOM ) nZoom = MAXZOOM; } else { @@ -899,11 +899,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { ScSplitMode eHSplit = GetViewData()->GetHSplitMode(); ScSplitMode eVSplit = GetViewData()->GetVSplitMode(); - if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL ) // aufheben + if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL ) // aufheben RemoveSplit(); - else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // normal + else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // normal FreezeSplitters( FALSE ); - else // erzeugen + else // erzeugen SplitAtCursor(); rReq.Done(); @@ -915,21 +915,21 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { ScSplitMode eHSplit = GetViewData()->GetHSplitMode(); ScSplitMode eVSplit = GetViewData()->GetVSplitMode(); - if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben + if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben RemoveSplit(); else - FreezeSplitters( TRUE ); // erzeugen oder fixieren + FreezeSplitters( TRUE ); // erzeugen oder fixieren rReq.Done(); InvalidateSplit(); } break; - // ---------------------------------------------------------------- + // ---------------------------------------------------------------- case FID_CHG_SHOW: { - USHORT nId = ScHighlightChgDlgWrapper::GetChildWindowId(); + USHORT nId = ScHighlightChgDlgWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE ); @@ -943,7 +943,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.Done (); /* - USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId(); + USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE ); @@ -957,7 +957,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScAddress aCursorPos( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() ); ScDocShell* pDocSh = pData->GetDocShell(); - ScChangeAction* pAction = pDocSh->GetChangeAction( aCursorPos ); + ScChangeAction* pAction = pDocSh->GetChangeAction( aCursorPos ); if ( pAction ) { const SfxPoolItem* pItem; @@ -979,8 +979,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) break; case SID_CREATE_SW_DRAWVIEW: - // wird von den Forms gerufen, wenn die DrawView mit allem Zubehoer - // angelegt werden muss + // wird von den Forms gerufen, wenn die DrawView mit allem Zubehoer + // angelegt werden muss if (!GetScDrawView()) { GetViewData()->GetDocShell()->MakeDrawLayer(); @@ -990,8 +990,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_PROTECT_DOC: { - ScDocument* pDoc = GetViewData()->GetDocument(); - SfxPasswordDialog* pDlg; + ScDocument* pDoc = GetViewData()->GetDocument(); + SfxPasswordDialog* pDlg; if( pReqArgs ) { @@ -1007,14 +1007,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScDocProtection* pProtect = pDoc->GetDocProtection(); if (pProtect && pProtect->isProtected()) { - BOOL bCancel = FALSE; - String aPassword; + BOOL bCancel = FALSE; + String aPassword; if (pProtect->isProtectedWithPass()) { - String aText( ScResId(SCSTR_PASSWORD) ); + String aText( ScResId(SCSTR_PASSWORD) ); - pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); + pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) ); pDlg->SetMinLen( 0 ); pDlg->SetHelpId( FID_PROTECT_DOC ); @@ -1037,7 +1037,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { String aText( ScResId(SCSTR_PASSWORDOPT) ); - pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); + pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_PROTECTDOC) ); pDlg->SetMinLen( 0 ); pDlg->SetHelpId( FID_PROTECT_DOC ); @@ -1062,7 +1062,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_PROTECT_TABLE: { ScDocument* pDoc = GetViewData()->GetDocument(); - SCTAB nTab = GetViewData()->GetTabNo(); + SCTAB nTab = GetViewData()->GetTabNo(); bool bOldProtection = pDoc->IsTabProtected(nTab); #if ENABLE_SHEET_PROTECTION @@ -1136,8 +1136,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } #else auto_ptr<SfxPasswordDialog> pDlg; - String aPassword; - BOOL bCancel = FALSE; + String aPassword; + BOOL bCancel = FALSE; bool bNewProtection = ! bOldProtection; if( pReqArgs ) diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 493f45341ff4..e6d047e81e32 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.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 @@ -75,7 +75,7 @@ #include "inputopt.hxx" #include "inputwin.hxx" #include "scresid.hxx" -#include "dbcolect.hxx" // fuer ReImport +#include "dbcolect.hxx" // fuer ReImport #include "reffact.hxx" #include "viewuno.hxx" #include "dispuno.hxx" @@ -102,7 +102,7 @@ void ActivateOlk( ScViewData* pViewData ); void DeActivateOlk( ScViewData* pViewData ); -extern SfxViewShell* pScActiveViewShell; // global.cxx +extern SfxViewShell* pScActiveViewShell; // global.cxx using namespace com::sun::star; @@ -118,28 +118,28 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) { SfxViewShell::Activate(bMDI); - // hier kein GrabFocus, sonst gibt's Probleme wenn etwas inplace editiert wird! + // hier kein GrabFocus, sonst gibt's Probleme wenn etwas inplace editiert wird! if ( bMDI ) { - // fuer Eingabezeile (ClearCache) + // fuer Eingabezeile (ClearCache) ScModule* pScMod = SC_MOD(); pScMod->ViewShellChanged(); ActivateView( TRUE, bFirstActivate ); ActivateOlk( GetViewData() ); - // #56870# AutoCorrect umsetzen, falls der Writer seins neu angelegt hat + // #56870# AutoCorrect umsetzen, falls der Writer seins neu angelegt hat UpdateDrawTextOutliner(); - // RegisterNewTargetNames gibts nicht mehr + // RegisterNewTargetNames gibts nicht mehr SfxViewFrame* pThisFrame = GetViewFrame(); if ( pInputHandler && pThisFrame->HasChildWindow(FID_INPUTLINE_STATUS) ) { - // eigentlich nur beim Reload (letzte Version) noetig: - // Das InputWindow bleibt stehen, aber die View mitsamt InputHandler wird - // neu angelegt, darum muss der InputHandler am InputWindow gesetzt werden. + // eigentlich nur beim Reload (letzte Version) noetig: + // Das InputWindow bleibt stehen, aber die View mitsamt InputHandler wird + // neu angelegt, darum muss der InputHandler am InputWindow gesetzt werden. SfxChildWindow* pChild = pThisFrame->GetChildWindow(FID_INPUTLINE_STATUS); if (pChild) { @@ -197,7 +197,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) pHdl->SetRefScale( GetViewData()->GetZoomX(), GetViewData()->GetZoomY() ); } - // Aenderungs-Dialog aktualisieren + // Aenderungs-Dialog aktualisieren if ( pThisFrame->HasChildWindow(FID_CHG_ACCEPT) ) { @@ -220,19 +220,19 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) } } - // don't call CheckSelectionTransfer here - activating a view should not change the - // primary selection (may be happening just because the mouse was moved over the window) + // don't call CheckSelectionTransfer here - activating a view should not change the + // primary selection (may be happening just because the mouse was moved over the window) - // Wenn Referenzeingabe-Tip-Hilfe hier wieder angezeigt werden soll (ShowRefTip), - // muss sie beim Verschieben der View angepasst werden (gibt sonst Probleme unter OS/2 - // beim Umschalten zwischen Dokumenten) + // Wenn Referenzeingabe-Tip-Hilfe hier wieder angezeigt werden soll (ShowRefTip), + // muss sie beim Verschieben der View angepasst werden (gibt sonst Probleme unter OS/2 + // beim Umschalten zwischen Dokumenten) } void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI) { HideTip(); - ScDocument* pDoc=GetViewData()->GetDocument(); + ScDocument* pDoc=GetViewData()->GetDocument(); ScChangeTrack* pChanges=pDoc->GetChangeTrack(); @@ -248,8 +248,8 @@ void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI) if( bMDI ) { - // #85421# during shell deactivation, shells must not be switched, or the loop - // through the shell stack (in SfxDispatcher::DoDeactivate_Impl) will not work + // #85421# during shell deactivation, shells must not be switched, or the loop + // through the shell stack (in SfxDispatcher::DoDeactivate_Impl) will not work BOOL bOldDontSwitch = bDontSwitch; bDontSwitch = TRUE; @@ -269,10 +269,10 @@ void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI) } else { - HideNoteMarker(); // Notiz-Anzeige + HideNoteMarker(); // Notiz-Anzeige if ( pHdl ) - pHdl->HideTip(); // Formel-AutoEingabe-Tip abschalten + pHdl->HideTip(); // Formel-AutoEingabe-Tip abschalten } } @@ -323,10 +323,10 @@ Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const { Size aOptSize; - SCTAB nCurTab = GetViewData()->GetTabNo(); - ScDocument* pDoc = GetViewData()->GetDocument(); - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = pStylePool->Find( + SCTAB nCurTab = GetViewData()->GetTabNo(); + ScDocument* pDoc = GetViewData()->GetDocument(); + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nCurTab ), SFX_STYLE_FAMILY_PAGE ); @@ -334,9 +334,9 @@ Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const if ( pStyleSheet ) { - const SfxItemSet& rSet = pStyleSheet->GetItemSet(); - const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE ); - const Size& rPageSize = rItem.GetSize(); + const SfxItemSet& rSet = pStyleSheet->GetItemSet(); + const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE ); + const Size& rPageSize = rItem.GetSize(); aOptSize.Width() = (long) (rPageSize.Width() * GetViewData()->GetPPTX()); aOptSize.Height() = (long) (rPageSize.Height() * GetViewData()->GetPPTY()); @@ -347,8 +347,8 @@ Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const //------------------------------------------------------------------ -// Zoom fuer In-Place berechnen -// aus Verhaeltnis von VisArea und Fenstergroesse des GridWin +// Zoom fuer In-Place berechnen +// aus Verhaeltnis von VisArea und Fenstergroesse des GridWin void ScTabViewShell::UpdateOleZoom() { @@ -408,11 +408,11 @@ void __EXPORT ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &r aNewSize.Height() += aBorder.Top() + aBorder.Bottom(); } - DoResize( rOfs, aNewSize, TRUE ); // rSize = Groesse von gridwin + DoResize( rOfs, aNewSize, TRUE ); // rSize = Groesse von gridwin - UpdateOleZoom(); // Zoom fuer In-Place berechnen + UpdateOleZoom(); // Zoom fuer In-Place berechnen -// GetViewData()->GetDocShell()->UpdateOle( GetViewData() ); +// GetViewData()->GetDocShell()->UpdateOle( GetViewData() ); GetViewData()->GetDocShell()->SetDocumentModified(); } @@ -422,7 +422,7 @@ void __EXPORT ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &r GetBorderSize( aBorder, rSize ); SetBorderPixel( aBorder ); - DoResize( rOfs, rSize ); // Position und Groesse von tabview wie uebergeben + DoResize( rOfs, rSize ); // Position und Groesse von tabview wie uebergeben // ForceMove als Ersatz fuer den Sfx-Move-Mechanismus // (aWinPos muss aktuell gehalten werden, damit ForceMove beim Ole-Deaktivieren klappt) @@ -432,7 +432,7 @@ void __EXPORT ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &r void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) { - // fuer OLE... + // fuer OLE... Fraction aFrac20( 1,5 ); Fraction aFrac400( 4,1 ); @@ -460,7 +460,7 @@ void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fract void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const { - // auf ganze Zellen anpassen (in 1/100 mm) + // auf ganze Zellen anpassen (in 1/100 mm) Size aPixelSize = rRect.GetSize(); Window* pWin = ((ScTabViewShell*)this)->GetActiveWin(); @@ -504,7 +504,7 @@ void __EXPORT ScTabViewShell::Move() void __EXPORT ScTabViewShell::ShowCursor(bool /* bOn */) { -/*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen. +/*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen. Der CursorLockCount am Gridwin muss hier direkt auf 0 gesetzt werden if (bOn) @@ -552,10 +552,10 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) { - SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? + SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? if (bFocus) pNewWin->GrabFocus(); - WindowChanged(); // Drawing-Layer (z.B. #56771#) + WindowChanged(); // Drawing-Layer (z.B. #56771#) } if (GetViewData()->GetHSplitMode() == SC_SPLIT_FIX || @@ -568,7 +568,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper TestHintWindow(); - //! if ViewData has more tables than document, remove tables in ViewData + //! if ViewData has more tables than document, remove tables in ViewData } // DoReadUserData is also called from ctor when switching from print preview @@ -587,10 +587,10 @@ void ScTabViewShell::DoReadUserData( const String& rData ) Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) { - SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? + SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? if (bFocus) pNewWin->GrabFocus(); - WindowChanged(); // Drawing-Layer (z.B. #56771#) + WindowChanged(); // Drawing-Layer (z.B. #56771#) } if (GetViewData()->GetHSplitMode() == SC_SPLIT_FIX || @@ -603,7 +603,7 @@ void ScTabViewShell::DoReadUserData( const String& rData ) TestHintWindow(); - //! if ViewData has more tables than document, remove tables in ViewData + //! if ViewData has more tables than document, remove tables in ViewData } //------------------------------------------------------------------ @@ -671,12 +671,12 @@ void ScTabViewShell::SetDrawShell( BOOL bActive ) if ( !bActive ) { - ResetDrawDragMode(); // Mirror / Rotate aus + ResetDrawDragMode(); // Mirror / Rotate aus if (bWasDraw && (GetViewData()->GetHSplitMode() == SC_SPLIT_FIX || GetViewData()->GetVSplitMode() == SC_SPLIT_FIX)) { - // Aktiven Teil an Cursor anpassen, etc. + // Aktiven Teil an Cursor anpassen, etc. MoveCursorAbs( GetViewData()->GetCurX(), GetViewData()->GetCurY(), SC_FOLLOW_NONE, FALSE, FALSE, TRUE ); } @@ -705,8 +705,8 @@ void ScTabViewShell::SetPivotShell( BOOL bActive ) { bActivePivotSh = bActive; - // #68771# #76198# SetPivotShell is called from CursorPosChanged every time - // -> don't change anything except switching between cell and pivot shell + // #68771# #76198# SetPivotShell is called from CursorPosChanged every time + // -> don't change anything except switching between cell and pivot shell if ( eCurOST == OST_Pivot || eCurOST == OST_Cell ) { @@ -801,10 +801,10 @@ void ScTabViewShell::SetEditShell(EditView* pView, BOOL bActive ) bActiveEditSh = bActive; } -void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) +void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) { - ScViewData* pViewData = GetViewData(); - ScDocShell* pDocSh = pViewData->GetDocShell(); + ScViewData* pViewData = GetViewData(); + ScDocShell* pDocSh = pViewData->GetDocShell(); if(bDontSwitch) return; @@ -835,14 +835,14 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) switch(eOST) { - case OST_Cell: + case OST_Cell: { AddSubShell(*pCellShell); if(bPgBrk) AddSubShell(*pPageBreakShell); bCellBrush = TRUE; } break; - case OST_Editing: + case OST_Editing: { AddSubShell(*pCellShell); if(bPgBrk) AddSubShell(*pPageBreakShell); @@ -853,7 +853,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } } break; - case OST_DrawText: + case OST_DrawText: { if ( !pDrawTextShell ) { @@ -863,7 +863,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) AddSubShell(*pDrawTextShell); } break; - case OST_Drawing: + case OST_Drawing: { if (svx::checkForSelectedCustomShapes( GetScDrawView(), true /* bOnlyExtruded */ )) { @@ -890,7 +890,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_DrawForm: + case OST_DrawForm: { if ( !pDrawFormShell ) { @@ -903,7 +903,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_Chart: + case OST_Chart: { if ( !pChartShell ) { @@ -916,7 +916,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_OleObject: + case OST_OleObject: { if ( !pOleObjectShell ) { @@ -929,7 +929,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_Graphic: + case OST_Graphic: { if ( !pGraphicShell) { @@ -942,7 +942,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_Media: + case OST_Media: { if ( !pMediaShell) { @@ -954,7 +954,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_Pivot: + case OST_Pivot: { AddSubShell(*pCellShell); if(bPgBrk) AddSubShell(*pPageBreakShell); @@ -968,14 +968,14 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) bCellBrush = TRUE; } break; - case OST_Auditing: + case OST_Auditing: { AddSubShell(*pCellShell); if(bPgBrk) AddSubShell(*pPageBreakShell); if ( !pAuditingShell ) { - pDocSh->MakeDrawLayer(); // die Wartezeit lieber jetzt als beim Klick + pDocSh->MakeDrawLayer(); // die Wartezeit lieber jetzt als beim Klick pAuditingShell = new ScAuditingShell( GetViewData() ); pAuditingShell->SetRepeatTarget( &aTarget ); @@ -1024,12 +1024,12 @@ ObjectSelectionType ScTabViewShell::GetCurObjectSelectionType() return eCurOST; } -// GetMySubShell / SetMySubShell: altes Verhalten simulieren, -// dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) +// GetMySubShell / SetMySubShell: altes Verhalten simulieren, +// dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) SfxShell* ScTabViewShell::GetMySubShell() const { - // GetSubShell() war frueher const, und GetSubShell(USHORT) sollte es auch sein... + // GetSubShell() war frueher const, und GetSubShell(USHORT) sollte es auch sein... USHORT nPos = 0; SfxShell* pSub = ((ScTabViewShell*)this)->GetSubShell(nPos); @@ -1037,13 +1037,13 @@ SfxShell* ScTabViewShell::GetMySubShell() const { if ( pSub == pDrawShell || pSub == pDrawTextShell || pSub == pEditShell || pSub == pPivotShell || pSub == pAuditingShell || pSub == pDrawFormShell || - pSub == pCellShell || pSub == pOleObjectShell|| pSub == pChartShell || + pSub == pCellShell || pSub == pOleObjectShell|| pSub == pChartShell || pSub == pGraphicShell || pSub == pMediaShell || pSub == pPageBreakShell) - return pSub; // gefunden + return pSub; // gefunden pSub = ((ScTabViewShell*)this)->GetSubShell(++nPos); } - return NULL; // keine von meinen dabei + return NULL; // keine von meinen dabei } @@ -1090,7 +1090,7 @@ ScTabViewShell* ScTabViewShell::GetActiveViewShell() SfxPrinter* __EXPORT ScTabViewShell::GetPrinter( BOOL bCreate ) { - // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) + // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) return GetViewData()->GetDocShell()->GetPrinter(bCreate); } @@ -1101,16 +1101,16 @@ USHORT __EXPORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDif PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent ) { - ScDocShell* pDocShell = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocShell->GetDocument(); + ScDocShell* pDocShell = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocShell->GetDocument(); - pDoc->SetPrintOptions(); // Optionen aus OFA am Printer setzen + pDoc->SetPrintOptions(); // Optionen aus OFA am Printer setzen SfxPrinter* pPrinter = GetPrinter(); - String aStrRange; + String aStrRange; PrintDialog* pDlg = new PrintDialog( pParent, true ); - SCTAB nTabCount = pDoc->GetTableCount(); - long nDocPageMax = 0; + SCTAB nTabCount = pDoc->GetTableCount(); + long nDocPageMax = 0; pDlg->EnableSheetRange( true, PRINTSHEETS_ALL ); pDlg->EnableSheetRange( true, PRINTSHEETS_SELECTED_SHEETS ); @@ -1143,14 +1143,14 @@ PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent ) } } - pDlg->SetRangeText ( aStrRange ); - pDlg->EnableRange ( PRINTDIALOG_ALL ); - pDlg->EnableRange ( PRINTDIALOG_RANGE ); - pDlg->SetFirstPage ( 1 ); - pDlg->SetMinPage ( 1 ); - pDlg->SetLastPage ( (USHORT)nDocPageMax ); - pDlg->SetMaxPage ( (USHORT)nDocPageMax ); - pDlg->EnableCollate (); + pDlg->SetRangeText ( aStrRange ); + pDlg->EnableRange ( PRINTDIALOG_ALL ); + pDlg->EnableRange ( PRINTDIALOG_RANGE ); + pDlg->SetFirstPage ( 1 ); + pDlg->SetMinPage ( 1 ); + pDlg->SetLastPage ( (USHORT)nDocPageMax ); + pDlg->SetMaxPage ( (USHORT)nDocPageMax ); + pDlg->EnableCollate (); return pDlg; } @@ -1159,7 +1159,7 @@ SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); - ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); + ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); if ( ScTpPrintOptionsCreate ) return (*ScTpPrintOptionsCreate)( pParent, rOptions); return 0; @@ -1176,8 +1176,8 @@ void __EXPORT ScTabViewShell::PreparePrint( PrintDialog* pPrintDialog ) ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ) { - // #72527# if SID_PRINTDOCDIRECT is executed and there's a selection, - // ask if only the selection should be printed + // #72527# if SID_PRINTDOCDIRECT is executed and there's a selection, + // ask if only the selection should be printed const ScMarkData& rMarkData = GetViewData()->GetMarkData(); if ( !pPrintDialog && !bSilent && !bIsAPI && ( rMarkData.IsMarked() || rMarkData.IsMultiMarked() ) ) @@ -1229,7 +1229,7 @@ USHORT __EXPORT ScTabViewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog ) { ScDocShell* pDocShell = GetViewData()->GetDocShell(); - pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen + pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog ); pDocShell->Print( rProgress, pPrintDialog, &GetViewData()->GetMarkData(), @@ -1347,7 +1347,7 @@ void ScTabViewShell::StopSimpleRefDialog() { Window* pWin = pWnd->GetWindow(); if (pWin && pWin->IsSystemWindow()) - ((SystemWindow*)pWin)->Close(); // calls abort handler + ((SystemWindow*)pWin)->Close(); // calls abort handler } } @@ -1364,14 +1364,14 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) KeyCode aCode = rKEvt.GetKeyCode(); BOOL bShift = aCode.IsShift(); BOOL bControl = aCode.IsMod1(); - BOOL bAlt = aCode.IsMod2(); - USHORT nCode = aCode.GetCode(); - BOOL bUsed = FALSE; - BOOL bInPlace = pScMod->IsEditMode(); // Editengine bekommt alles - BOOL bAnyEdit = pScMod->IsInputMode(); // nur Zeichen & Backspace - BOOL bDraw = IsDrawTextEdit(); + BOOL bAlt = aCode.IsMod2(); + USHORT nCode = aCode.GetCode(); + BOOL bUsed = FALSE; + BOOL bInPlace = pScMod->IsEditMode(); // Editengine bekommt alles + BOOL bAnyEdit = pScMod->IsInputMode(); // nur Zeichen & Backspace + BOOL bDraw = IsDrawTextEdit(); - HideNoteMarker(); // Notiz-Anzeige + HideNoteMarker(); // Notiz-Anzeige // don't do extra HideCursor/ShowCursor calls if EnterHandler will switch to a different sheet BOOL bOnRefSheet = ( GetViewData()->GetRefTabNo() == GetViewData()->GetTabNo() ); @@ -1382,11 +1382,11 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ScDocument* pDoc = GetViewData()->GetDocument(); if ( pDoc ) - pDoc->KeyInput( rKEvt ); // TimerDelays etc. + pDoc->KeyInput( rKEvt ); // TimerDelays etc. if( bInPlace ) { - bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe + bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe if( !bUsed ) bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators } @@ -1404,39 +1404,39 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) switch ( nCode ) { case KEY_RETURN: - bIsType = bControl && !bAlt; // Control, Shift-Control-Return + bIsType = bControl && !bAlt; // Control, Shift-Control-Return if ( !bIsType && nModi == 0 ) { - // Will der InputHandler auch ein einfaches Return? + // Will der InputHandler auch ein einfaches Return? ScInputHandler* pHdl = pScMod->GetInputHdl(this); bIsType = pHdl && pHdl->TakesReturn(); } break; case KEY_SPACE: - bIsType = !bControl && !bAlt; // ohne Modifier oder Shift-Space + bIsType = !bControl && !bAlt; // ohne Modifier oder Shift-Space break; case KEY_ESCAPE: case KEY_BACKSPACE: - bIsType = (nModi == 0); // nur ohne Modifier + bIsType = (nModi == 0); // nur ohne Modifier break; default: bIsType = TRUE; } if( bIsType ) - bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe + bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe if( !bUsed ) bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators - if ( !bUsed && !bIsType && nCode != KEY_RETURN ) // Eingabe nochmal hinterher + if ( !bUsed && !bIsType && nCode != KEY_RETURN ) // Eingabe nochmal hinterher bUsed = pScMod->InputKeyEvent( rKEvt ); } else { - // #51889# Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung - // (Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt) + // #51889# Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung + // (Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt) KeyFuncType eFunc = aCode.GetFunction(); if ( eFunc == KEYFUNC_CUT ) { @@ -1452,14 +1452,14 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) if (!bUsed) bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators - // #74696# during inplace editing, some slots are handled by the - // container app and are executed during Window::KeyInput. - // -> don't pass keys to input handler that would be used there - // but should call slots instead. + // #74696# during inplace editing, some slots are handled by the + // container app and are executed during Window::KeyInput. + // -> don't pass keys to input handler that would be used there + // but should call slots instead. BOOL bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KEYFUNC_DONTKNOW ); if( !bUsed && !bDraw && nCode != KEY_RETURN && !bParent ) - bUsed = pScMod->InputKeyEvent( rKEvt, TRUE ); // Eingabe + bUsed = pScMod->InputKeyEvent( rKEvt, TRUE ); // Eingabe } if (!bInPlace && !bUsed && !bDraw) @@ -1471,7 +1471,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) BOOL bNormal = !bControl && !bAlt; if ( !bAnyEdit && bNormal ) { - // je nach Optionen mit Enter in den Edit-Modus schalten + // je nach Optionen mit Enter in den Edit-Modus schalten const ScInputOptions& rOpt = pScMod->GetInputOptions(); if ( rOpt.GetEnterEdit() ) @@ -1481,7 +1481,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) } } - BOOL bEditReturn = bControl && !bShift; // An Edit-Engine weiter + BOOL bEditReturn = bControl && !bShift; // An Edit-Engine weiter if ( !bUsed && !bEditReturn ) { if ( bOnRefSheet ) @@ -1509,9 +1509,9 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) if ( bOnRefSheet ) ShowAllCursors(); - // hier kein UpdateInputHandler, weil bei Referenzeingabe auf ein - // anderes Dokument diese ViewShell nicht die ist, auf der eingegeben - // wird! + // hier kein UpdateInputHandler, weil bei Referenzeingabe auf ein + // anderes Dokument diese ViewShell nicht die ist, auf der eingegeben + // wird! bUsed = TRUE; } @@ -1520,7 +1520,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) } } - // Alt-Cursortasten hart codiert, weil Alt nicht konfigurierbar ist + // Alt-Cursortasten hart codiert, weil Alt nicht konfigurierbar ist if ( !bUsed && bAlt && !bControl ) { @@ -1570,55 +1570,55 @@ BOOL ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent) bool __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) { -// return SfxViewShell::KeyInput( rKeyEvent ); +// return SfxViewShell::KeyInput( rKeyEvent ); return TabKeyInput( rKeyEvent ); } //------------------------------------------------------------------ #define __INIT_ScTabViewShell \ - eCurOST(OST_NONE), \ - nDrawSfxId(0), \ - nCtrlSfxId(USHRT_MAX), \ - nFormSfxId(USHRT_MAX), \ - pDrawShell(NULL), \ - pDrawTextShell(NULL), \ - pEditShell(NULL), \ - pPivotShell(NULL), \ - pAuditingShell(NULL), \ - pDrawFormShell(NULL), \ - pCellShell(NULL), \ - pOleObjectShell(NULL), \ - pChartShell(NULL), \ - pGraphicShell(NULL), \ - pMediaShell(NULL), \ - pPageBreakShell(NULL), \ - pExtrusionBarShell(NULL), \ - pFontworkBarShell(NULL), \ - pFormShell(NULL), \ - pInputHandler(NULL), \ - pCurFrameLine(NULL), \ - aTarget( this ), \ - pDialogDPObject(NULL), \ + eCurOST(OST_NONE), \ + nDrawSfxId(0), \ + nCtrlSfxId(USHRT_MAX), \ + nFormSfxId(USHRT_MAX), \ + pDrawShell(NULL), \ + pDrawTextShell(NULL), \ + pEditShell(NULL), \ + pPivotShell(NULL), \ + pAuditingShell(NULL), \ + pDrawFormShell(NULL), \ + pCellShell(NULL), \ + pOleObjectShell(NULL), \ + pChartShell(NULL), \ + pGraphicShell(NULL), \ + pMediaShell(NULL), \ + pPageBreakShell(NULL), \ + pExtrusionBarShell(NULL), \ + pFontworkBarShell(NULL), \ + pFormShell(NULL), \ + pInputHandler(NULL), \ + pCurFrameLine(NULL), \ + aTarget( this ), \ + pDialogDPObject(NULL), \ pNavSettings(NULL), \ - bActiveDrawSh(FALSE), \ - bActiveDrawTextSh(FALSE), \ - bActivePivotSh(FALSE), \ - bActiveAuditingSh(FALSE), \ - bActiveDrawFormSh(FALSE), \ - bActiveOleObjectSh(FALSE), \ - bActiveChartSh(FALSE), \ - bActiveGraphicSh(FALSE), \ - bActiveMediaSh(FALSE), \ + bActiveDrawSh(FALSE), \ + bActiveDrawTextSh(FALSE), \ + bActivePivotSh(FALSE), \ + bActiveAuditingSh(FALSE), \ + bActiveDrawFormSh(FALSE), \ + bActiveOleObjectSh(FALSE), \ + bActiveChartSh(FALSE), \ + bActiveGraphicSh(FALSE), \ + bActiveMediaSh(FALSE), \ bActiveEditSh(FALSE), \ bFormShellAtTop(FALSE), \ - bDontSwitch(FALSE), \ - bInFormatDialog(FALSE), \ - bPrintSelected(FALSE), \ - bReadOnly(FALSE), \ - pScSbxObject(NULL), \ - /*bChartDlgIsEdit(FALSE),*/ \ - bChartAreaValid(FALSE), \ + bDontSwitch(FALSE), \ + bInFormatDialog(FALSE), \ + bPrintSelected(FALSE), \ + bReadOnly(FALSE), \ + pScSbxObject(NULL), \ + /*bChartDlgIsEdit(FALSE),*/ \ + bChartAreaValid(FALSE), \ nCurRefDlgId(0), \ pAccessibilityBroadcaster(NULL) @@ -1633,14 +1633,14 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) bReadOnly = pDocSh->IsReadOnly(); - SetName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("View")) ); // fuer SBX + SetName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("View")) ); // fuer SBX Color aColBlack( COL_BLACK ); -// SetPool( &pSfxApp->GetPool() ); +// SetPool( &pSfxApp->GetPool() ); SetPool( &SC_MOD()->GetPool() ); SetWindow( GetActiveWin() ); - pCurFrameLine = new SvxBorderLine( &aColBlack, 20, 0, 0 ); - pPivotSource = new ScArea; + pCurFrameLine = new SvxBorderLine( &aColBlack, 20, 0, 0 ); + pPivotSource = new ScArea; StartListening(*GetViewData()->GetDocShell(),TRUE); StartListening(*GetViewFrame(),TRUE); StartListening(*pSfxApp,TRUE); // #i62045# #i62046# application is needed for Calc's own hints @@ -1667,46 +1667,46 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace { - pDocSh->SetInplace( TRUE ); // schon so initialisiert + pDocSh->SetInplace( TRUE ); // schon so initialisiert if (pDoc->IsEmbedded()) - pDoc->ResetEmbedded(); // keine blaue Markierung + pDoc->ResetEmbedded(); // keine blaue Markierung } else if ( bFirstView ) { pDocSh->SetInplace( FALSE ); GetViewData()->RefreshZoom(); // recalculate PPT if (!pDoc->IsEmbedded()) - pDoc->SetEmbedded( aVisArea ); // VisArea markieren + pDoc->SetEmbedded( aVisArea ); // VisArea markieren } } // ViewInputHandler - // #48721# jeder Task hat neuerdings sein eigenes InputWindow, - // darum muesste eigentlich entweder jeder Task seinen InputHandler bekommen, - // oder das InputWindow muesste sich beim App-InputHandler anmelden, wenn der - // Task aktiv wird, oder das InputWindow muesste sich den InputHandler selbst - // anlegen (dann immer ueber das InputWindow suchen, und nur wenn das nicht da - // ist, den InputHandler von der App nehmen). - // Als Sofortloesung bekommt erstmal jede View ihren Inputhandler, das gibt - // nur noch Probleme, wenn zwei Views in einem Task-Fenster sind. + // #48721# jeder Task hat neuerdings sein eigenes InputWindow, + // darum muesste eigentlich entweder jeder Task seinen InputHandler bekommen, + // oder das InputWindow muesste sich beim App-InputHandler anmelden, wenn der + // Task aktiv wird, oder das InputWindow muesste sich den InputHandler selbst + // anlegen (dann immer ueber das InputWindow suchen, und nur wenn das nicht da + // ist, den InputHandler von der App nehmen). + // Als Sofortloesung bekommt erstmal jede View ihren Inputhandler, das gibt + // nur noch Probleme, wenn zwei Views in einem Task-Fenster sind. pInputHandler = new ScInputHandler; // Alte Version: - // if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // OLE oder Plug-In - // pInputHandler = new ScInputHandler; + // if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // OLE oder Plug-In + // pInputHandler = new ScInputHandler; - // FormShell vor MakeDrawView anlegen, damit die DrawView auf jeden Fall - // an der FormShell angemeldet werden kann - // Gepusht wird die FormShell im ersten Activate + // FormShell vor MakeDrawView anlegen, damit die DrawView auf jeden Fall + // an der FormShell angemeldet werden kann + // Gepusht wird die FormShell im ersten Activate pFormShell = new FmFormShell(this); pFormShell->SetControlActivationHandler( LINK( this, ScTabViewShell, FormControlActivated ) ); - // DrawView darf nicht im TabView - ctor angelegt werden, - // wenn die ViewShell noch nicht kostruiert ist... + // DrawView darf nicht im TabView - ctor angelegt werden, + // wenn die ViewShell noch nicht kostruiert ist... if (pDoc->GetDrawLayer()) MakeDrawView( nForceDesignMode ); - ViewOptionsHasChanged(FALSE); // legt auch evtl. DrawView an + ViewOptionsHasChanged(FALSE); // legt auch evtl. DrawView an SfxUndoManager* pMgr = pDocSh->GetUndoManager(); SetUndoManager( pMgr ); @@ -1719,9 +1719,9 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) pFormShell->SetRepeatTarget( &aTarget ); SetHelpId( HID_SCSHELL_TABVWSH ); - if ( bFirstView ) // first view? + if ( bFirstView ) // first view? { - pDoc->SetDocVisible( TRUE ); // used when creating new sheets + pDoc->SetDocVisible( TRUE ); // used when creating new sheets if ( pDocSh->IsEmpty() ) { // set first sheet's RTL flag (following will already be initialized because of SetDocVisible) @@ -1730,7 +1730,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) // append additional sheets (not for OLE object) if ( pDocSh->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) { - SCTAB nInitTabCount = 3; //! konfigurierbar !!! + SCTAB nInitTabCount = 3; //! konfigurierbar !!! // Get the customized initial tab count, we only can set the count by VBA API currently. const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); SCTAB nNewTabCount = rAppOpt.GetTabCountInNewSpreadsheet(); @@ -1747,7 +1747,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) // ReadExtOptions is now in Activate - // Link-Update nicht verschachteln + // Link-Update nicht verschachteln if ( pDocSh->GetCreateMode() != SFX_CREATE_MODE_INTERNAL && pDocSh->IsUpdateEnabled() ) // #105575#; update only in the first creation of the ViewShell { @@ -1776,7 +1776,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) } } - BOOL bReImport = FALSE; // importierte Daten aktualisieren + BOOL bReImport = FALSE; // importierte Daten aktualisieren ScDBCollection* pDBColl = pDoc->GetDBCollection(); if ( pDBColl ) { @@ -1833,13 +1833,13 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabViewShell::ScTabViewShell" ); - const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); + const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); - // if switching back from print preview, - // restore the view settings that were active when creating the preview - // #89897# ReadUserData must not happen from ctor, because the view's edit window - // has to be shown by the sfx. ReadUserData is deferred until the first Activate call. - // #106334# old DesignMode state from form layer must be restored, too + // if switching back from print preview, + // restore the view settings that were active when creating the preview + // #89897# ReadUserData must not happen from ctor, because the view's edit window + // has to be shown by the sfx. ReadUserData is deferred until the first Activate call. + // #106334# old DesignMode state from form layer must be restored, too BYTE nForceDesignMode = SC_FORCEMODE_NONE; if ( pOldSh && pOldSh->ISA( ScPreviewShell ) ) @@ -1852,7 +1852,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, if ( GetViewData()->GetDocShell()->IsPreview() ) { - // preview for template dialog: always show whole page + // preview for template dialog: always show whole page SetZoomType( SVX_ZOOM_WHOLEPAGE, TRUE ); // zoom value is recalculated at next Resize } else @@ -1890,11 +1890,11 @@ __EXPORT ScTabViewShell::~ScTabViewShell() SC_MOD()->ViewShellGone(this); - RemoveSubShell(); // alle + RemoveSubShell(); // alle SetWindow(0); - // #54104# alles auf NULL, falls aus dem TabView-dtor noch darauf zugegriffen wird - //! (soll eigentlich nicht !??!?!) + // #54104# alles auf NULL, falls aus dem TabView-dtor noch darauf zugegriffen wird + //! (soll eigentlich nicht !??!?!) DELETEZ(pFontworkBarShell); DELETEZ(pExtrusionBarShell); @@ -1940,34 +1940,34 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) SCTAB nTab = GetViewData()->GetTabNo(); pDoc->GetName( nTab, rData.aTabName ); - rData.aTitle = pDocShell->GetTitle(); + rData.aTitle = pDocShell->GetTitle(); const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); - rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); if ( rData.aLongDocName.Len() ) rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS ); else rData.aShortDocName = rData.aLongDocName = rData.aTitle; - rData.nPageNo = 1; - rData.nTotalPages = 99; + rData.nPageNo = 1; + rData.nTotalPages = 99; - // eNumType kennt der Dialog selber + // eNumType kennt der Dialog selber } //------------------------------------------------------------------ void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ) { - bChartAreaValid = TRUE; - aChartSource = rSource; - aChartPos = rDest; - nChartDestTab = GetViewData()->GetTabNo(); + bChartAreaValid = TRUE; + aChartSource = rSource; + aChartPos = rDest; + nChartDestTab = GetViewData()->GetTabNo(); } BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const { - rSource = aChartSource; - rDest = aChartPos; - rTab = nChartDestTab; + rSource = aChartSource; + rDest = aChartPos; + rTab = nChartDestTab; return bChartAreaValid; } @@ -2014,7 +2014,7 @@ void ScTabViewShell::GetTbxState( SfxItemSet& rSet ) rSet.Put( SfxUInt16Item( SID_TBXCTL_INSERT, nInsertCtrlState ) ); rSet.Put( SfxUInt16Item( SID_TBXCTL_INSCELLS, nInsCellsCtrlState ) ); - // ohne installiertes Chart darf Chart nicht Default sein... + // ohne installiertes Chart darf Chart nicht Default sein... if ( nInsObjCtrlState == SID_DRAW_CHART && !SvtModuleOptions().IsChart() ) nInsObjCtrlState = SID_INSERT_OBJECT; diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index c6cb9d5cfb37..920a6e3ee18b 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.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 @@ -59,7 +59,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { - if (rHint.ISA(SfxSimpleHint)) // ohne Parameter + if (rHint.ISA(SfxSimpleHint)) // ohne Parameter { ULONG nSlot = ((SfxSimpleHint&)rHint).GetId(); switch ( nSlot ) @@ -77,7 +77,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint { GetSelEngine()->Reset(); GetFunctionSet()->SetAnchorFlag(TRUE); - // AnchorFlag, damit gleich mit Control angehaengt werden kann + // AnchorFlag, damit gleich mit Control angehaengt werden kann } } break; @@ -104,25 +104,25 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint case SC_HINT_DOC_SAVED: { - // beim "Save as" kann ein vorher schreibgeschuetztes Dokument - // bearbeitbar werden, deshalb die Layer-Locks neu (#39884#) - // (Invalidate etc. passiert schon vom Sfx her) - // #42091# bei SID_EDITDOC kommt kein SFX_HINT_TITLECHANGED, darum - // der eigene Hint aus DoSaveCompleted - //! was ist mit SFX_HINT_SAVECOMPLETED ? + // beim "Save as" kann ein vorher schreibgeschuetztes Dokument + // bearbeitbar werden, deshalb die Layer-Locks neu (#39884#) + // (Invalidate etc. passiert schon vom Sfx her) + // #42091# bei SID_EDITDOC kommt kein SFX_HINT_TITLECHANGED, darum + // der eigene Hint aus DoSaveCompleted + //! was ist mit SFX_HINT_SAVECOMPLETED ? UpdateLayerLocks(); - // #54891# Design-Modus bei jedem Speichern anzupassen, waere zuviel - // (beim Speichern unter gleichem Namen soll er unveraendert bleiben) - // Darum nur bei SFX_HINT_MODECHANGED (vom ViewFrame) + // #54891# Design-Modus bei jedem Speichern anzupassen, waere zuviel + // (beim Speichern unter gleichem Namen soll er unveraendert bleiben) + // Darum nur bei SFX_HINT_MODECHANGED (vom ViewFrame) } break; case SFX_HINT_MODECHANGED: - // #54891#/#58510# Da man sich nicht mehr darauf verlassen kann, woher - // dieser Hint kommt, den Design-Modus immer dann umschalten, wenn der - // ReadOnly-Status sich wirklich geaendert hat: + // #54891#/#58510# Da man sich nicht mehr darauf verlassen kann, woher + // dieser Hint kommt, den Design-Modus immer dann umschalten, wenn der + // ReadOnly-Status sich wirklich geaendert hat: if ( GetViewData()->GetSfxDocShell()->IsReadOnly() != bReadOnly ) { @@ -148,14 +148,14 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint break; } } - else if (rHint.ISA(ScPaintHint)) // neu zeichnen + else if (rHint.ISA(ScPaintHint)) // neu zeichnen { ScPaintHint* pHint = (ScPaintHint*) &rHint; USHORT nParts = pHint->GetParts(); SCTAB nTab = GetViewData()->GetTabNo(); if (pHint->GetStartTab() <= nTab && pHint->GetEndTab() >= nTab) { - if (nParts & PAINT_EXTRAS) // zuerst, falls Tabelle weg ist !!! + if (nParts & PAINT_EXTRAS) // zuerst, falls Tabelle weg ist !!! if (PaintExtras()) nParts = PAINT_ALL; @@ -164,7 +164,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint GetViewData()->GetDocShell()->UpdatePendingRowHeights( GetViewData()->GetTabNo() ); if (nParts & PAINT_SIZE) - RepeatResize(); //! InvalidateBorder ??? + RepeatResize(); //! InvalidateBorder ??? if (nParts & PAINT_GRID) PaintArea( pHint->GetStartCol(), pHint->GetStartRow(), pHint->GetEndCol(), pHint->GetEndRow() ); @@ -186,9 +186,9 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint HideNoteMarker(); } } - else if (rHint.ISA(ScEditViewHint)) // Edit-View anlegen + else if (rHint.ISA(ScEditViewHint)) // Edit-View anlegen { - // ScEditViewHint kommt nur an aktiver View an + // ScEditViewHint kommt nur an aktiver View an ScEditViewHint* pHint = (ScEditViewHint*) &rHint; SCTAB nTab = GetViewData()->GetTabNo(); @@ -201,25 +201,25 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint MakeEditView( pHint->GetEngine(), nCol, nRow ); - StopEditShell(); // sollte nicht gesetzt sein + StopEditShell(); // sollte nicht gesetzt sein ScSplitPos eActive = GetViewData()->GetActivePart(); if ( GetViewData()->HasEditView(eActive) ) { - // MakeEditView geht schief, wenn der Cursor ausserhalb des - // Bildschirms steht. GetEditView gibt dann eine nicht aktive - // View zurueck, darum die Abfrage HasEditView. + // MakeEditView geht schief, wenn der Cursor ausserhalb des + // Bildschirms steht. GetEditView gibt dann eine nicht aktive + // View zurueck, darum die Abfrage HasEditView. - EditView* pView = GetViewData()->GetEditView(eActive); // ist nicht 0 + EditView* pView = GetViewData()->GetEditView(eActive); // ist nicht 0 SetEditShell(pView ,TRUE); } } } } - else if (rHint.ISA(ScTablesHint)) // Tabelle eingefuegt / geloescht + else if (rHint.ISA(ScTablesHint)) // Tabelle eingefuegt / geloescht { - // aktuelle Tabelle zuerst holen (kann bei DeleteTab an ViewData geaendert werden) + // aktuelle Tabelle zuerst holen (kann bei DeleteTab an ViewData geaendert werden) SCTAB nActiveTab = GetViewData()->GetTabNo(); const ScTablesHint& rTabHint = (const ScTablesHint&)rHint; @@ -246,43 +246,43 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint DBG_ERROR("unbekannter ScTablesHint"); } - // hier keine Abfrage auf IsActive() mehr, weil die Aktion von Basic ausgehen - // kann und dann auch die aktive View umgeschaltet werden muss. + // hier keine Abfrage auf IsActive() mehr, weil die Aktion von Basic ausgehen + // kann und dann auch die aktive View umgeschaltet werden muss. SCTAB nNewTab = nActiveTab; BOOL bForce = FALSE; switch (nId) { case SC_TAB_INSERTED: - if ( nTab1 <= nNewTab ) // vorher eingefuegt + if ( nTab1 <= nNewTab ) // vorher eingefuegt ++nNewTab; break; case SC_TAB_DELETED: - if ( nTab1 < nNewTab ) // vorher geloescht + if ( nTab1 < nNewTab ) // vorher geloescht --nNewTab; - else if ( nTab1 == nNewTab ) // aktuelle geloescht + else if ( nTab1 == nNewTab ) // aktuelle geloescht bForce = TRUE; break; case SC_TAB_MOVED: - if ( nNewTab == nTab1 ) // verschobene Tabelle + if ( nNewTab == nTab1 ) // verschobene Tabelle nNewTab = nTab2; - else if ( nTab1 < nTab2 ) // nach hinten verschoben + else if ( nTab1 < nTab2 ) // nach hinten verschoben { - if ( nNewTab > nTab1 && nNewTab <= nTab2 ) // nachrueckender Bereich + if ( nNewTab > nTab1 && nNewTab <= nTab2 ) // nachrueckender Bereich --nNewTab; } - else // nach vorne verschoben + else // nach vorne verschoben { - if ( nNewTab >= nTab2 && nNewTab < nTab1 ) // nachrueckender Bereich + if ( nNewTab >= nTab2 && nNewTab < nTab1 ) // nachrueckender Bereich ++nNewTab; } break; case SC_TAB_COPIED: - if ( nNewTab >= nTab2 ) // vorher eingefuegt + if ( nNewTab >= nTab2 ) // vorher eingefuegt ++nNewTab; break; case SC_TAB_HIDDEN: - if ( nTab1 == nNewTab ) // aktuelle ausgeblendet + if ( nTab1 == nNewTab ) // aktuelle ausgeblendet bForce = TRUE; break; } @@ -311,17 +311,17 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint //------------------------------------------------------------------ -void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, - ScViewData* pViewData, +void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, + ScViewData* pViewData, SvxNumberInfoItem** ppItem ) { //------------------------------ // NumberInfo-Item konstruieren: //------------------------------ - ScBaseCell* pCell = NULL; - SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; - double nCellValue = 0; - String aCellString; + ScBaseCell* pCell = NULL; + SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; + double nCellValue = 0; + String aCellString; pDoc->GetCell( pViewData->GetCurX(), pViewData->GetCurY(), @@ -404,7 +404,7 @@ void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, //------------------------------------------------------------------ void ScTabViewShell::UpdateNumberFormatter( - ScDocument* pDoc, + ScDocument* pDoc, const SvxNumberInfoItem& rInfoItem ) { const sal_uInt32 nDelCount = rInfoItem.GetDelCount(); diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index 2f4ca5c72bab..9ab882efbdba 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.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 @@ -64,10 +64,10 @@ void ScTabViewShell::SetDefaultFrameLine( const SvxBorderLine* pLine ) BOOL __EXPORT ScTabViewShell::HasSelection( BOOL bText ) const { BOOL bHas = FALSE; - ScViewData* pData = (ScViewData*)GetViewData(); // const weggecasted + ScViewData* pData = (ScViewData*)GetViewData(); // const weggecasted if ( bText ) { - // Text enthalten: Anzahl2 >= 1 + // Text enthalten: Anzahl2 >= 1 ScDocument* pDoc = pData->GetDocument(); ScMarkData& rMark = pData->GetMarkData(); ScAddress aCursor( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() ); diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 3984465f1f50..e320c5604f99 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.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 @@ -54,20 +54,20 @@ // forwards -> galwrap.cxx (wg. CLOOKs) -USHORT GallerySGA_FORMAT_GRAPHIC(); -Graphic GalleryGetGraphic (); -BOOL GalleryIsLinkage (); -String GalleryGetFullPath (); -String GalleryGetFilterName (); +USHORT GallerySGA_FORMAT_GRAPHIC(); +Graphic GalleryGetGraphic (); +BOOL GalleryIsLinkage (); +String GalleryGetFullPath (); +String GalleryGetFilterName (); // forwards -> imapwrap.cxx (wg. CLOOKs) class SvxIMapDlg; -USHORT ScIMapChildWindowId(); -SvxIMapDlg* ScGetIMapDlg(); -const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg ); -const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ); +USHORT ScIMapChildWindowId(); +SvxIMapDlg* ScGetIMapDlg(); +const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg ); +const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ); //------------------------------------------------------------------ @@ -84,7 +84,7 @@ void ScTabViewShell::ExecChildWin(SfxRequest& rReq) rReq.Ignore(); } break; - + case SID_AVMEDIA_PLAYER: { SfxViewFrame* pThisFrame = GetViewFrame(); @@ -132,10 +132,10 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) MakeDrawLayer(); Graphic aGraphic = GalleryGetGraphic(); - Point aPos = GetInsertPos(); + Point aPos = GetInsertPos(); String aPath, aFilter; - if ( GalleryIsLinkage() ) // als Link einfuegen? + if ( GalleryIsLinkage() ) // als Link einfuegen? { aPath = GalleryGetFullPath(); aFilter = GalleryGetFilterName(); @@ -145,8 +145,8 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) } else if ( nFormats & SGA_FORMAT_SOUND ) { - // #98115# for sounds (linked or not), insert a hyperlink button, - // like in Impress and Writer + // #98115# for sounds (linked or not), insert a hyperlink button, + // like in Impress and Writer GalleryExplorer* pGal = SVX_GALLERY(); if ( pGal ) @@ -191,7 +191,7 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) if ( pThisFrame->HasChildWindow( nId ) ) { - SvxIMapDlg* pDlg = ScGetIMapDlg(); + SvxIMapDlg* pDlg = ScGetIMapDlg(); if ( pDlg ) { SdrView* pDrView = GetSdrView(); @@ -215,13 +215,13 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) if ( pMark ) { - SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); - SvxIMapDlg* pDlg = ScGetIMapDlg(); + SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); + SvxIMapDlg* pDlg = ScGetIMapDlg(); if ( ScIMapDlgGetObj(pDlg) == (void*) pSdrObj ) { - const ImageMap& rImageMap = ScIMapDlgGetMap(pDlg); - ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo( pSdrObj ); + const ImageMap& rImageMap = ScIMapDlgGetMap(pDlg); + ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo( pSdrObj ); if ( !pIMapInfo ) pSdrObj->InsertUserData( new ScIMapInfo( rImageMap ) ); @@ -246,7 +246,7 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet ) { case SID_IMAP: { - // Disabled wird nicht mehr... + // Disabled wird nicht mehr... BOOL bThere = FALSE; SfxViewFrame* pThisFrame = GetViewFrame(); diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index aaa55a4ad596..0cdce33d3213 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.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 @@ -74,8 +74,8 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) String aStr; ScSubTotalFunc eFunc = (ScSubTotalFunc) SC_MOD()->GetAppOptions().GetStatusFunc(); - ScViewData* pViewData = GetViewData(); - ScMarkData& rMark = pViewData->GetMarkData(); + ScViewData* pViewData = GetViewData(); + ScMarkData& rMark = pViewData->GetMarkData(); bool bIgnoreError = (rMark.IsMarked() || rMark.IsMultiMarked()); if (bIgnoreError && (eFunc == SUBTOTAL_FUNC_CNT || eFunc == SUBTOTAL_FUNC_CNT2)) @@ -90,12 +90,12 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) USHORT nGlobStrId = 0; switch (eFunc) { - case SUBTOTAL_FUNC_AVE: nGlobStrId = STR_FUN_TEXT_AVG; break; - case SUBTOTAL_FUNC_CNT: nGlobStrId = STR_FUN_TEXT_COUNT; break; + case SUBTOTAL_FUNC_AVE: nGlobStrId = STR_FUN_TEXT_AVG; break; + case SUBTOTAL_FUNC_CNT: nGlobStrId = STR_FUN_TEXT_COUNT; break; case SUBTOTAL_FUNC_CNT2: nGlobStrId = STR_FUN_TEXT_COUNT2; break; - case SUBTOTAL_FUNC_MAX: nGlobStrId = STR_FUN_TEXT_MAX; break; - case SUBTOTAL_FUNC_MIN: nGlobStrId = STR_FUN_TEXT_MIN; break; - case SUBTOTAL_FUNC_SUM: nGlobStrId = STR_FUN_TEXT_SUM; break; + case SUBTOTAL_FUNC_MAX: nGlobStrId = STR_FUN_TEXT_MAX; break; + case SUBTOTAL_FUNC_MIN: nGlobStrId = STR_FUN_TEXT_MIN; break; + case SUBTOTAL_FUNC_SUM: nGlobStrId = STR_FUN_TEXT_SUM; break; default: { // added to avoid warnings @@ -103,10 +103,10 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) } if (nGlobStrId) { - ScDocument* pDoc = pViewData->GetDocument(); - SCCOL nPosX = pViewData->GetCurX(); - SCROW nPosY = pViewData->GetCurY(); - SCTAB nTab = pViewData->GetTabNo(); + ScDocument* pDoc = pViewData->GetDocument(); + SCCOL nPosX = pViewData->GetCurX(); + SCROW nPosY = pViewData->GetCurY(); + SCTAB nTab = pViewData->GetTabNo(); aStr = ScGlobal::GetRscString(nGlobStrId); aStr += '='; @@ -119,12 +119,12 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) aStr += '0'; else { - // Anzahl im Standardformat, die anderen nach Cursorposition + // Anzahl im Standardformat, die anderen nach Cursorposition SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); sal_uInt32 nNumFmt = 0; if ( eFunc != SUBTOTAL_FUNC_CNT && eFunc != SUBTOTAL_FUNC_CNT2 ) { - // Zahlformat aus Attributen oder Formel + // Zahlformat aus Attributen oder Formel pDoc->GetNumberFormat( nPosX, nPosY, nTab, nNumFmt ); if ( (nNumFmt % SV_COUNTRY_LANGUAGE_OFFSET) == 0 ) { @@ -132,12 +132,12 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) pDoc->GetCell( nPosX, nPosY, nTab, pCell ); if (pCell && pCell->GetCellType() == CELLTYPE_FORMULA) { - + nNumFmt = ((ScFormulaCell*)pCell)->GetStandardFormat(*pFormatter, nNumFmt ); } } } - + String aValStr; Color* pDummy; pFormatter->GetOutputString( nVal, nNumFmt, aValStr, &pDummy ); @@ -154,24 +154,24 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) -// Funktionen, die je nach Selektion disabled sind -// Default: -// SID_DELETE, -// SID_DELETE_CONTENTS, -// FID_DELETE_CELL -// FID_VALIDATION +// Funktionen, die je nach Selektion disabled sind +// Default: +// SID_DELETE, +// SID_DELETE_CONTENTS, +// FID_DELETE_CELL +// FID_VALIDATION void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) { - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); ScDocShell* pDocShell = pViewData->GetDocShell(); - ScMarkData& rMark = pViewData->GetMarkData(); - SCCOL nPosX = pViewData->GetCurX(); - SCROW nPosY = pViewData->GetCurY(); - SCTAB nTab = pViewData->GetTabNo(); - USHORT nMyId = 0; + ScMarkData& rMark = pViewData->GetMarkData(); + SCCOL nPosX = pViewData->GetCurX(); + SCROW nPosY = pViewData->GetCurY(); + SCTAB nTab = pViewData->GetTabNo(); + USHORT nMyId = 0; SfxViewFrame* pThisFrame = GetViewFrame(); BOOL bOle = GetViewFrame()->GetFrame().IsInPlace(); @@ -179,8 +179,8 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nTabSelCount = rMark.GetSelectCount(); - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); while ( nWhich ) { @@ -240,7 +240,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) case SID_SEARCH_OPTIONS: { - USHORT nOptions = 0xffff; // alles erlaubt + USHORT nOptions = 0xffff; // alles erlaubt // wenn ReadOnly, kein Ersetzen: if (GetViewData()->GetDocShell()->IsReadOnly()) nOptions &= ~( SEARCH_OPTIONS_REPLACE | SEARCH_OPTIONS_REPLACE_ALL ); @@ -251,16 +251,16 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) case SID_CURRENTCELL: { ScAddress aScAddress( GetViewData()->GetCurX(), GetViewData()->GetCurY(), 0 ); - String aAddr; + String aAddr; aScAddress.Format( aAddr, SCA_ABS, NULL, pDoc->GetAddressConvention() ); - SfxStringItem aPosItem( SID_CURRENTCELL, aAddr ); + SfxStringItem aPosItem( SID_CURRENTCELL, aAddr ); rSet.Put( aPosItem ); } break; case SID_CURRENTTAB: - // Tabelle fuer Basic ist 1-basiert + // Tabelle fuer Basic ist 1-basiert rSet.Put( SfxUInt16Item( nWhich, static_cast<sal_uInt16>(GetViewData()->GetTabNo()) + 1 ) ); break; @@ -289,7 +289,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) case FID_RESET_PRINTZOOM: { - // disablen, wenn schon Default eingestellt + // disablen, wenn schon Default eingestellt String aStyleName = pDoc->GetPageStyle( nTab ); ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); @@ -458,7 +458,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) break; case SID_FORMATPAGE: - //! bei geschuetzten Tabellen ??? + //! bei geschuetzten Tabellen ??? if ( pDocShell && ( pDocShell->IsReadOnly() || pDocShell->IsDocShared() ) ) rSet.DisableItem( nWhich ); break; @@ -485,15 +485,15 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) //------------------------------------------------------------------ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, USHORT nTabPage ) { - SfxAbstractTabDialog * pDlg = NULL; - ScDocument* pDoc = GetViewData()->GetDocument(); + SfxAbstractTabDialog * pDlg = NULL; + ScDocument* pDoc = GetViewData()->GetDocument(); - SvxBoxItem aLineOuter( ATTR_BORDER ); - SvxBoxInfoItem aLineInner( ATTR_BORDER_INNER ); + SvxBoxItem aLineOuter( ATTR_BORDER ); + SvxBoxInfoItem aLineInner( ATTR_BORDER_INNER ); - SvxNumberInfoItem* pNumberInfoItem = NULL; - const ScPatternAttr* pOldAttrs = GetSelectionPattern(); - SfxItemSet* pOldSet = new SfxItemSet( + SvxNumberInfoItem* pNumberInfoItem = NULL; + const ScPatternAttr* pOldAttrs = GetSelectionPattern(); + SfxItemSet* pOldSet = new SfxItemSet( pOldAttrs->GetItemSet() ); @@ -611,20 +611,20 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd if ( pHdl ) { - String aString; - const EditTextObject* pObject = NULL; - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - CellType eType; - SCCOL nPosX = pViewData->GetCurX(); - SCROW nPosY = pViewData->GetCurY(); - SCTAB nTab = pViewData->GetTabNo(); - SCTAB nStartTab = 0; - SCTAB nEndTab = 0; - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCCOL nEndCol = 0; - SCROW nEndRow = 0; + String aString; + const EditTextObject* pObject = NULL; + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + CellType eType; + SCCOL nPosX = pViewData->GetCurX(); + SCROW nPosY = pViewData->GetCurY(); + SCTAB nTab = pViewData->GetTabNo(); + SCTAB nStartTab = 0; + SCTAB nEndTab = 0; + SCCOL nStartCol = 0; + SCROW nStartRow = 0; + SCCOL nEndCol = 0; + SCROW nEndRow = 0; pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); @@ -634,7 +634,7 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd PutInOrder( nStartTab, nEndTab ); BOOL bHideFormula = FALSE; - BOOL bHideAll = FALSE; + BOOL bHideAll = FALSE; if (pDoc->IsTabProtected(nTab)) { @@ -642,7 +642,7 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd pDoc->GetAttr( nPosX,nPosY,nTab, ATTR_PROTECTION); bHideFormula = pProt->GetHideFormula(); - bHideAll = pProt->GetHideCell(); + bHideAll = pProt->GetHideCell(); } if (!bHideAll) @@ -664,10 +664,10 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd pDoc->GetInputString( nPosX, nPosY, nTab, aString ); if (eType == CELLTYPE_STRING) { - // Bei Bedarf ein ' vorneweg, damit der String nicht ungewollt - // als Zahl interpretiert wird, und um dem Benutzer zu zeigen, - // dass es ein String ist (#35060#). - //! Auch bei Zahlformat "Text"? -> dann beim Editieren wegnehmen + // Bei Bedarf ein ' vorneweg, damit der String nicht ungewollt + // als Zahl interpretiert wird, und um dem Benutzer zu zeigen, + // dass es ein String ist (#35060#). + //! Auch bei Zahlformat "Text"? -> dann beim Editieren wegnehmen SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); sal_uInt32 nNumFmt; @@ -679,21 +679,21 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd } } - ScInputHdlState aState( ScAddress( nPosX, nPosY, nTab ), + ScInputHdlState aState( ScAddress( nPosX, nPosY, nTab ), ScAddress( nStartCol, nStartRow, nTab ), - ScAddress( nEndCol, nEndRow, nTab ), + ScAddress( nEndCol, nEndRow, nTab ), aString, pObject ); - // if using the view's local input handler, this view can always be set - // as current view inside NotifyChange. + // if using the view's local input handler, this view can always be set + // as current view inside NotifyChange. ScTabViewShell* pSourceSh = pInputHandler ? this : NULL; pHdl->NotifyChange( &aState, bForce, pSourceSh, bStopEditing ); } SfxBindings& rBindings = GetViewFrame()->GetBindings(); - rBindings.Invalidate( SID_STATUS_SUM ); // immer zusammen mit Eingabezeile + rBindings.Invalidate( SID_STATUS_SUM ); // immer zusammen mit Eingabezeile rBindings.Invalidate( SID_ATTR_SIZE ); rBindings.Invalidate( SID_TABLE_CELL ); } @@ -708,7 +708,7 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ) void __EXPORT ScTabViewShell::ExecuteSave( SfxRequest& rReq ) { - // nur SID_SAVEDOC / SID_SAVEASDOC + // nur SID_SAVEDOC / SID_SAVEASDOC // Eingabe auf jeden Fall abschliessen, auch wenn eine Formel bearbeitet wird SC_MOD()->InputEnterHandler(); @@ -782,8 +782,8 @@ void ScTabViewShell::ExecuteUndo(SfxRequest& rReq) GetViewFrame()->GetBindings().InvalidateAll(sal_False); } break; -// default: -// GetViewFrame()->ExecuteSlot( rReq ); +// default: +// GetViewFrame()->ExecuteSlot( rReq ); } } diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index f650b0bb68cd..e663fbbeb7bc 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.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,12 +84,12 @@ using namespace com::sun::star; void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj ) { - // wird aus dem Paint gerufen + // wird aus dem Paint gerufen uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef(); Window* pWin = GetActiveWin(); - // #41412# wenn schon connected ist, nicht nochmal SetObjArea/SetSizeScale + // #41412# wenn schon connected ist, nicht nochmal SetObjArea/SetSizeScale SfxInPlaceClient* pClient = FindIPClient( xObj, pWin ); if ( !pClient ) @@ -102,7 +102,7 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj ) Fraction aScaleWidth (aDrawSize.Width(), aOleSize.Width() ); Fraction aScaleHeight(aDrawSize.Height(), aOleSize.Height() ); - aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj + aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj aScaleHeight.ReduceInaccurate(10); pClient->SetSizeScale(aScaleWidth,aScaleHeight); @@ -126,9 +126,9 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) BOOL bErrorShown = FALSE; // linked objects aren't supported -// if ( xIPObj->IsLink() ) -// nErr = xIPObj->DoVerb(nVerb); // gelinkt -> ohne Client etc. -// else +// if ( xIPObj->IsLink() ) +// nErr = xIPObj->DoVerb(nVerb); // gelinkt -> ohne Client etc. +// else { SfxInPlaceClient* pClient = FindIPClient( xObj, pWin ); if ( !pClient ) @@ -145,7 +145,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) if ( pClient->GetAspect() != embed::Aspects::MSOLE_ICON && ( xObj->getStatus( pClient->GetAspect() ) & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE ) ) { - // scale must always be 1 - change VisArea if different from client size + // scale must always be 1 - change VisArea if different from client size if ( aDrawSize != aOleSize ) { @@ -160,11 +160,11 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) } else { - // calculate scale from client and VisArea size + // calculate scale from client and VisArea size Fraction aScaleWidth (aDrawSize.Width(), aOleSize.Width() ); Fraction aScaleHeight(aDrawSize.Height(), aOleSize.Height() ); - aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj + aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj aScaleHeight.ReduceInaccurate(10); pClient->SetSizeScale(aScaleWidth,aScaleHeight); } @@ -213,7 +213,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) if (nErr != ERRCODE_NONE && !bErrorShown) ErrorHandler::HandleError(nErr); - //! SetDocumentName sollte schon im Sfx passieren ??? + //! SetDocumentName sollte schon im Sfx passieren ??? //TODO/LATER: how "SetDocumentName"? //xIPObj->SetDocumentName( GetViewData()->GetDocShell()->GetTitle() ); @@ -224,7 +224,7 @@ ErrCode __EXPORT ScTabViewShell::DoVerb(long nVerb) { SdrView* pView = GetSdrView(); if (!pView) - return ERRCODE_SO_NOTIMPL; // soll nicht sein + return ERRCODE_SO_NOTIMPL; // soll nicht sein SdrOle2Obj* pOle2Obj = NULL; SdrGrafObj* pGrafObj = NULL; @@ -276,7 +276,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) UpdateInputHandler(); } - // Rahmen fuer Chart einfuegen wird abgebrochen: + // Rahmen fuer Chart einfuegen wird abgebrochen: FuPoor* pPoor = GetDrawFuncPtr(); if ( pPoor && pPoor->GetSlotID() == SID_DRAW_CHART ) GetViewData()->GetDispatcher().Execute(SID_DRAW_CHART, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); @@ -284,13 +284,13 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) MakeDrawLayer(); SfxBindings& rBindings = GetViewFrame()->GetBindings(); - ScTabView* pTabView = GetViewData()->GetView(); - Window* pWin = pTabView->GetActiveWin(); - ScDrawView* pView = pTabView->GetScDrawView(); - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); -// SdrModel* pDrModel = pDocSh->MakeDrawLayer(); - SdrModel* pDrModel = pView->GetModel(); + ScTabView* pTabView = GetViewData()->GetView(); + Window* pWin = pTabView->GetActiveWin(); + ScDrawView* pView = pTabView->GetScDrawView(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); +// SdrModel* pDrModel = pDocSh->MakeDrawLayer(); + SdrModel* pDrModel = pView->GetModel(); switch ( nSlot ) { @@ -306,7 +306,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) case SID_INSERT_DIAGRAM: FuInsertChart(this, pWin, pView, pDrModel, rReq); -//? SC_MOD()->SetFunctionDlg( NULL );//XXX +//? SC_MOD()->SetFunctionDlg( NULL );//XXX break; case SID_INSERT_OBJECT: @@ -321,7 +321,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) case SID_OBJECTRESIZE: { - // Der Server moechte die Clientgrosse verandern + // Der Server moechte die Clientgrosse verandern SfxInPlaceClient* pClient = GetIPClient(); @@ -377,7 +377,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) if(pDescriptorItem) { - //! merge with ScViewFunc::PasteDataFormat (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE)? + //! merge with ScViewFunc::PasteDataFormat (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE)? ScDrawView* pDrView = GetScDrawView(); SdrPageView* pPageView = pDrView ? pDrView->GetSdrPageView() : NULL; @@ -471,7 +471,7 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) break; case SID_INSERT_APPLET: - // wenn SOLAR_JAVA nicht definiert ist, immer disablen + // wenn SOLAR_JAVA nicht definiert ist, immer disablen #ifdef SOLAR_JAVA if (bOle || bTabProt) #endif diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 9bd1efdcd521..7d79c148b403 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.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 @@ -74,8 +74,8 @@ void ScTabViewShell::SetCurRefDlgId( USHORT nNew ) { - // CurRefDlgId is stored in ScModule to find if a ref dialog is open, - // and in the view to identify the view that has opened the dialog + // CurRefDlgId is stored in ScModule to find if a ref dialog is open, + // and in the view to identify the view that has opened the dialog nCurRefDlgId = nNew; } @@ -83,18 +83,18 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo, Window* pParent, USHORT nSlotId ) { - // Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit - // z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen (#42341#). + // Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit + // z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen (#42341#). if ( SC_MOD()->GetCurRefDlgId() != nSlotId ) return NULL; if ( nCurRefDlgId != nSlotId ) { - // the dialog has been opened in a different view - // -> lock the dispatcher for this view (modal mode) + // the dialog has been opened in a different view + // -> lock the dispatcher for this view (modal mode) - GetViewData()->GetDispatcher().Lock( TRUE ); // lock is reset when closing dialog + GetViewData()->GetDispatcher().Lock( TRUE ); // lock is reset when closing dialog return NULL; } @@ -129,13 +129,13 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( if ( !pDlgData ) { - ScConsolidateParam aConsParam; + ScConsolidateParam aConsParam; SCCOL nStartCol, nEndCol; SCROW nStartRow, nEndRow; SCTAB nStartTab, nEndTab; GetViewData()->GetSimpleArea( nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); + nEndCol, nEndRow, nEndTab ); PutInOrder( nStartCol, nEndCol ); PutInOrder( nStartRow, nEndRow ); @@ -158,7 +158,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_DEFINE_DBNAME: { - // wenn auf einem bestehenden Bereich aufgerufen, den markieren + // wenn auf einem bestehenden Bereich aufgerufen, den markieren GetDBData( TRUE, SC_DB_OLD ); const ScMarkData& rMark = GetViewData()->GetMarkData(); if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) @@ -170,8 +170,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_SPECIAL_FILTER: { - ScQueryParam aQueryParam; - SfxItemSet aArgSet( GetPool(), + ScQueryParam aQueryParam; + SfxItemSet aArgSet( GetPool(), SCITEM_QUERYDATA, SCITEM_QUERYDATA ); @@ -196,8 +196,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_FILTER: { - ScQueryParam aQueryParam; - SfxItemSet aArgSet( GetPool(), + ScQueryParam aQueryParam; + SfxItemSet aArgSet( GetPool(), SCITEM_QUERYDATA, SCITEM_QUERYDATA ); @@ -218,8 +218,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_OPENDLG_TABOP: { - ScViewData* pViewData = GetViewData(); - ScRefAddress aCurPos ( pViewData->GetCurX(), + ScViewData* pViewData = GetViewData(); + ScRefAddress aCurPos ( pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo(), FALSE, FALSE, FALSE ); @@ -230,7 +230,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_OPENDLG_SOLVE: { - ScViewData* pViewData = GetViewData(); + ScViewData* pViewData = GetViewData(); ScAddress aCurPos( pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo()); @@ -248,7 +248,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_OPENDLG_PIVOTTABLE: { - // all settings must be in pDialogDPObject + // all settings must be in pDialogDPObject if( pDialogDPObject ) { @@ -286,7 +286,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_OPENDLG_FUNCTION: { - // Dialog schaut selber, was in der Zelle steht + // Dialog schaut selber, was in der Zelle steht pResult = new ScFormulaDlg( pB, pCW, pParent, GetViewData(),ScGlobal::GetStarCalcFunctionMgr() ); } @@ -294,7 +294,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case FID_CHG_SHOW: { - // Dialog schaut selber, was in der Zelle steht + // Dialog schaut selber, was in der Zelle steht pResult = new ScHighlightChgDlg( pB, pCW, pParent, GetViewData() ); } @@ -302,7 +302,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case WID_SIMPLE_REF: { - // Dialog schaut selber, was in der Zelle steht + // Dialog schaut selber, was in der Zelle steht ScViewData* pViewData = GetViewData(); pViewData->SetRefTabNo( pViewData->GetTabNo() ); @@ -318,9 +318,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( if (pResult) { - // Die Dialoge gehen immer mit eingeklapptem Zusaetze-Button auf, - // darum muss die Groesse ueber das Initialize gerettet werden - // (oder den Zusaetze-Status mit speichern !!!) + // Die Dialoge gehen immer mit eingeklapptem Zusaetze-Button auf, + // darum muss die Groesse ueber das Initialize gerettet werden + // (oder den Zusaetze-Status mit speichern !!!) Size aSize = pResult->GetSizePixel(); pResult->Initialize( pInfo ); diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 45875808926f..b70237f47265 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.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 @@ -59,13 +59,13 @@ #define IS_AVAILABLE(WhichId,ppItem) \ (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET) -//! Parent-Window fuer Dialoge -//! Problem: OLE Server! +//! Parent-Window fuer Dialoge +//! Problem: OLE Server! Window* ScTabViewShell::GetDialogParent() { - // #95513# if a ref-input dialog is open, use it as parent - // (necessary when a slot is executed from the dialog's OK handler) + // #95513# if a ref-input dialog is open, use it as parent + // (necessary when a slot is executed from the dialog's OK handler) if ( nCurRefDlgId && nCurRefDlgId == SC_MOD()->GetCurRefDlgId() ) { SfxViewFrame* pViewFrm = GetViewFrame(); @@ -92,7 +92,7 @@ Window* ScTabViewShell::GetDialogParent() // return pEnv->GetEditWin(); } - return GetActiveWin(); // for normal views, too + return GetActiveWin(); // for normal views, too } diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 2271751a9e48..554611b4dcae 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.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,15 +92,13 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord ) } else { - // #i111531# with 1M rows it was necessary to limit the range + // #i111531# with 1M rows it was necessary to limit the range // to the actually used data area. SCCOL nCol1, nCol2; SCROW nRow1, nRow2; SCTAB nTab1, nTab2; aRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2); - bool bShrunk; - pDoc->ShrinkToUsedDataArea( bShrunk, nTab1, nCol1, nRow1, nCol2, nRow2, false); - if (bShrunk) + if (pDoc->ShrinkToUsedDataArea( nTab1, nCol1, nRow1, nCol2, nRow2, false)) { aRange.aStart.SetCol( nCol1 ); aRange.aStart.SetRow( nRow1 ); @@ -117,10 +115,10 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord ) aStrSelection.ConvertLineEnd( LINEEND_CR ); - // Tab/CR durch Space ersetzen, wenn fuer Dialog oder per Basic/SelectionTextExt, - // oder wenn es eine einzelne Zeile ist. - // Sonst mehrzeilig mit Tabs beibehalten (z.B. Mail oder Basic/SelectionText). - // Fuer Mail werden die Tabs dann spaeter in (mehrere) Spaces gewandelt. + // Tab/CR durch Space ersetzen, wenn fuer Dialog oder per Basic/SelectionTextExt, + // oder wenn es eine einzelne Zeile ist. + // Sonst mehrzeilig mit Tabs beibehalten (z.B. Mail oder Basic/SelectionText). + // Fuer Mail werden die Tabs dann spaeter in (mehrere) Spaces gewandelt. if ( bInFormatDialog || bWholeWord || aRange.aEnd.Row() == aRange.aStart.Row() ) { @@ -144,22 +142,22 @@ void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const S USHORT nMode ) { SvxLinkInsertMode eMode = (SvxLinkInsertMode) nMode; - BOOL bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text + BOOL bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text if ( bAsText ) { if ( GetViewData()->IsActive() ) { - // if the view is active, always use InsertURLField, which starts EditMode - // and selects the URL, so it can be changed from the URL bar / dialog + // if the view is active, always use InsertURLField, which starts EditMode + // and selects the URL, so it can be changed from the URL bar / dialog InsertURLField( rName, rURL, rTarget ); } else { - // #91216# if the view is not active, InsertURLField doesn't work - // -> use InsertBookmark to directly manipulate cell content - // bTryReplace=TRUE -> if cell contains only one URL, replace it + // #91216# if the view is not active, InsertURLField doesn't work + // -> use InsertBookmark to directly manipulate cell content + // bTryReplace=TRUE -> if cell contains only one URL, replace it SCCOL nPosX = GetViewData()->GetCurX(); SCROW nPosY = GetViewData()->GetCurY(); @@ -182,7 +180,7 @@ void lcl_SelectFieldAfterInsert( EditView& rView ) ESelection aSel = rView.GetSelection(); if ( aSel.nStartPos == aSel.nEndPos && aSel.nStartPos > 0 ) { - // Cursor is behind the inserted field -> extend selection to the left + // Cursor is behind the inserted field -> extend selection to the left --aSel.nStartPos; rView.SetSelection( aSel ); @@ -195,9 +193,9 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co aURLField.SetTargetFrame( rTarget ); SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD ); - ScViewData* pViewData = GetViewData(); - ScModule* pScMod = SC_MOD(); - ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); + ScViewData* pViewData = GetViewData(); + ScModule* pScMod = SC_MOD(); + ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); BOOL bSelectFirst = FALSE; if ( !pScMod->IsEditMode() ) @@ -214,8 +212,8 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co pScMod->SetInputMode( SC_INPUT_TABLE ); } - EditView* pTopView = pHdl->GetTopView(); - EditView* pTableView = pHdl->GetTableView(); + EditView* pTopView = pHdl->GetTopView(); + EditView* pTableView = pHdl->GetTableView(); DBG_ASSERT( pTopView || pTableView, "No EditView" ); if ( bSelectFirst ) @@ -244,9 +242,9 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co void ScTabViewShell::ExecSearch( SfxRequest& rReq ) { - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); - const SfxPoolItem* pItem; + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); + const SfxPoolItem* pItem; switch ( nSlot ) { @@ -269,7 +267,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(SID_SEARCH_ITEM, FALSE, &pItem)) { - // Search-Item merken + // Search-Item merken DBG_ASSERT( pItem->ISA(SvxSearchItem), "falsches Item" ); ScGlobal::SetSearchItem( *(const SvxSearchItem*) pItem ); } @@ -285,11 +283,11 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) { if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, FALSE, &pItem)) { - // SearchItem holen + // SearchItem holen SvxSearchItem aSearchItem = ScGlobal::GetSearchItem(); - // SearchItem fuellen + // SearchItem fuellen aSearchItem.SetSearchString(((SfxStringItem*)pItem)->GetValue()); if(SFX_ITEM_SET == pReqArgs->GetItemState(FN_PARAM_1, FALSE, &pItem)) @@ -304,7 +302,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) else aSearchItem.SetCommand(SVX_SEARCHCMD_FIND_ALL); - // Request ausfuehren (dabei wird das SearchItem gespeichert) + // Request ausfuehren (dabei wird das SearchItem gespeichert) aSearchItem.SetWhich(SID_SEARCH_ITEM); GetViewData()->GetDispatcher().Execute( FID_SEARCH_NOW, @@ -321,7 +319,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) break; case FID_REPEAT_SEARCH: { - // nochmal mit ScGlobal::GetSearchItem() + // nochmal mit ScGlobal::GetSearchItem() SvxSearchItem aSearchItem = ScGlobal::GetSearchItem(); aSearchItem.SetWhich(SID_SEARCH_ITEM); @@ -331,7 +329,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) &aSearchItem, 0L ); } break; -// case FID_SEARCH_COUNT: +// case FID_SEARCH_COUNT: } } diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 3baa549f2932..e38cb88d9491 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.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,15 +69,15 @@ using namespace com::sun::star; void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); - SCTAB nCurrentTab = pViewData->GetTabNo(); - SCTAB nTabCount = pDoc->GetTableCount(); - USHORT nSlot = rReq.GetSlot(); + SCTAB nCurrentTab = pViewData->GetTabNo(); + SCTAB nTabCount = pDoc->GetTableCount(); + USHORT nSlot = rReq.GetSlot(); const SfxItemSet* pReqArgs = rReq.GetArgs(); - HideListBox(); // Autofilter-DropDown-Listbox + HideListBox(); // Autofilter-DropDown-Listbox switch ( nSlot ) { @@ -94,7 +94,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) bVisible = ((const SfxBoolItem*)pItem)->GetValue(); } - if( ! bVisible ) // ausblenden + if( ! bVisible ) // ausblenden { ScMarkData& rMark = pViewData->GetMarkData(); SCTAB nTabSelCount = rMark.GetSelectCount(); @@ -109,7 +109,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if (pDoc->GetTable( aName, nHideTab )) HideTable( nHideTab ); } - else // einblenden + else // einblenden { ShowTable( aName ); } @@ -138,7 +138,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if (!aName.Len()) { - pDoc->GetName( nCurrentTab, aName ); // aktuelle Tabelle + pDoc->GetName( nCurrentTab, aName ); // aktuelle Tabelle rReq.AppendItem( SfxStringItem( FID_TABLE_HIDE, aName ) ); } @@ -206,24 +206,24 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_INS_TABLE: case FID_INS_TABLE_EXT: { - ScMarkData& rMark = pViewData->GetMarkData(); - SCTAB nTabSelCount = rMark.GetSelectCount(); - SCTAB nTabNr = nCurrentTab; + ScMarkData& rMark = pViewData->GetMarkData(); + SCTAB nTabSelCount = rMark.GetSelectCount(); + SCTAB nTabNr = nCurrentTab; if ( !pDoc->IsDocEditable() ) - break; // gesperrt + break; // gesperrt - if ( pReqArgs != NULL ) // von Basic + if ( pReqArgs != NULL ) // von Basic { BOOL bOk = FALSE; - const SfxPoolItem* pTabItem; - const SfxPoolItem* pNameItem; - String aName; + const SfxPoolItem* pTabItem; + const SfxPoolItem* pNameItem; + String aName; if ( IS_AVAILABLE( FN_PARAM_1, &pTabItem ) && IS_AVAILABLE( nSlot, &pNameItem ) ) { - // Tabellennr. von Basic: 1-basiert + // Tabellennr. von Basic: 1-basiert aName = ((const SfxStringItem*)pNameItem)->GetValue(); nTabNr = ((const SfxUInt16Item*)pTabItem)->GetValue() - 1; @@ -233,9 +233,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if (bOk) rReq.Done( *pReqArgs ); - //! sonst Fehler setzen + //! sonst Fehler setzen } - else // Dialog + else // Dialog { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); @@ -267,7 +267,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - SCTAB nTabAfter = nTabNr+1; + SCTAB nTabAfter = nTabNr+1; for(SCTAB j=nCurrentTab+1;j<nTabCount;j++) { @@ -291,7 +291,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if(nCount==1 && pDlg->GetFirstTable()->Len()>0) { rReq.AppendItem( SfxStringItem( FID_INS_TABLE, *pDlg->GetFirstTable() ) ); - rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabNr) + 1 ) ); // 1-based + rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabNr) + 1 ) ); // 1-based rReq.Done(); InsertTable( *pDlg->GetFirstTable(), nTabNr ); @@ -301,7 +301,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - SCTAB nTabAfter = nTabNr+1; + SCTAB nTabAfter = nTabNr+1; SCTAB nSelHigh=0; for(SCTAB i=0;i<nTabCount;i++) @@ -326,7 +326,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if(nCount==1 && pDlg->GetFirstTable()->Len()>0) { rReq.AppendItem( SfxStringItem( FID_INS_TABLE, *pDlg->GetFirstTable() ) ); - rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabAfter) + 1 ) ); // 1-based + rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabAfter) + 1 ) ); // 1-based rReq.Done(); InsertTable( *pDlg->GetFirstTable(), nTabAfter); @@ -348,12 +348,12 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_TAB_RENAME: case FID_TAB_MENU_RENAME: { - // FID_TAB_MENU_RENAME - "umbenennen" im Menu - // FID_TAB_RENAME - "Name"-Property fuer Basic - // Execute ist gleich, aber im GetState wird MENU_RENAME evtl. disabled + // FID_TAB_MENU_RENAME - "umbenennen" im Menu + // FID_TAB_RENAME - "Name"-Property fuer Basic + // Execute ist gleich, aber im GetState wird MENU_RENAME evtl. disabled if ( nSlot == FID_TAB_MENU_RENAME ) - nSlot = FID_TAB_RENAME; // Execute ist gleich + nSlot = FID_TAB_RENAME; // Execute ist gleich SCTAB nTabNr = pViewData->GetTabNo(); ScMarkData& rMark = pViewData->GetMarkData(); @@ -368,9 +368,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if( pReqArgs != NULL ) { - BOOL bDone = FALSE; + BOOL bDone = FALSE; const SfxPoolItem* pItem; - String aName; + String aName; if( IS_AVAILABLE( FN_PARAM_1, &pItem ) ) nTabNr = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -395,11 +395,11 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - USHORT nRet = RET_OK; - BOOL bDone = FALSE; - String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); - String aName; - String aDlgTitle; + USHORT nRet = RET_OK; + BOOL bDone = FALSE; + String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); + String aName; + String aDlgTitle; switch ( nSlot ) { @@ -472,7 +472,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_TAB_MOVE: { if ( pDoc->GetChangeTrack() != NULL ) - break; // bei aktiviertem ChangeTracking kein TabMove + break; // bei aktiviertem ChangeTracking kein TabMove BOOL bDoIt = FALSE; USHORT nDoc = 0; @@ -489,7 +489,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) aDocName = ((const SfxStringItem*)pItem)->GetValue(); if( IS_AVAILABLE( FN_PARAM_1, &pItem ) ) { - // Tabelle ist 1-basiert + // Tabelle ist 1-basiert nTab = ((const SfxUInt16Item*)pItem)->GetValue() - 1; if ( nTab >= nTableCount ) nTab = SC_TAB_APPEND; @@ -499,9 +499,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if( aDocName.Len() ) { - SfxObjectShell* pSh = SfxObjectShell::GetFirst(); - ScDocShell* pScSh = NULL; - USHORT i=0; + SfxObjectShell* pSh = SfxObjectShell::GetFirst(); + ScDocShell* pScSh = NULL; + USHORT i=0; while ( pSh ) { @@ -520,7 +520,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) break; } - i++; // nur die ScDocShell's zaehlen + i++; // nur die ScDocShell's zaehlen } pSh = SfxObjectShell::GetNext( *pSh ); } @@ -531,7 +531,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) bDoIt = TRUE; } - if ( bDoIt && nTab >= nTableCount ) // ggf. anhaengen + if ( bDoIt && nTab >= nTableCount ) // ggf. anhaengen nTab = SC_TAB_APPEND; } else @@ -543,8 +543,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) DBG_ASSERT(pDlg, "Dialog create fail!"); SCTAB nTableCount = pDoc->GetTableCount(); - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTabSelCount = rMark.GetSelectCount(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTabSelCount = rMark.GetSelectCount(); if(nTableCount==nTabSelCount) @@ -574,7 +574,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } } rReq.AppendItem( SfxStringItem( FID_TAB_MOVE, aFoundDocName ) ); - // Tabelle ist 1-basiert, wenn nicht APPEND + // Tabelle ist 1-basiert, wenn nicht APPEND SCTAB nBasicTab = ( nTab <= MAXTAB ) ? (nTab+1) : nTab; rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nBasicTab) ) ); rReq.AppendItem( SfxBoolItem( FN_PARAM_2, bCpy ) ); @@ -584,7 +584,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if( bDoIt ) { - rReq.Done(); // aufzeichnen, solange das Dokument noch aktiv ist + rReq.Done(); // aufzeichnen, solange das Dokument noch aktiv ist MoveTable( nDoc, nTab, bCpy ); } @@ -593,12 +593,12 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_DELETE_TABLE: { - // Parameter war ueberfluessig, weil die Methode an der Table haengt + // Parameter war ueberfluessig, weil die Methode an der Table haengt BOOL bDoIt = rReq.IsAPI(); if( !bDoIt ) { - // wenn's nicht von Basic kommt, nochmal nachfragen: + // wenn's nicht von Basic kommt, nochmal nachfragen: #if ENABLE_LAYOUT // Using layout::QueryBox without client code modification is @@ -614,7 +614,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } if( bDoIt ) { - SCTAB nNewTab = nCurrentTab; + SCTAB nNewTab = nCurrentTab; SCTAB nFirstTab=0; BOOL bTabFlag=FALSE; ScMarkData& rMark = pViewData->GetMarkData(); @@ -648,7 +648,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) const ScMarkData& rMark = pViewData->GetMarkData(); if ( rMark.GetSelectCount() != 0 ) { - // handle several sheets + // handle several sheets SfxUndoManager* pUndoManager = pDocSh->GetUndoManager(); String aUndo = ScGlobal::GetRscString( STR_UNDO_TAB_RTL ); @@ -814,17 +814,17 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) { - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); ScDocShell* pDocShell = pViewData->GetDocShell(); - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTab = pViewData->GetTabNo(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTab = pViewData->GetTabNo(); SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nTabSelCount = rMark.GetSelectCount(); - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); while ( nWhich ) { @@ -893,8 +893,8 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) rSet.DisableItem( nWhich ); break; - // FID_TAB_MENU_RENAME - "umbenennen" im Menu - // FID_TAB_RENAME - "Name"-Property fuer Basic + // FID_TAB_MENU_RENAME - "umbenennen" im Menu + // FID_TAB_RENAME - "Name"-Property fuer Basic case FID_TAB_MENU_RENAME: if ( !pDoc->IsDocEditable() || diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index f7aac8b56da4..c937109baa99 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.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 @@ -60,7 +60,7 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, const String& rTarget, const Point* pInsPos ) { - // Tabelle geschuetzt ? + // Tabelle geschuetzt ? ScViewData* pViewData = GetViewData(); ScDocument* pDoc = pViewData->GetDocument(); @@ -73,10 +73,10 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, MakeDrawLayer(); - ScTabView* pView = pViewData->GetView(); -// SdrView* pDrView = pView->GetSdrView(); + ScTabView* pView = pViewData->GetView(); +// SdrView* pDrView = pView->GetSdrView(); ScDrawView* pDrView = pView->GetScDrawView(); - SdrModel* pModel = pDrView->GetModel(); + SdrModel* pModel = pDrView->GetModel(); SdrObject* pObj = SdrObjFactory::MakeNewObject(FmFormInventor, OBJ_FM_BUTTON, pDrView->GetSdrPageView()->GetPage(), pModel); @@ -127,12 +127,12 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, aPos.X() -= aSize.Width(); pObj->SetLogicRect(Rectangle(aPos, aSize)); -// pObj->Resize(Point(), Fraction(1, 1), Fraction(1, 1)); +// pObj->Resize(Point(), Fraction(1, 1), Fraction(1, 1)); - // am alten VC-Button musste die Position/Groesse nochmal explizit - // gesetzt werden - das scheint mit UnoControls nicht noetig zu sein + // am alten VC-Button musste die Position/Groesse nochmal explizit + // gesetzt werden - das scheint mit UnoControls nicht noetig zu sein - // nicht markieren wenn Ole + // nicht markieren wenn Ole pDrView->InsertObjectSafe( pObj, *pDrView->GetSdrPageView() ); } diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index c462c48abe9c..e536781a841f 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.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 @@ -48,7 +48,7 @@ #include "document.hxx" #include "docsh.hxx" #include "sc.hrc" -#include "drwlayer.hxx" // GetVisibleName +#include "drwlayer.hxx" // GetVisibleName #include "retypepassdlg.hxx" #include "tabprotection.hxx" @@ -60,13 +60,13 @@ using namespace com::sun::star; void ScTabViewShell::ExecuteSbx( SfxRequest& /* rReq */ ) { - // SID_RANGE_OFFSET (Offset), - // SID_PIVOT_CREATE (DataPilotCreate) - removed (old Basic) + // SID_RANGE_OFFSET (Offset), + // SID_PIVOT_CREATE (DataPilotCreate) - removed (old Basic) } void ScTabViewShell::GetSbxState( SfxItemSet& /* rSet */ ) { - // SID_RANGE_REGION (CurrentRegion) - removed (old Basic) + // SID_RANGE_REGION (CurrentRegion) - removed (old Basic) } //------------------------------------------------------------------ @@ -76,7 +76,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) USHORT nSlotId = rReq.GetSlot(); const SfxItemSet* pReqArgs = rReq.GetArgs(); - // Objekte aktivieren/deaktivieren immer auf der sichtbaren View + // Objekte aktivieren/deaktivieren immer auf der sichtbaren View ScTabViewShell* pVisibleSh = this; if ( nSlotId == SID_OLE_SELECT || nSlotId == SID_OLE_ACTIVATE || nSlotId == SID_OLE_DEACTIVATE ) @@ -89,7 +89,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) case SID_OLE_SELECT: case SID_OLE_ACTIVATE: { - // in beiden Faellen erstmal auf der sichtbaren View selektieren + // in beiden Faellen erstmal auf der sichtbaren View selektieren String aName; SdrView* pDrView = GetSdrView(); @@ -101,7 +101,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) } pVisibleSh->SelectObject( aName ); - // aktivieren + // aktivieren if ( nSlotId == SID_OLE_ACTIVATE ) pVisibleSh->DoVerb( 0 ); @@ -124,7 +124,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) if ( nNewVal < 0 ) nNewVal = 0; - //! von irgendwas in 1/100mm umrechnen ?????? + //! von irgendwas in 1/100mm umrechnen ?????? SdrView* pDrView = GetSdrView(); if ( pDrView ) @@ -152,7 +152,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) } } if (!bDone) - SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler + SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler } break; @@ -181,7 +181,7 @@ uno::Reference < embed::XEmbeddedObject > lcl_GetSelectedObj( SdrView* pDrView ) void ScTabViewShell::GetObjectState( SfxItemSet& rSet ) { - // SID_OLE_OBJECT - removed (old Basic) + // SID_OLE_OBJECT - removed (old Basic) SfxWhichIter aIter(rSet); USHORT nWhich = aIter.FirstWhich(); @@ -224,7 +224,7 @@ void ScTabViewShell::GetObjectState( SfxItemSet& rSet ) else // if ( nWhich == SID_OBJECT_HEIGHT ) nVal = aRect.GetHeight(); - //! von 1/100mm in irgendwas umrechnen ?????? + //! von 1/100mm in irgendwas umrechnen ?????? rSet.Put( SfxInt32Item( nWhich, nVal ) ); } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 4ffb4d6db889..a73247266067 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.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 @@ -72,13 +72,13 @@ using namespace com::sun::star; -#define SC_GROWY_SMALL_EXTRA 100 -#define SC_GROWY_BIG_EXTRA 200 +#define SC_GROWY_SMALL_EXTRA 100 +#define SC_GROWY_BIG_EXTRA 200 #define TAG_TABBARWIDTH "tw:" -static BOOL bMoveArea = FALSE; //! Member? -USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! +static BOOL bMoveArea = FALSE; //! Member? +USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! ScViewDataTable::ScViewDataTable() : eZoomType( SVX_ZOOM_PERCENT ), @@ -296,40 +296,40 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV } ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) - : pDocShell ( pDocSh ), - pDoc ( NULL ), - pView ( pViewSh ), - pViewShell ( pViewSh ), - pOptions ( new ScViewOptions ), + : pDocShell ( pDocSh ), + pDoc ( NULL ), + pView ( pViewSh ), + pViewShell ( pViewSh ), + pOptions ( new ScViewOptions ), pSpellingView ( NULL ), - aLogicMode ( MAP_100TH_MM ), + aLogicMode ( MAP_100TH_MM ), eDefZoomType( SVX_ZOOM_PERCENT ), aDefZoomX ( 1,1 ), aDefZoomY ( 1,1 ), aDefPageZoomX( 3,5 ), aDefPageZoomY( 3,5 ), - eRefType ( SC_REFTYPE_NONE ), - nTabNo ( 0 ), - nRefTabNo ( 0 ), + eRefType ( SC_REFTYPE_NONE ), + nTabNo ( 0 ), + nRefTabNo ( 0 ), nPasteFlags ( SC_PASTE_NONE ), eEditActivePart( SC_SPLIT_BOTTOMLEFT ), - bActive ( TRUE ), //! wie initialisieren? - bIsRefMode ( FALSE ), + bActive ( TRUE ), //! wie initialisieren? + bIsRefMode ( FALSE ), bDelMarkValid( FALSE ), - nFillMode ( SC_FILL_NONE ), - bPagebreak ( FALSE ), + nFillMode ( SC_FILL_NONE ), + bPagebreak ( FALSE ), bSelCtrlMouseClick( FALSE ) { - SetGridMode ( TRUE ); - SetSyntaxMode ( FALSE ); - SetHeaderMode ( TRUE ); - SetTabMode ( TRUE ); - SetVScrollMode ( TRUE ); - SetHScrollMode ( TRUE ); - SetOutlineMode ( TRUE ); + SetGridMode ( TRUE ); + SetSyntaxMode ( FALSE ); + SetHeaderMode ( TRUE ); + SetTabMode ( TRUE ); + SetVScrollMode ( TRUE ); + SetHScrollMode ( TRUE ); + SetOutlineMode ( TRUE ); - aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ), + aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ), (long) ( ScGlobal::nStdRowHeight * PIXEL_PER_TWIPS * OLE_STD_CELLS_Y ) ); pTabData[0] = new ScViewDataTable; for ( SCTAB i = 1; i <= MAXTAB; i++ ) @@ -351,7 +351,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) *pOptions = pDoc->GetViewOptions(); } - // keine ausgeblendete Tabelle anzeigen: + // keine ausgeblendete Tabelle anzeigen: if (pDoc && !pDoc->IsVisible(nTabNo)) { while ( !pDoc->IsVisible(nTabNo) && pDoc->HasTable(nTabNo+1) ) @@ -365,37 +365,37 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) } ScViewData::ScViewData( const ScViewData& rViewData ) - : pDocShell ( rViewData.pDocShell ), - pDoc ( rViewData.pDoc ), - pView ( rViewData.pView ), - pViewShell ( rViewData.pViewShell ), - pOptions ( new ScViewOptions( *(rViewData.pOptions) ) ), + : pDocShell ( rViewData.pDocShell ), + pDoc ( rViewData.pDoc ), + pView ( rViewData.pView ), + pViewShell ( rViewData.pViewShell ), + pOptions ( new ScViewOptions( *(rViewData.pOptions) ) ), pSpellingView ( rViewData.pSpellingView ), - aLogicMode ( rViewData.aLogicMode ), + aLogicMode ( rViewData.aLogicMode ), eDefZoomType( rViewData.eDefZoomType ), aDefZoomX ( rViewData.aDefZoomX ), aDefZoomY ( rViewData.aDefZoomY ), aDefPageZoomX( rViewData.aDefPageZoomX ), aDefPageZoomY( rViewData.aDefPageZoomY ), - eRefType ( SC_REFTYPE_NONE ), - nTabNo ( rViewData.nTabNo ), - nRefTabNo ( rViewData.nTabNo ), // kein RefMode + eRefType ( SC_REFTYPE_NONE ), + nTabNo ( rViewData.nTabNo ), + nRefTabNo ( rViewData.nTabNo ), // kein RefMode eEditActivePart( rViewData.eEditActivePart ), - bActive ( TRUE ), //! wie initialisieren? - bIsRefMode ( FALSE ), + bActive ( TRUE ), //! wie initialisieren? + bIsRefMode ( FALSE ), bDelMarkValid( FALSE ), - nFillMode ( SC_FILL_NONE ), - bPagebreak ( rViewData.bPagebreak ), + nFillMode ( SC_FILL_NONE ), + bPagebreak ( rViewData.bPagebreak ), bSelCtrlMouseClick( rViewData.bSelCtrlMouseClick ) { - SetGridMode ( rViewData.IsGridMode() ); - SetSyntaxMode ( rViewData.IsSyntaxMode() ); - SetHeaderMode ( rViewData.IsHeaderMode() ); - SetTabMode ( rViewData.IsTabMode() ); - SetVScrollMode ( rViewData.IsVScrollMode() ); - SetHScrollMode ( rViewData.IsHScrollMode() ); - SetOutlineMode ( rViewData.IsOutlineMode() ); + SetGridMode ( rViewData.IsGridMode() ); + SetSyntaxMode ( rViewData.IsSyntaxMode() ); + SetHeaderMode ( rViewData.IsHeaderMode() ); + SetTabMode ( rViewData.IsTabMode() ); + SetVScrollMode ( rViewData.IsVScrollMode() ); + SetHScrollMode ( rViewData.IsHScrollMode() ); + SetOutlineMode ( rViewData.IsOutlineMode() ); aScrSize = rViewData.aScrSize; for ( SCTAB i = 0; i <= MAXTAB; i++ ) @@ -492,7 +492,7 @@ void ScViewData::DeleteTab( SCTAB nTab ) void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab ) { if (nDestTab==SC_TAB_APPEND) - nDestTab = pDoc->GetTableCount() - 1; // am Doc muss vorher kopiert worden sein + nDestTab = pDoc->GetTableCount() - 1; // am Doc muss vorher kopiert worden sein if (nDestTab > MAXTAB) { @@ -537,20 +537,20 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab ) UpdateThis(); aMarkData.DeleteTab( nSrcTab ); - aMarkData.InsertTab( nInsTab ); // ggf. angepasst + aMarkData.InsertTab( nInsTab ); // ggf. angepasst } void ScViewData::SetViewShell( ScTabViewShell* pViewSh ) { if (pViewSh) { - pViewShell = pViewSh; - pView = pViewSh; + pViewShell = pViewSh; + pView = pViewSh; } else { - pViewShell = NULL; - pView = NULL; + pViewShell = NULL; + pView = NULL; } } void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs ) @@ -574,7 +574,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs ) { if ( pTabData[i] ) pTabData[i]->eZoomType = eNew; - } + } eDefZoomType = eNew; } else @@ -601,7 +601,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll ) if ( aMarkData.GetTableSelect(i) ) vTabs.push_back( i ); } - } + } SetZoomType( eNew, vTabs ); } @@ -690,7 +690,7 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAl if ( aMarkData.GetTableSelect(i) ) vTabs.push_back( i ); } - } + } SetZoom( rNewX, rNewY, vTabs ); } @@ -752,10 +752,10 @@ ScMarkType ScViewData::GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab, SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const { - // parameter bMergeMark is no longer needed: The view's selection is never modified - // (a local copy is used), and a multi selection that adds to a single range can always - // be treated like a single selection (#108266# - GetSimpleArea isn't used in selection - // handling itself) + // parameter bMergeMark is no longer needed: The view's selection is never modified + // (a local copy is used), and a multi selection that adds to a single range can always + // be treated like a single selection (#108266# - GetSimpleArea isn't used in selection + // handling itself) ScRange aRange; ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple @@ -766,7 +766,7 @@ ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& ScMarkType ScViewData::GetSimpleArea( ScRange& rRange ) const { - // parameter bMergeMark is no longer needed, see above + // parameter bMergeMark is no longer needed, see above ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple return GetSimpleArea( rRange, aNewMark); @@ -774,9 +774,9 @@ ScMarkType ScViewData::GetSimpleArea( ScRange& rRange ) const void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const { - // parameter bMergeMark is no longer needed, see GetSimpleArea + // parameter bMergeMark is no longer needed, see GetSimpleArea - ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple + ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple BOOL bMulti = aNewMark.IsMultiMarked(); if (bMulti) @@ -843,8 +843,8 @@ void ScViewData::SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S nFillMode = SC_FILL_FILL; nFillStartX = nStartCol; nFillStartY = nStartRow; - nFillEndX = nEndCol; - nFillEndY = nEndRow; + nFillEndX = nEndCol; + nFillEndY = nEndRow; } void ScViewData::SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, @@ -853,13 +853,13 @@ void ScViewData::SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S nFillMode = nMode; nFillStartX = nStartCol; nFillStartY = nStartRow; - nFillEndX = nEndCol; - nFillEndY = nEndRow; + nFillEndX = nEndCol; + nFillEndY = nEndRow; } void ScViewData::ResetFillMode() { - nFillMode = SC_FILL_NONE; + nFillMode = SC_FILL_NONE; } void ScViewData::GetFillData( SCCOL& rStartCol, SCROW& rStartRow, @@ -918,7 +918,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, BOOL bWasThere = FALSE; if (pEditView[eWhich]) { - // Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert + // Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert if (bEditActive[eWhich]) bWasThere = TRUE; @@ -936,7 +936,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, pEditView[eWhich] = new EditView( pNewEngine, pWin ); } - // bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576) + // bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576) ULONG nEC = pNewEngine->GetControlWord(); pNewEngine->SetControlWord(nEC & ~EE_CNTRL_DOIDLEFORMAT); @@ -953,14 +953,14 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, BOOL bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) || ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue(); - BOOL bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler + BOOL bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler Rectangle aPixRect = ScEditUtil( pDoc, nNewX,nNewY,nTabNo, GetScrPos(nNewX,nNewY,eWhich), pWin, nPPTX,nPPTY,GetZoomX(),GetZoomY() ). GetEditArea( pPattern, TRUE ); - // when right-aligned, leave space for the cursor - // in vertical mode, editing is always right-aligned + // when right-aligned, leave space for the cursor + // in vertical mode, editing is always right-aligned if ( nEditAdjust == SVX_ADJUST_RIGHT || bAsianVertical ) aPixRect.Right() += 1; @@ -973,7 +973,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // switching sheets or reference input on a different part eEditActivePart = eWhich; - // modify members nEditCol etc. only if also extending for needed area + // modify members nEditCol etc. only if also extending for needed area nEditCol = nNewX; nEditRow = nNewY; const ScMergeAttr* pMergeAttr = (ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); @@ -985,49 +985,49 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, nEditEndRow += pMergeAttr->GetRowMerge() - 1; nEditStartCol = nEditCol; - // For growing use only the alignment value from the attribute, numbers - // (existing or started) with default aligment extend to the right. + // For growing use only the alignment value from the attribute, numbers + // (existing or started) with default aligment extend to the right. BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); - BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left - BOOL bGrowBackwards = bGrowToLeft; // logical left + BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left + BOOL bGrowBackwards = bGrowToLeft; // logical left if ( bLayoutRTL ) - bGrowBackwards = !bGrowBackwards; // invert on RTL sheet + bGrowBackwards = !bGrowBackwards; // invert on RTL sheet if ( bAsianVertical ) - bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode + bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode long nSizeXPix; if (bBreak && !bAsianVertical) - nSizeXPix = aPixRect.GetWidth(); // Papersize -> kein H-Scrolling + nSizeXPix = aPixRect.GetWidth(); // Papersize -> kein H-Scrolling else { DBG_ASSERT(pView,"keine View fuer EditView"); if ( bGrowCentered ) { - // growing into both directions until one edge is reached - //! should be limited to whole cells in both directions + // growing into both directions until one edge is reached + //! should be limited to whole cells in both directions long nLeft = aPixRect.Left(); long nRight = pView->GetGridWidth(eHWhich) - aPixRect.Right(); nSizeXPix = aPixRect.GetWidth() + 2 * Min( nLeft, nRight ); } else if ( bGrowToLeft ) - nSizeXPix = aPixRect.Right(); // space that's available in the window when growing to the left + nSizeXPix = aPixRect.Right(); // space that's available in the window when growing to the left else nSizeXPix = pView->GetGridWidth(eHWhich) - aPixRect.Left(); if ( nSizeXPix <= 0 ) - nSizeXPix = aPixRect.GetWidth(); // editing outside to the right of the window -> keep cell width + nSizeXPix = aPixRect.GetWidth(); // editing outside to the right of the window -> keep cell width } DBG_ASSERT(pView,"keine View fuer EditView"); long nSizeYPix = pView->GetGridHeight(WhichV(eWhich)) - aPixRect.Top(); if ( nSizeYPix <= 0 ) - nSizeYPix = aPixRect.GetHeight(); // editing outside below the window -> keep cell height + nSizeYPix = aPixRect.GetHeight(); // editing outside below the window -> keep cell height Size aPaperSize = pView->GetActiveWin()->PixelToLogic( Size( nSizeXPix, nSizeYPix ), GetLogicMode() ); if ( bBreak && !bAsianVertical && SC_MOD()->GetInputOptions().GetTextWysiwyg() ) { - // #95593# if text is formatted for printer, use the exact same paper width - // (and same line breaks) as for output. + // #95593# if text is formatted for printer, use the exact same paper width + // (and same line breaks) as for output. Fraction aFract(1,1); Rectangle aUtilRect = ScEditUtil( pDoc,nNewX,nNewY,nTabNo, Point(0,0), pWin, @@ -1048,7 +1048,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, else if ( nEditAdjust == SVX_ADJUST_CENTER ) { aVis.Right() = ( aPaper.Width() - 1 + nDiff ) / 2; - bMoveArea = TRUE; // always + bMoveArea = TRUE; // always } else { @@ -1063,13 +1063,13 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // and <PixelToLogic(..)>. This is needed for the correct visibility // of paragraphs in edit mode at the accessibility API. pEditView[eWhich]->SetVisArea(aVis); - // UpdateMode has been disabled in ScInputHandler::StartTable - // must be enabled before EditGrowY (GetTextHeight) + // UpdateMode has been disabled in ScInputHandler::StartTable + // must be enabled before EditGrowY (GetTextHeight) pNewEngine->SetUpdateMode( TRUE ); pNewEngine->SetStatusEventHdl( LINK( this, ScViewData, EditEngineHdl ) ); - EditGrowY( TRUE ); // adjust to existing text content + EditGrowY( TRUE ); // adjust to existing text content EditGrowX(); Point aDocPos = pEditView[eWhich]->GetWindowPosTopLeft(0); @@ -1082,7 +1082,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, if (!bWasThere) pNewEngine->InsertView(pEditView[eWhich]); - // Hintergrundfarbe der Zelle + // Hintergrundfarbe der Zelle Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor(); ScModule* pScMod = SC_MOD(); @@ -1093,8 +1093,8 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, } pEditView[eWhich]->SetBackgroundColor( aBackCol ); - pEditView[eWhich]->Invalidate(); // noetig ?? - // noetig, wenn Position geaendert + pEditView[eWhich]->Invalidate(); // noetig ?? + // noetig, wenn Position geaendert } IMPL_LINK_INLINE_START( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG ) @@ -1141,27 +1141,27 @@ void ScViewData::EditGrowX() SCCOL nLeft = GetPosX(eHWhich); SCCOL nRight = nLeft + VisibleCellsX(eHWhich); - Size aSize = pEngine->GetPaperSize(); - Rectangle aArea = pCurView->GetOutputArea(); - long nOldRight = aArea.Right(); + Size aSize = pEngine->GetPaperSize(); + Rectangle aArea = pCurView->GetOutputArea(); + long nOldRight = aArea.Right(); - // Margin ist schon bei der urspruenglichen Breite beruecksichtigt + // Margin ist schon bei der urspruenglichen Breite beruecksichtigt long nTextWidth = pEngine->CalcTextWidth(); BOOL bChanged = FALSE; BOOL bAsianVertical = pEngine->IsVertical(); - // get bGrow... variables the same way as in SetEditEngine + // get bGrow... variables the same way as in SetEditEngine const ScPatternAttr* pPattern = pLocalDoc->GetPattern( nEditCol, nEditRow, nTabNo ); SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&) pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue(); BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); - BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left - BOOL bGrowBackwards = bGrowToLeft; // logical left + BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left + BOOL bGrowBackwards = bGrowToLeft; // logical left if ( bLayoutRTL ) - bGrowBackwards = !bGrowBackwards; // invert on RTL sheet + bGrowBackwards = !bGrowBackwards; // invert on RTL sheet if ( bAsianVertical ) - bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode + bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode BOOL bUnevenGrow = FALSE; if ( bGrowCentered ) @@ -1254,7 +1254,7 @@ void ScViewData::EditGrowX() if ( bGrowCentered ) { - // switch to center-aligned (undo?) and reset VisArea to center + // switch to center-aligned (undo?) and reset VisArea to center pEngine->SetDefaultItem( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) ); @@ -1265,16 +1265,16 @@ void ScViewData::EditGrowX() } else if ( bGrowToLeft ) { - // switch to right-aligned (undo?) and reset VisArea to the right + // switch to right-aligned (undo?) and reset VisArea to the right pEngine->SetDefaultItem( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); aVis.Right() = aSize.Width() - 1; - aVis.Left() = aSize.Width() - aArea.GetWidth(); // with the new, increased area + aVis.Left() = aSize.Width() - aArea.GetWidth(); // with the new, increased area } else { - // switch to left-aligned (undo?) and reset VisArea to the left + // switch to left-aligned (undo?) and reset VisArea to the left pEngine->SetDefaultItem( SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ) ); @@ -1288,10 +1288,10 @@ void ScViewData::EditGrowX() pCurView->SetOutputArea(aArea); - // In vertical mode, the whole text is moved to the next cell (right-aligned), - // so everything must be repainted. Otherwise, paint only the new area. - // If growing in centered alignment, if the cells left and right have different sizes, - // the whole text will move, and may not even obscure all of the original display. + // In vertical mode, the whole text is moved to the next cell (right-aligned), + // so everything must be repainted. Otherwise, paint only the new area. + // If growing in centered alignment, if the cells left and right have different sizes, + // the whole text will move, and may not even obscure all of the original display. if ( bUnevenGrow ) { aArea.Left() = pWin->PixelToLogic( Point(0,0) ).X(); @@ -1315,10 +1315,10 @@ void ScViewData::EditGrowY( BOOL bInitial ) ULONG nControl = pEditView[eWhich]->GetControlWord(); if ( nControl & EV_CNTRL_AUTOSCROLL ) { - // if end of screen had already been reached and scrolling enabled, - // don't further try to grow the edit area + // if end of screen had already been reached and scrolling enabled, + // don't further try to grow the edit area - pCurView->SetOutputArea( pCurView->GetOutputArea() ); // re-align to pixels + pCurView->SetOutputArea( pCurView->GetOutputArea() ); // re-align to pixels return; } @@ -1327,23 +1327,23 @@ void ScViewData::EditGrowY( BOOL bInitial ) SCROW nBottom = GetPosY(eVWhich) + VisibleCellsY(eVWhich); - Size aSize = pEngine->GetPaperSize(); - Rectangle aArea = pCurView->GetOutputArea(); - long nOldBottom = aArea.Bottom(); - long nTextHeight = pEngine->GetTextHeight(); + Size aSize = pEngine->GetPaperSize(); + Rectangle aArea = pCurView->GetOutputArea(); + long nOldBottom = aArea.Bottom(); + long nTextHeight = pEngine->GetTextHeight(); - // #106635# When editing a formula in a cell with optimal height, allow a larger portion - // to be clipped before extending to following rows, to avoid obscuring cells for - // reference input (next row is likely to be useful in formulas). + // #106635# When editing a formula in a cell with optimal height, allow a larger portion + // to be clipped before extending to following rows, to avoid obscuring cells for + // reference input (next row is likely to be useful in formulas). long nAllowedExtra = SC_GROWY_SMALL_EXTRA; if ( nEditEndRow == nEditRow && !( pDoc->GetRowFlags( nEditRow, nTabNo ) & CR_MANUALSIZE ) && pEngine->GetParagraphCount() <= 1 ) { - // If the (only) paragraph starts with a '=', it's a formula. - // If this is the initial call and the text is empty, allow the larger value, too, - // because this occurs in the normal progress of editing a formula. - // Subsequent calls with empty text might involve changed attributes (including - // font height), so they are treated like normal text. + // If the (only) paragraph starts with a '=', it's a formula. + // If this is the initial call and the text is empty, allow the larger value, too, + // because this occurs in the normal progress of editing a formula. + // Subsequent calls with empty text might involve changed attributes (including + // font height), so they are treated like normal text. String aText = pEngine->GetText( (USHORT) 0 ); if ( ( aText.Len() == 0 && bInitial ) || aText.GetChar(0) == (sal_Unicode)'=' ) nAllowedExtra = SC_GROWY_BIG_EXTRA; @@ -1361,11 +1361,11 @@ void ScViewData::EditGrowY( BOOL bInitial ) if ( aArea.Bottom() > aArea.Top() + aSize.Height() - 1 ) { aArea.Bottom() = aArea.Top() + aSize.Height() - 1; - bMaxReached = TRUE; // don't occupy more cells beyond paper size + bMaxReached = TRUE; // don't occupy more cells beyond paper size } bChanged = TRUE; - nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row + nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row } if (bChanged) @@ -1455,8 +1455,8 @@ void ScViewData::SetTabNo( SCTAB nNewTab ) CreateTabData(nTabNo); pThisTab = pTabData[nTabNo]; - CalcPPT(); // for common column width correction - RecalcPixPos(); //! nicht immer noetig! + CalcPPT(); // for common column width correction + RecalcPixPos(); //! nicht immer noetig! } void ScViewData::SetActivePart( ScSplitPos eNewActive ) @@ -1511,8 +1511,8 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, USHORT nTSize; - SCCOL nPosX = GetPosX(eWhichX); - SCCOL nX; + SCCOL nPosX = GetPosX(eWhichX); + SCCOL nX; long nScrPosX=0; if (nWhereX >= nPosX) @@ -1542,8 +1542,8 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, } } - SCROW nPosY = GetPosY(eWhichY); - SCROW nY; + SCROW nPosY = GetPosY(eWhichY); + SCROW nY; long nScrPosY=0; if (nWhereY >= nPosY) @@ -1584,7 +1584,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, if ( pDoc->IsLayoutRTL( nTabNo ) ) { - // mirror horizontal position + // mirror horizontal position nScrPosX = aScrSize.Width() - 1 - nScrPosX; } @@ -1594,7 +1594,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, } // -// Anzahl Zellen auf einem Bildschirm +// Anzahl Zellen auf einem Bildschirm // SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeX ) const @@ -1604,19 +1604,19 @@ SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHO if (pView) ((ScViewData*)this)->aScrSize.Width() = pView->GetGridWidth(eWhichX); - SCsCOL nX; - USHORT nScrPosX = 0; + SCsCOL nX; + USHORT nScrPosX = 0; if (nScrSizeX == SC_SIZE_NONE) nScrSizeX = (USHORT) aScrSize.Width(); if (nDir==1) - nX = nPosX; // vorwaerts + nX = nPosX; // vorwaerts else - nX = nPosX-1; // rueckwaerts + nX = nPosX-1; // rueckwaerts BOOL bOut = FALSE; for ( ; nScrPosX<=nScrSizeX && !bOut; nX = sal::static_int_cast<SCsCOL>(nX + nDir) ) { - SCsCOL nColNo = nX; + SCsCOL nColNo = nX; if ( nColNo < 0 || nColNo > MAXCOL ) bOut = TRUE; else @@ -1656,7 +1656,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHO nY = nPosY; long nScrPosY = 0; AddPixelsWhile( nScrPosY, nScrSizeY, nY, MAXROW, nPPTY, pDoc, nTabNo); - // Original loop ended on last evaluated +1 or if that was MAXROW even + // Original loop ended on last evaluated +1 or if that was MAXROW even // on MAXROW+2. nY += (nY == MAXROW ? 2 : 1); nY -= nPosY; @@ -1667,7 +1667,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHO nY = nPosY-1; long nScrPosY = 0; AddPixelsWhileBackward( nScrPosY, nScrSizeY, nY, 0, nPPTY, pDoc, nTabNo); - // Original loop ended on last evaluated -1 or if that was 0 even on + // Original loop ended on last evaluated -1 or if that was 0 even on // -2. nY -= (nY == 0 ? 2 : 1); nY = (nPosY-1)-nY; @@ -1714,7 +1714,7 @@ BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r { SCROW nLastRow = nRow; if (pDoc->RowHidden(nRow, nTabNo, NULL, &nLastRow)) - { + { nRow = nLastRow; continue; } @@ -1739,14 +1739,14 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, SCsCOL& rPosX, SCsROW& rPosY, BOOL bTestMerge, BOOL bRepair, BOOL bNextIfLarge ) { - // special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint + // special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint ScHSplitPos eHWhich = WhichH(eWhich); ScVSplitPos eVWhich = WhichV(eWhich); if ( pDoc->IsLayoutRTL( nTabNo ) ) { - // mirror horizontal position + // mirror horizontal position if (pView) aScrSize.Width() = pView->GetGridWidth(eHWhich); nClickX = aScrSize.Width() - 1 - nClickX; @@ -1789,7 +1789,7 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, } } - if (bNextIfLarge) // zu grosse Zellen ? + if (bNextIfLarge) // zu grosse Zellen ? { if ( rPosX == nStartPosX && nClickX > 0 ) { @@ -1814,7 +1814,7 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, if (bTestMerge) { - //! public Methode um Position anzupassen + //! public Methode um Position anzupassen SCCOL nOrigX = rPosX; SCROW nOrigY = rPosY; @@ -1932,7 +1932,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY ) pThisTab->nPosY[eWhich] = 0; } -void ScViewData::RecalcPixPos() // nach Zoom-Aenderungen +void ScViewData::RecalcPixPos() // nach Zoom-Aenderungen { for (USHORT eWhich=0; eWhich<2; eWhich++) { @@ -2052,7 +2052,7 @@ void ScViewData::SetScreen( const Rectangle& rVisArea ) { SetScreenPos( rVisArea.TopLeft() ); - // hier ohne GetOutputFactor(), weil fuer Ausgabe in Metafile + // hier ohne GetOutputFactor(), weil fuer Ausgabe in Metafile aScrSize = rVisArea.GetSize(); aScrSize.Width() = (long) @@ -2125,12 +2125,12 @@ void ScViewData::CalcPPT() { nPPTX = ScGlobal::nScreenPPTX * (double) GetZoomX(); if (pDocShell) - nPPTX = nPPTX / pDocShell->GetOutputFactor(); // Faktor ist Drucker zu Bildschirm + nPPTX = nPPTX / pDocShell->GetOutputFactor(); // Faktor ist Drucker zu Bildschirm nPPTY = ScGlobal::nScreenPPTY * (double) GetZoomY(); - // #83616# if detective objects are present, - // try to adjust horizontal scale so the most common column width has minimal rounding errors, - // to avoid differences between cell and drawing layer output + // #83616# if detective objects are present, + // try to adjust horizontal scale so the most common column width has minimal rounding errors, + // to avoid differences between cell and drawing layer output if ( pDoc && pDoc->HasDetectiveObjects(nTabNo) ) { @@ -2138,7 +2138,7 @@ void ScViewData::CalcPPT() SCROW nDummy = 0; pDoc->GetTableArea( nTabNo, nEndCol, nDummy ); if (nEndCol<20) - nEndCol = 20; // same end position as when determining draw scale + nEndCol = 20; // same end position as when determining draw scale USHORT nTwips = pDoc->GetCommonWidth( nEndCol, nTabNo ); if ( nTwips ) @@ -2146,8 +2146,8 @@ void ScViewData::CalcPPT() double fOriginal = nTwips * nPPTX; if ( fOriginal < static_cast<double>(nEndCol) ) { - // if one column is smaller than the column count, - // rounding errors are likely to add up to a whole column. + // if one column is smaller than the column count, + // rounding errors are likely to add up to a whole column. double fRounded = ::rtl::math::approxFloor( fOriginal + 0.5 ); if ( fRounded > 0.0 ) @@ -2161,18 +2161,18 @@ void ScViewData::CalcPPT() } } -#define SC_OLD_TABSEP '/' -#define SC_NEW_TABSEP '+' +#define SC_OLD_TABSEP '/' +#define SC_NEW_TABSEP '+' void ScViewData::WriteUserData(String& rData) { - // nZoom (bis 364v) oder nZoom/nPageZoom/bPageMode (ab 364w) - // nTab + // nZoom (bis 364v) oder nZoom/nPageZoom/bPageMode (ab 364w) + // nTab // Tab-ControlBreite - // pro Tabelle: - // CursorX/CursorY/HSplitMode/VSplitMode/HSplitPos/VSplitPos/SplitActive/ - // PosX[links]/PosX[rechts]/PosY[oben]/PosY[unten] - // wenn Zeilen groesser 8192, "+" statt "/" + // pro Tabelle: + // CursorX/CursorY/HSplitMode/VSplitMode/HSplitPos/VSplitPos/SplitActive/ + // PosX[links]/PosX[rechts]/PosY[oben]/PosY[unten] + // wenn Zeilen groesser 8192, "+" statt "/" USHORT nZoom = (USHORT)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator()); rData = String::CreateFromInt32( nZoom ); @@ -2194,16 +2194,16 @@ void ScViewData::WriteUserData(String& rData) SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB i=0; i<nTabCount; i++) { - rData += ';'; // Numerierung darf auf keinen Fall durcheinanderkommen + rData += ';'; // Numerierung darf auf keinen Fall durcheinanderkommen if (pTabData[i]) { - sal_Unicode cTabSep = SC_OLD_TABSEP; // wie 3.1 + sal_Unicode cTabSep = SC_OLD_TABSEP; // wie 3.1 if ( pTabData[i]->nCurY > MAXROW_30 || pTabData[i]->nPosY[0] > MAXROW_30 || pTabData[i]->nPosY[1] > MAXROW_30 || ( pTabData[i]->eVSplitMode == SC_SPLIT_FIX && pTabData[i]->nFixPosY > MAXROW_30 ) ) { - cTabSep = SC_NEW_TABSEP; // um eine 3.1-Version nicht umzubringen + cTabSep = SC_NEW_TABSEP; // um eine 3.1-Version nicht umzubringen } @@ -2240,14 +2240,14 @@ void ScViewData::WriteUserData(String& rData) void ScViewData::ReadUserData(const String& rData) { - if (!rData.Len()) // Leerer String kommt bei "neu Laden" - return; // dann auch ohne Assertion beenden + if (!rData.Len()) // Leerer String kommt bei "neu Laden" + return; // dann auch ohne Assertion beenden xub_StrLen nCount = rData.GetTokenCount(';'); if ( nCount <= 2 ) { - // #45208# beim Reload in der Seitenansicht sind evtl. die Preview-UserData - // stehengelassen worden. Den Zoom von der Preview will man hier nicht... + // #45208# beim Reload in der Seitenansicht sind evtl. die Preview-UserData + // stehengelassen worden. Den Zoom von der Preview will man hier nicht... DBG_ERROR("ReadUserData: das sind nicht meine Daten"); return; } @@ -2260,19 +2260,19 @@ void ScViewData::ReadUserData(const String& rData) Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY; //! evaluate (all sheets?) - String aZoomStr = rData.GetToken(0); // Zoom/PageZoom/Modus + String aZoomStr = rData.GetToken(0); // Zoom/PageZoom/Modus USHORT nNormZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(0,'/').ToInt32()); if ( nNormZoom >= MINZOOM && nNormZoom <= MAXZOOM ) - aZoomX = aZoomY = Fraction( nNormZoom, 100 ); // "normaler" Zoom (immer) + aZoomX = aZoomY = Fraction( nNormZoom, 100 ); // "normaler" Zoom (immer) USHORT nPageZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(1,'/').ToInt32()); if ( nPageZoom >= MINZOOM && nPageZoom <= MAXZOOM ) - aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 ); // Pagebreak-Zoom, wenn gesetzt - sal_Unicode cMode = aZoomStr.GetToken(2,'/').GetChar(0); // 0 oder "0"/"1" + aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 ); // Pagebreak-Zoom, wenn gesetzt + sal_Unicode cMode = aZoomStr.GetToken(2,'/').GetChar(0); // 0 oder "0"/"1" SetPagebreakMode( cMode == '1' ); // SetPagebreakMode muss immer gerufen werden wegen CalcPPT / RecalcPixPos() // - // Tabelle kann ungueltig geworden sein (z.B. letzte Version): + // Tabelle kann ungueltig geworden sein (z.B. letzte Version): // SCTAB nNewTab = static_cast<SCTAB>(rData.GetToken(1).ToInt32()); if (pDoc->HasTable( nNewTab )) @@ -2335,15 +2335,15 @@ void ScViewData::ReadUserData(const String& rData) pTabData[nPos]->nPosY[0] = SanitizeRow( aTabOpt.GetToken(9,cTabSep).ToInt32()); pTabData[nPos]->nPosY[1] = SanitizeRow( aTabOpt.GetToken(10,cTabSep).ToInt32()); - // Test, ob der aktive Teil laut SplitMode ueberhaupt existiert - // (Bug #44516#) + // Test, ob der aktive Teil laut SplitMode ueberhaupt existiert + // (Bug #44516#) ScSplitPos eTest = pTabData[nPos]->eWhichActive; if ( ( WhichH( eTest ) == SC_SPLIT_RIGHT && pTabData[nPos]->eHSplitMode == SC_SPLIT_NONE ) || ( WhichV( eTest ) == SC_SPLIT_TOP && pTabData[nPos]->eVSplitMode == SC_SPLIT_NONE ) ) { - // dann wieder auf Default (unten links) + // dann wieder auf Default (unten links) pTabData[nPos]->eWhichActive = SC_SPLIT_BOTTOMLEFT; DBG_ERROR("SplitPos musste korrigiert werden"); } @@ -2894,12 +2894,12 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> void ScViewData::SetOptions( const ScViewOptions& rOpt ) { - // if visibility of horiz. ScrollBar is changed, TabBar may have to be resized... + // if visibility of horiz. ScrollBar is changed, TabBar may have to be resized... BOOL bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) ); - // if graphics are turned on or off, animation has to be started or stopped - // graphics are controlled by VOBJ_TYPE_OLE - BOOL bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) != + // if graphics are turned on or off, animation has to be started or stopped + // graphics are controlled by VOBJ_TYPE_OLE + BOOL bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) != rOpt.GetObjMode(VOBJ_TYPE_OLE) ); *pOptions = rOpt; @@ -2928,10 +2928,10 @@ BOOL ScViewData::IsOle() return pDocShell && pDocShell->IsOle(); } -BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert +BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert { - if (!ValidTab(nTab)) // Default - nTab=nTabNo; // akuelle Tabelle + if (!ValidTab(nTab)) // Default + nTab=nTabNo; // akuelle Tabelle if (!pView || pTabData[nTab]->eHSplitMode != SC_SPLIT_FIX) return FALSE; @@ -2956,17 +2956,17 @@ BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert { pTabData[nTab]->nHSplitPos = nNewPos; if (nTab == nTabNo) - RecalcPixPos(); //! sollte nicht noetig sein !!! + RecalcPixPos(); //! sollte nicht noetig sein !!! return TRUE; } return FALSE; } -BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert +BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert { - if (!ValidTab(nTab)) // Default - nTab=nTabNo; // akuelle Tabelle + if (!ValidTab(nTab)) // Default + nTab=nTabNo; // akuelle Tabelle if (!pView || pTabData[nTab]->eVSplitMode != SC_SPLIT_FIX) return FALSE; @@ -2991,7 +2991,7 @@ BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert { pTabData[nTab]->nVSplitPos = nNewPos; if (nTab == nTabNo) - RecalcPixPos(); //! sollte nicht noetig sein !!! + RecalcPixPos(); //! sollte nicht noetig sein !!! return TRUE; } @@ -3015,9 +3015,9 @@ void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const rOutl.SetCalcFieldValueHdl( LINK( SC_MOD(), ScModule, CalcFieldValueHdl ) ); - // #97417# don't call GetSpellChecker if online spelling isn't enabled. - // The language for AutoCorrect etc. is taken from the pool defaults - // (set in ScDocument::UpdateDrawLanguages) + // #97417# don't call GetSpellChecker if online spelling isn't enabled. + // The language for AutoCorrect etc. is taken from the pool defaults + // (set in ScDocument::UpdateDrawLanguages) if ( bOnlineSpell ) { @@ -3036,7 +3036,7 @@ ScAddress ScViewData::GetCurPos() const // static -void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY, +void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY, SCROW nEndRow, double nPPTY, const ScDocument * pDoc, SCTAB nTabNo ) { SCROW nRow = rPosY; @@ -3077,7 +3077,7 @@ void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY, // static void ScViewData::AddPixelsWhileBackward( long & rScrY, long nEndPixels, - SCROW & rPosY, SCROW nStartRow, double nPPTY, const ScDocument * pDoc, + SCROW & rPosY, SCROW nStartRow, double nPPTY, const ScDocument * pDoc, SCTAB nTabNo ) { SCROW nRow = rPosY; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 49f93c43ffac..04ebe2d42c09 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.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,7 +65,7 @@ using namespace com::sun::star; #include "attrib.hxx" #include "autoform.hxx" -#include "cell.hxx" // EnterAutoSum +#include "cell.hxx" // EnterAutoSum #include "cellmergeoption.hxx" #include "compiler.hxx" #include "docfunc.hxx" @@ -249,7 +249,7 @@ ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, //---------------------------------------------------------------------------- -#define SC_AUTOSUM_MAXCOUNT 20 +#define SC_AUTOSUM_MAXCOUNT 20 ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, SCTAB nTab, ScDirection eDir, SCCOLROW& nExtend ) @@ -420,11 +420,11 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) SCCOL nStartCol = nCol; SCROW nStartRow = nRow; - SCCOL nEndCol = nCol; - SCROW nEndRow = nRow; - SCCOL nSeekCol = nCol; - SCROW nSeekRow = nRow; - SCCOLROW nExtend; // wird per Reference gueltig bei ScAutoSumSum + SCCOL nEndCol = nCol; + SCROW nEndRow = nRow; + SCCOL nSeekCol = nCol; + SCROW nSeekRow = nRow; + SCCOLROW nExtend; // wird per Reference gueltig bei ScAutoSumSum BOOL bCol = FALSE; BOOL bRow = FALSE; @@ -455,19 +455,19 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) { if ( bRow ) { - nStartRow = nSeekRow; // nSeekRow evtl. per Reference angepasst + nStartRow = nSeekRow; // nSeekRow evtl. per Reference angepasst if ( eSum == ScAutoSumSum ) - nEndRow = nStartRow; // nur Summen summieren + nEndRow = nStartRow; // nur Summen summieren else - nEndRow = nRow - 1; // Datenbereich evtl. nach unten erweitern + nEndRow = nRow - 1; // Datenbereich evtl. nach unten erweitern } else { - nStartCol = nSeekCol; // nSeekCol evtl. per Reference angepasst + nStartCol = nSeekCol; // nSeekCol evtl. per Reference angepasst if ( eSum == ScAutoSumSum ) - nEndCol = nStartCol; // nur Summen summieren + nEndCol = nStartCol; // nur Summen summieren else - nEndCol = nCol - 1; // Datenbereich evtl. nach rechts erweitern + nEndCol = nCol - 1; // Datenbereich evtl. nach rechts erweitern } BOOL bContinue = FALSE; do @@ -476,7 +476,7 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) { if ( bRow ) { - while ( nStartRow != 0 && lcl_IsAutoSumData( pDoc, nCol, + while ( nStartRow != 0 && lcl_IsAutoSumData( pDoc, nCol, nStartRow-1, nTab, DIR_TOP, nExtend /*out*/ ) == eSum ) --nStartRow; } @@ -767,7 +767,7 @@ String ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTo void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData ) { - // Mehrfachselektion vorher abfragen... + // Mehrfachselektion vorher abfragen... SCCOL nCol = GetViewData()->GetCurX(); SCROW nRow = GetViewData()->GetCurY(); @@ -777,10 +777,10 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData { rMark.MarkToSimple(); if ( rMark.IsMultiMarked() ) - { // "Einfuegen auf Mehrfachselektion nicht moeglich" + { // "Einfuegen auf Mehrfachselektion nicht moeglich" ErrorMessage(STR_MSSG_PASTEFROMCLIP_0); - // insert into single cell + // insert into single cell if ( pData ) EnterData( nCol, nRow, nTab, pData ); else @@ -805,7 +805,7 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData } } - // Einfuegen per PasteFromClip + // Einfuegen per PasteFromClip WaitObject aWait( GetFrameWin() ); @@ -814,9 +814,9 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData ScDocument* pInsDoc = new ScDocument( SCDOCMODE_CLIP ); pInsDoc->ResetClip( pDoc, nTab ); - if (aNewStr.GetChar(0) == '=') // Formel ? + if (aNewStr.GetChar(0) == '=') // Formel ? { - // SetString geht nicht, weil in Clipboard-Dokumenten nicht kompiliert wird! + // SetString geht nicht, weil in Clipboard-Dokumenten nicht kompiliert wird! ScFormulaCell* pFCell = new ScFormulaCell( pDoc, aPos, aNewStr ); pInsDoc->PutCell( nCol, nRow, nTab, pFCell ); } @@ -833,7 +833,7 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData const SfxUInt32Item* pItem = (SfxUInt32Item*) pInsDoc->GetAttr( nCol, nRow, nTab, ATTR_VALUE_FORMAT ); if ( pItem ) - { // Numberformat setzen wenn inkompatibel + { // Numberformat setzen wenn inkompatibel // MarkData wurde bereits in PasteFromClip MarkToSimple'ed ScRange aRange; rMark.GetMarkArea( aRange ); @@ -851,7 +851,7 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData //---------------------------------------------------------------------------- -// manueller Seitenumbruch +// manueller Seitenumbruch void ScViewFunc::InsertPageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* pPos, BOOL bSetModified ) @@ -867,7 +867,7 @@ void ScViewFunc::InsertPageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* p InsertPageBreak( bColumn, aCursor, bRecord, bSetModified, FALSE ); if ( bSuccess && bSetModified ) - UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus + UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus } @@ -887,7 +887,7 @@ void ScViewFunc::DeletePageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* p RemovePageBreak( bColumn, aCursor, bRecord, bSetModified, FALSE ); if ( bSuccess && bSetModified ) - UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus + UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus } //---------------------------------------------------------------------------- @@ -939,12 +939,12 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, const String* pRepCol, const String* pRepRow, BOOL bAddPrint ) { - // on all selected tables + // on all selected tables - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); - SCTAB nTabCount = pDoc->GetTableCount(); - ScMarkData& rMark = GetViewData()->GetMarkData(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); + SCTAB nTabCount = pDoc->GetTableCount(); + ScMarkData& rMark = GetViewData()->GetMarkData(); SCTAB nTab; BOOL bUndo (pDoc->IsUndoEnabled()); @@ -957,7 +957,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, { ScRange aRange( 0,0,nTab ); - // print ranges + // print ranges if( !bAddPrint ) pDoc->ClearPrintRanges( nTab ); @@ -1005,7 +1005,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, } } - // repeat columns + // repeat columns if ( pRepCol ) { @@ -1016,7 +1016,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, pDoc->SetRepeatColRange( nTab, &aRange ); } - // repeat rows + // repeat rows if ( pRepRow ) { @@ -1028,7 +1028,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, } } - // undo (for all tables) + // undo (for all tables) if (bUndo) { SCTAB nCurTab = GetViewData()->GetTabNo(); @@ -1037,7 +1037,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, new ScUndoPrintRange( pDocSh, nCurTab, pOldRanges, pNewRanges ) ); } - // update page breaks + // update page breaks for (nTab=0; nTab<nTabCount; nTab++) if (rMark.GetTableSelect(nTab)) @@ -1050,11 +1050,11 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, } //---------------------------------------------------------------------------- -// Zellen zusammenfassen +// Zellen zusammenfassen -BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue) +BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue) { - // simple test: TRUE if there's a selection but no multi selection and not filtered + // simple test: TRUE if there's a selection but no multi selection and not filtered const ScMarkData& rMark = GetViewData()->GetMarkData(); if ( rMark.IsMarked() || rMark.IsMultiMarked() ) @@ -1071,8 +1071,8 @@ BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue) BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord, BOOL bCenter ) { - // Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc), - // damit dann nicht die Inhalte-QueryBox kommt + // Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc), + // damit dann nicht die Inhalte-QueryBox kommt ScEditableTester aTester( this ); if (!aTester.IsEditable()) { @@ -1107,7 +1107,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord, BOOL bC if ( pDoc->HasAttrib( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) ) - { // "Zusammenfassen nicht verschachteln !" + { // "Zusammenfassen nicht verschachteln !" ErrorMessage(STR_MSSG_MERGECELLS_0); return FALSE; } @@ -1263,7 +1263,7 @@ BOOL ScViewFunc::RemoveMerge( BOOL bRecord ) if (bOk) pDocSh->UpdateOle(GetViewData()); } - return TRUE; //! bOk ?? + return TRUE; //! bOk ?? } //---------------------------------------------------------------------------- @@ -1332,7 +1332,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, FillAuto( aRange, &rMark, eDir, nCount, bRecord, FALSE ); if (bSuccess) { - MarkRange( aRange, FALSE ); // aRange ist in FillAuto veraendert worden + MarkRange( aRange, FALSE ); // aRange ist in FillAuto veraendert worden pDocSh->UpdateOle(GetViewData()); UpdateScrollBars(); @@ -1405,12 +1405,12 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL aMarkRange = ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(), nTab ); ScDocument* pUndoDoc = NULL; -// if ( bRecord ) +// if ( bRecord ) if (bUndo) { pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); pUndoDoc->InitUndo( pDoc, nTab, nTab ); -// pUndoDoc->SelectTable( nTab, TRUE ); // nur fuer Markierung +// pUndoDoc->SelectTable( nTab, TRUE ); // nur fuer Markierung SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB i=0; i<nTabCount; i++) @@ -1420,7 +1420,7 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL aMarkRange.aStart.SetTab( i ); aMarkRange.aEnd.SetTab( i ); pDoc->CopyToDocument( aMarkRange, IDF_ALL, bMulti, pUndoDoc ); -// pUndoDoc->SelectTable( i, TRUE ); +// pUndoDoc->SelectTable( i, TRUE ); } } @@ -1433,9 +1433,9 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL pDoc->FillTab( aMarkRange, rMark, nFlags, nFunction, bSkipEmpty, bAsLink ); } -// if ( bRecord ) +// if ( bRecord ) if (bUndo) - { //! fuer ChangeTrack erst zum Schluss + { //! fuer ChangeTrack erst zum Schluss pDocSh->GetUndoManager()->AddUndoAction( new ScUndoFillTable( pDocSh, rMark, aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), nTab, @@ -1529,7 +1529,7 @@ void ScViewFunc::TransliterateText( sal_Int32 nType ) ScMarkData aFuncMark = GetViewData()->GetMarkData(); if ( !aFuncMark.IsMarked() && !aFuncMark.IsMultiMarked() ) { - // no selection -> use cursor position + // no selection -> use cursor position ScAddress aCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); aFuncMark.SetMarkArea( ScRange( aCursor ) ); @@ -1544,7 +1544,7 @@ void ScViewFunc::TransliterateText( sal_Int32 nType ) } //---------------------------------------------------------------------------- -// AutoFormat +// AutoFormat ScAutoFormatData* ScViewFunc::CreateAutoFormatData() { @@ -1652,7 +1652,7 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord ) nEndCol, nEndRow, nEndTab, PAINT_GRID ); } - if ( bRecord ) // Draw-Undo erst jetzt verfuegbar + if ( bRecord ) // Draw-Undo erst jetzt verfuegbar { pDocSh->GetUndoManager()->AddUndoAction( new ScUndoAutoFormat( pDocSh, @@ -1671,7 +1671,7 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord ) //---------------------------------------------------------------------------- -// Suchen & Ersetzen +// Suchen & Ersetzen void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, BOOL bAddUndo, BOOL bIsApi ) @@ -1706,7 +1706,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, } } else - { //! mindestens eine ist immer selektiert + { //! mindestens eine ist immer selektiert nStartTab = nEndTab = rMark.GetFirstSelected(); for ( SCTAB j = nStartTab + 1; j <= nLastTab; j++ ) { @@ -1735,14 +1735,14 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, || nCommand == SVX_SEARCHCMD_FIND_ALL) bAddUndo = FALSE; - //! bAttrib bei Undo beruecksichtigen !!! + //! bAttrib bei Undo beruecksichtigen !!! ScDocument* pUndoDoc = NULL; ScMarkData* pUndoMark = NULL; String aUndoStr; if (bAddUndo) { - pUndoMark = new ScMarkData( rMark ); // Markierung wird veraendert + pUndoMark = new ScMarkData( rMark ); // Markierung wird veraendert if ( nCommand == SVX_SEARCHCMD_REPLACE_ALL ) { pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); @@ -1751,17 +1751,17 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, } if ( bAllTables ) - { //! alles selektieren, erst nachdem pUndoMark erzeugt wurde + { //! alles selektieren, erst nachdem pUndoMark erzeugt wurde for ( SCTAB j = nStartTab; j <= nEndTab; j++ ) { rMark.SelectTable( j, TRUE ); } } - DoneBlockMode(TRUE); // Markierung nicht loeschen! + DoneBlockMode(TRUE); // Markierung nicht loeschen! InitOwnBlockMode(); - // wenn vom Anfang an gesucht wird, nicht nochmal fragen ob vom Anfang gesucht werden soll + // wenn vom Anfang an gesucht wird, nicht nochmal fragen ob vom Anfang gesucht werden soll BOOL bFirst = TRUE; if ( nCol == 0 && nRow == 0 && nTab == nStartTab && !pSearchItem->GetBackward() ) bFirst = FALSE; @@ -1783,7 +1783,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, pUndoDoc = NULL; } - break; // Abbruch while True + break; // Abbruch while True } else if ( bFirst && (nCommand == SVX_SEARCHCMD_FIND || nCommand == SVX_SEARCHCMD_REPLACE) ) @@ -1795,7 +1795,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, nRetVal = RET_NO; else { - // Suchen-Dialog als Parent, wenn vorhanden + // Suchen-Dialog als Parent, wenn vorhanden Window* pParent = GetParentOrChild(SID_SEARCH_DLG); USHORT nStrId; if ( pSearchItem->GetBackward() ) @@ -1828,38 +1828,38 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, } else { - break; // Abbruch while True + break; // Abbruch while True } } - else // nichts gefunden + else // nichts gefunden { if ( nCommand == SVX_SEARCHCMD_FIND_ALL || nCommand == SVX_SEARCHCMD_REPLACE_ALL ) { - pDocSh->PostPaintGridAll(); // Markierung + pDocSh->PostPaintGridAll(); // Markierung } GetFrameWin()->LeaveWait(); if (!bIsApi) { - // Suchen-Dialog als Parent, wenn vorhanden + // Suchen-Dialog als Parent, wenn vorhanden Window* pParent = GetParentOrChild(SID_SEARCH_DLG); // "nichts gefunden" InfoBox aBox( pParent, ScGlobal::GetRscString( STR_MSSG_SEARCHANDREPLACE_0 ) ); aBox.Execute(); } - break; // Abbruch while True + break; // Abbruch while True } - } // of while TRUE + } // of while TRUE if ( pOldSelectedTables ) - { // urspruenglich selektierte Tabellen wiederherstellen + { // urspruenglich selektierte Tabellen wiederherstellen for ( SCTAB j = nStartTab; j <= nEndTab; j++ ) { rMark.SelectTable( j, pOldSelectedTables[j] ); } if ( bFound ) - { // durch Fundstelle neu selektierte Tabelle bleibt + { // durch Fundstelle neu selektierte Tabelle bleibt rMark.SelectTable( nTab, TRUE ); // wenn vorher nur eine selektiert war, ist es ein Tausch //! wenn nicht, ist jetzt evtl. eine mehr selektiert @@ -1876,8 +1876,8 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, if ( nTab != GetViewData()->GetTabNo() ) SetTabNo( nTab ); - // wenn nichts markiert ist, DoneBlockMode, damit von hier aus - // direkt per Shift-Cursor markiert werden kann: + // wenn nichts markiert ist, DoneBlockMode, damit von hier aus + // direkt per Shift-Cursor markiert werden kann: if (!rMark.IsMarked() && !rMark.IsMultiMarked()) DoneBlockMode(TRUE); @@ -1894,17 +1894,17 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, pDocSh->SetDocumentModified(); } else if ( nCommand == SVX_SEARCHCMD_FIND_ALL ) - pDocSh->PostPaintGridAll(); // Markierung + pDocSh->PostPaintGridAll(); // Markierung GetFrameWin()->LeaveWait(); } - delete pUndoDoc; // loeschen wenn nicht benutzt - delete pUndoMark; // kann immer geloescht werden + delete pUndoDoc; // loeschen wenn nicht benutzt + delete pUndoMark; // kann immer geloescht werden } //---------------------------------------------------------------------------- -// Zielwertsuche +// Zielwertsuche void ScViewFunc::Solve( const ScSolveParam& rParam ) { @@ -1928,12 +1928,12 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) aTargetValStr = *(rParam.pStrTargetVal); String aMsgStr; - String aResStr; - double nSolveResult; + String aResStr; + double nSolveResult; GetFrameWin()->EnterWait(); - BOOL bExact = + BOOL bExact = pDoc->Solver( rParam.aRefFormulaCell.Col(), rParam.aRefFormulaCell.Row(), @@ -1982,7 +1982,7 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) //---------------------------------------------------------------------------- -// Mehrfachoperation +// Mehrfachoperation void ScViewFunc::TabOp( const ScTabOpParam& rParam, BOOL bRecord ) { @@ -2003,17 +2003,17 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, BOOL bRecord ) void ScViewFunc::MakeScenario( const String& rName, const String& rComment, const Color& rColor, USHORT nFlags ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTab = GetViewData()->GetTabNo(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTab = GetViewData()->GetTabNo(); SCTAB nNewTab = pDocSh->MakeScenario( nTab, rName, rComment, rColor, nFlags, rMark ); if (nFlags & SC_SCENARIO_COPYALL) - SetTabNo( nNewTab, TRUE ); // SC_SCENARIO_COPYALL -> sichtbar + SetTabNo( nNewTab, TRUE ); // SC_SCENARIO_COPYALL -> sichtbar else { SfxBindings& rBindings = GetViewData()->GetBindings(); - rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar + rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar rBindings.Invalidate( SID_TABLES_COUNT ); rBindings.Invalidate( SID_SELECT_SCENARIO ); rBindings.Invalidate( FID_TABLE_SHOW ); @@ -2032,7 +2032,7 @@ void ScViewFunc::ExtendScenario() return; } - // Undo: Attribute anwenden + // Undo: Attribute anwenden ScDocument* pDoc = GetViewData()->GetDocument(); ScPatternAttr aPattern( pDoc->GetPool() ); @@ -2046,8 +2046,8 @@ void ScViewFunc::ExtendScenario() void ScViewFunc::UseScenario( const String& rName ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - SCTAB nTab = GetViewData()->GetTabNo(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + SCTAB nTab = GetViewData()->GetTabNo(); DoneBlockMode(); InitOwnBlockMode(); @@ -2056,11 +2056,11 @@ void ScViewFunc::UseScenario( const String& rName ) //---------------------------------------------------------------------------- -// Tabelle einfuegen +// Tabelle einfuegen BOOL ScViewFunc::InsertTable( const String& rName, SCTAB nTab, BOOL bRecord ) { - // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt + // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc(). InsertTable( nTab, rName, bRecord, FALSE ); if (bSuccess) @@ -2070,13 +2070,13 @@ BOOL ScViewFunc::InsertTable( const String& rName, SCTAB nTab, BOOL bRecord ) } //---------------------------------------------------------------------------- -// Tabellen einfuegen +// Tabellen einfuegen BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, BOOL bRecord ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; @@ -2087,7 +2087,7 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab, if (bRecord) { pNameList= new SvStrings; - pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage + pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage } BOOL bFlag=FALSE; @@ -2129,7 +2129,7 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab, pDocSh->GetUndoManager()->AddUndoAction( new ScUndoInsertTables( pDocSh, nTab, FALSE, pNameList)); - // Views updaten: + // Views updaten: SetTabNo( nTab, TRUE ); pDocSh->PostPaintExtras(); @@ -2156,7 +2156,7 @@ BOOL ScViewFunc::AppendTable( const String& rName, BOOL bRecord ) WaitObject aWait( GetFrameWin() ); if (bRecord) - pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage + pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage if (pDoc->InsertTab( SC_TAB_APPEND, rName )) { @@ -2182,8 +2182,8 @@ BOOL ScViewFunc::AppendTable( const String& rName, BOOL bRecord ) BOOL ScViewFunc::DeleteTable( SCTAB nTab, BOOL bRecord ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); BOOL bSuccess = pDocSh->GetDocFunc().DeleteTable( nTab, bRecord, FALSE ); if (bSuccess) @@ -2198,11 +2198,11 @@ BOOL ScViewFunc::DeleteTable( SCTAB nTab, BOOL bRecord ) BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); BOOL bVbaEnabled = pDoc ? pDoc->IsInVBAMode() : FALSE; - SCTAB nNewTab = TheTabs[0]; - int i; + SCTAB nNewTab = TheTabs[0]; + int i; WaitObject aWait( GetFrameWin() ); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; @@ -2218,19 +2218,19 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) if (bRecord) { pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); -// pUndoDoc->InitDrawLayer( pDocSh ); +// pUndoDoc->InitDrawLayer( pDocSh ); SCTAB nCount = pDoc->GetTableCount(); -// pUndoDoc->InitUndo( pDoc, 0, nCount-1 ); // incl. Ref. +// pUndoDoc->InitUndo( pDoc, 0, nCount-1 ); // incl. Ref. String aOldName; for(i=0;i<TheTabs.Count();i++) { SCTAB nTab = TheTabs[sal::static_int_cast<USHORT>(i)]; if (i==0) - pUndoDoc->InitUndo( pDoc, nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags + pUndoDoc->InitUndo( pDoc, nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags else - pUndoDoc->AddUndoTab( nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags + pUndoDoc->AddUndoTab( nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pUndoDoc ); pDoc->GetName( nTab, aOldName ); @@ -2261,13 +2261,13 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) if ( pDoc->IsTabProtected( nTab ) ) pUndoDoc->SetTabProtection(nTab, pDoc->GetTabProtection(nTab)); - // Drawing-Layer muss sein Undo selbst in der Hand behalten !!! - // pUndoDoc->TransferDrawPage(pDoc, nTab,nTab); + // Drawing-Layer muss sein Undo selbst in der Hand behalten !!! + // pUndoDoc->TransferDrawPage(pDoc, nTab,nTab); } - pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen + pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen - pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage + pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage pUndoData = new ScRefUndoData( pDoc ); } @@ -2308,7 +2308,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) if (bWasLinked) { - pDocSh->UpdateLinks(); // Link-Manager updaten + pDocSh->UpdateLinks(); // Link-Manager updaten GetViewData()->GetBindings().Invalidate(SID_LINKS); } @@ -2334,12 +2334,12 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) BOOL ScViewFunc::RenameTable( const String& rName, SCTAB nTab ) { - // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt + // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc(). RenameTable( nTab, rName, TRUE, FALSE ); if (bSuccess) { - // Der Tabellenname koennte in einer Formel vorkommen... + // Der Tabellenname koennte in einer Formel vorkommen... GetViewData()->GetViewShell()->UpdateInputHandler(); } return bSuccess; @@ -2398,7 +2398,7 @@ void ScViewFunc::InsertTableLink( const String& rFile, ScDocShell* pSrcSh = aLoader.GetDocShell(); ScDocument* pSrcDoc = pSrcSh->GetDocument(); SCTAB nTab = MAXTAB+1; - if (!rTabName.Len()) // kein Name angegeben -> erste Tabelle + if (!rTabName.Len()) // kein Name angegeben -> erste Tabelle nTab = 0; else { @@ -2420,7 +2420,7 @@ void ScViewFunc::InsertTableLink( const String& rFile, //---------------------------------------------------------------------------- -// Tabellen aus anderem Dokument kopieren / linken +// Tabellen aus anderem Dokument kopieren / linken void ScViewFunc::ImportTables( ScDocShell* pSrcShell, SCTAB nCount, const SCTAB* pSrcTabs, BOOL bLink,SCTAB nTab ) @@ -2440,19 +2440,19 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, pDocSh->MakeDrawLayer(); if (bUndo) - pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions + pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions SCTAB nInsCount = 0; SCTAB i; for( i=0; i<nCount; i++ ) - { // #63304# insert sheets first and update all references + { // #63304# insert sheets first and update all references String aName; pSrcDoc->GetName( pSrcTabs[i], aName ); pDoc->CreateValidTabName( aName ); if ( !pDoc->InsertTab( nTab+i, aName ) ) { - bError = TRUE; // total error - break; // for + bError = TRUE; // total error + break; // for } ++nInsCount; } @@ -2461,11 +2461,11 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, SCTAB nSrcTab = pSrcTabs[i]; SCTAB nDestTab1=nTab+i; ULONG nErrVal = pDocSh->TransferTab( *pSrcShell, nSrcTab, nDestTab1, - FALSE, FALSE ); // no insert + FALSE, FALSE ); // no insert switch (nErrVal) { - case 0: // interner Fehler oder voll Fehler + case 0: // interner Fehler oder voll Fehler bError = TRUE; break; case 2: @@ -2503,7 +2503,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, aFileName, aFilterName, aOptions, aTabStr, nRefresh ); } - if (!bWasThere) // Link pro Quelldokument nur einmal eintragen + if (!bWasThere) // Link pro Quelldokument nur einmal eintragen { ScTableLink* pLink = new ScTableLink( pDocSh, aFileName, aFilterName, aOptions, nRefresh ); pLink->SetInCreate( TRUE ); @@ -2545,13 +2545,13 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, //---------------------------------------------------------------------------- -// Tabelle in anderes Dokument verschieben / kopieren +// Tabelle in anderes Dokument verschieben / kopieren void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) { - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); ScDocShell* pDocShell = GetViewData()->GetDocShell(); - ScDocument* pDestDoc = NULL; + ScDocument* pDestDoc = NULL; ScDocShell* pDestShell = NULL; ScTabViewShell* pDestViewSh = NULL; BOOL bUndo (pDoc->IsUndoEnabled()); @@ -2561,10 +2561,10 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) { nDestTab = 0; // als erstes einfuegen - // ohne SFX_CALLMODE_RECORD ausfuehren, weil schon im Move-Befehl enthalten: + // ohne SFX_CALLMODE_RECORD ausfuehren, weil schon im Move-Befehl enthalten: String aUrl = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/")); - aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc" + aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc" SfxStringItem aItem( SID_FILE_NAME, aUrl ); SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") ); @@ -2608,11 +2608,11 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) FALSE ); } - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTabCount = pDoc->GetTableCount(); - SCTAB nTabSelCount = rMark.GetSelectCount(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTabCount = pDoc->GetTableCount(); + SCTAB nTabSelCount = rMark.GetSelectCount(); - SvShorts TheTabs; + SvShorts TheTabs; for(SCTAB i=0;i<nTabCount;i++) { @@ -2640,21 +2640,21 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) pDestShell->MakeDrawLayer(); if (!bNewDoc && bUndo) - pDestDoc->BeginDrawUndo(); // drawing layer must do its own undo actions + pDestDoc->BeginDrawUndo(); // drawing layer must do its own undo actions ULONG nErrVal =1; if(nDestTab==SC_TAB_APPEND) nDestTab=pDestDoc->GetTableCount(); SCTAB nDestTab1=nDestTab; for( USHORT j=0; j<TheTabs.Count(); j++, nDestTab1++ ) - { // #63304# insert sheets first and update all references + { // #63304# insert sheets first and update all references String aName; pDoc->GetName( TheTabs[j], aName ); pDestDoc->CreateValidTabName( aName ); if ( !pDestDoc->InsertTab( nDestTab1, aName ) ) { - nErrVal = 0; // total error - break; // for + nErrVal = 0; // total error + break; // for } } if ( nErrVal > 0 ) @@ -2683,7 +2683,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) GetFrameWin()->LeaveWait(); switch (nErrVal) { - case 0: // interner Fehler oder voll Fehler + case 0: // interner Fehler oder voll Fehler { ErrorMessage(STR_TABINSERT_ERROR); return; @@ -2704,7 +2704,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) default: break; } - //pDestShell->GetUndoManager()->Clear(); //! Undo implementieren !!! + //pDestShell->GetUndoManager()->Clear(); //! Undo implementieren !!! /* String sName; pDestDoc->GetName(nDestTab, sName); @@ -2721,18 +2721,18 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) if (bNewDoc) { - // ChartListenerCollection must be updated before DeleteTab + // ChartListenerCollection must be updated before DeleteTab if ( pDestDoc->IsChartListenerCollectionNeedsUpdate() ) pDestDoc->UpdateChartListenerCollection(); pDestDoc->DeleteTab(static_cast<SCTAB>(TheTabs.Count())); // alte erste Tabelle -//? pDestDoc->SelectTable(0, TRUE); // neue erste Tabelle selektieren +//? pDestDoc->SelectTable(0, TRUE); // neue erste Tabelle selektieren if (pDestViewSh) - pDestViewSh->TabChanged(); // Pages auf dem Drawing-Layer + pDestViewSh->TabChanged(); // Pages auf dem Drawing-Layer pDestShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS | PAINT_SIZE ); - // PAINT_SIZE fuer Gliederung + // PAINT_SIZE fuer Gliederung } else { @@ -2746,17 +2746,17 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) pDestShell->SetDocumentModified(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); } - else // innerhalb des Dokuments + else // innerhalb des Dokuments { - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTabCount = pDoc->GetTableCount(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTabCount = pDoc->GetTableCount(); - SvShorts TheTabs; - SvShorts TheDestTabs; - SvStrings TheTabNames; - String aDestName; - String *pString; + SvShorts TheTabs; + SvShorts TheDestTabs; + SvStrings TheTabNames; + String aDestName; + String *pString; for(SCTAB i=0;i<nTabCount;i++) { @@ -2781,14 +2781,14 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) } if (bCopy && bUndo) - pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions + pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions pDoc->GetName( nDestTab, aDestName); SCTAB nDestTab1=nDestTab; SCTAB nMovTab=0; for(int j=0;j<TheTabNames.Count();j++) { - nTabCount = pDoc->GetTableCount(); + nTabCount = pDoc->GetTableCount(); pString=TheTabNames[sal::static_int_cast<USHORT>(j)]; if(!pDoc->GetTable(*pString,nMovTab)) { @@ -2798,7 +2798,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) { nDestTab1=nTabCount; } - pDocShell->MoveTable( nMovTab, nDestTab1, bCopy, FALSE ); // Undo ist hier + pDocShell->MoveTable( nMovTab, nDestTab1, bCopy, FALSE ); // Undo ist hier if(bCopy && pDoc->IsScenario(nMovTab)) { @@ -2921,7 +2921,7 @@ void ScViewFunc::HideTable( SCTAB nTab ) pDocSh->GetUndoManager()->AddUndoAction( new ScUndoShowHideTab( pDocSh, nTab, FALSE ) ); } - // Views updaten: + // Views updaten: pDocSh->Broadcast( ScTablesHint( SC_TAB_HIDDEN, nTab ) ); SetTabNo( nTab, TRUE ); @@ -2945,16 +2945,16 @@ void ScViewFunc::InsertSpecialChar( const String& rStr, const Font& rFont ) return; } - const sal_Unicode* pChar = rStr.GetBuffer(); - ScTabViewShell* pViewShell = GetViewData()->GetViewShell(); - SvxFontItem aFontItem( rFont.GetFamily(), + const sal_Unicode* pChar = rStr.GetBuffer(); + ScTabViewShell* pViewShell = GetViewData()->GetViewShell(); + SvxFontItem aFontItem( rFont.GetFamily(), rFont.GetName(), rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), ATTR_FONT ); - // if string contains WEAK characters, set all fonts + // if string contains WEAK characters, set all fonts BYTE nScript; ScDocument* pDoc = GetViewData()->GetDocument(); if ( pDoc->HasStringWeakCharacters( rStr ) ) @@ -2973,44 +2973,44 @@ void ScViewFunc::InsertSpecialChar( const String& rStr, const Font& rFont ) //---------------------------------------------------------------------------- -void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, +void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, const SvxBorderLine* pSrcLine, - BOOL bColor ) + BOOL bColor ) { if ( pSrcLine && pDestLine ) { if ( bColor ) { - rLine.SetColor ( pSrcLine->GetColor() ); - rLine.SetOutWidth ( pDestLine->GetOutWidth() ); - rLine.SetInWidth ( pDestLine->GetInWidth() ); - rLine.SetDistance ( pDestLine->GetDistance() ); - rLine.SetStyle ( pDestLine->GetStyle() ); + rLine.SetColor ( pSrcLine->GetColor() ); + rLine.SetOutWidth ( pDestLine->GetOutWidth() ); + rLine.SetInWidth ( pDestLine->GetInWidth() ); + rLine.SetDistance ( pDestLine->GetDistance() ); + rLine.SetStyle ( pDestLine->GetStyle() ); } else { - rLine.SetColor ( pDestLine->GetColor() ); - rLine.SetOutWidth ( pSrcLine->GetOutWidth() ); - rLine.SetInWidth ( pSrcLine->GetInWidth() ); - rLine.SetDistance ( pSrcLine->GetDistance() ); - rLine.SetStyle ( pSrcLine->GetStyle() ); + rLine.SetColor ( pDestLine->GetColor() ); + rLine.SetOutWidth ( pSrcLine->GetOutWidth() ); + rLine.SetInWidth ( pSrcLine->GetInWidth() ); + rLine.SetDistance ( pSrcLine->GetDistance() ); + rLine.SetStyle ( pSrcLine->GetStyle() ); } } } #define SET_LINE_ATTRIBUTES(LINE,BOXLINE) \ - pBoxLine = aBoxItem.Get##LINE(); \ - if ( pBoxLine ) \ - { \ - if ( pLine ) \ - { \ - UpdateLineAttrs( aLine, pBoxLine, pLine, bColorOnly ); \ - aBoxItem.SetLine( &aLine, BOXLINE ); \ - } \ - else \ - aBoxItem.SetLine( NULL, BOXLINE ); \ + pBoxLine = aBoxItem.Get##LINE(); \ + if ( pBoxLine ) \ + { \ + if ( pLine ) \ + { \ + UpdateLineAttrs( aLine, pBoxLine, pLine, bColorOnly ); \ + aBoxItem.SetLine( &aLine, BOXLINE ); \ + } \ + else \ + aBoxItem.SetLine( NULL, BOXLINE ); \ } @@ -3027,14 +3027,14 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, return; } - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); ScMarkData aFuncMark( GetViewData()->GetMarkData() ); // local copy for UnmarkFiltered ScViewUtil::UnmarkFiltered( aFuncMark, pDoc ); - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - const ScPatternAttr* pSelAttrs = GetSelectionPattern(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + const ScPatternAttr* pSelAttrs = GetSelectionPattern(); const SfxItemSet& rSelItemSet = pSelAttrs->GetItemSet(); - const SfxPoolItem* pBorderAttr = NULL; + const SfxPoolItem* pBorderAttr = NULL; SfxItemState eItemState = rSelItemSet.GetItemState( ATTR_BORDER, TRUE, &pBorderAttr ); const SfxPoolItem* pTLBRItem = 0; @@ -3049,18 +3049,18 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, // none of the lines don't care? if( (eItemState != SFX_ITEM_DONTCARE) && (eTLBRState != SFX_ITEM_DONTCARE) && (eBLTRState != SFX_ITEM_DONTCARE) ) { - SfxItemSet* pOldSet = new SfxItemSet( + SfxItemSet* pOldSet = new SfxItemSet( *(pDoc->GetPool()), ATTR_PATTERN_START, ATTR_PATTERN_END ); - SfxItemSet* pNewSet = new SfxItemSet( + SfxItemSet* pNewSet = new SfxItemSet( *(pDoc->GetPool()), ATTR_PATTERN_START, ATTR_PATTERN_END ); //------------------------------------------------------------ - const SvxBorderLine* pBoxLine = NULL; - SvxBorderLine aLine; + const SvxBorderLine* pBoxLine = NULL; + SvxBorderLine aLine; // hier wird die pBoxLine benutzt: @@ -3137,10 +3137,10 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew ) { ScDocument* pDoc = GetViewData()->GetDocument(); - ULONG nIndex = pDoc->AddCondFormat(rNew); // dafuer gibt's kein Undo + ULONG nIndex = pDoc->AddCondFormat(rNew); // dafuer gibt's kein Undo SfxUInt32Item aItem( ATTR_CONDITIONAL, nIndex ); - ApplyAttr( aItem ); // mit Paint und Undo... + ApplyAttr( aItem ); // mit Paint und Undo... } @@ -3149,10 +3149,10 @@ void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew ) void ScViewFunc::SetValidation( const ScValidationData& rNew ) { ScDocument* pDoc = GetViewData()->GetDocument(); - ULONG nIndex = pDoc->AddValidationEntry(rNew); // dafuer gibt's kein Undo + ULONG nIndex = pDoc->AddValidationEntry(rNew); // dafuer gibt's kein Undo SfxUInt32Item aItem( ATTR_VALIDDATA, nIndex ); - ApplyAttr( aItem ); // mit Paint und Undo... + ApplyAttr( aItem ); // mit Paint und Undo... } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index a3096463d544..69d608d4a7ee 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -134,7 +134,7 @@ //#define _SI_NOCONTROL #define _SVBOXITM_HXX -#define _SVCONTNR_HXX // +#define _SVCONTNR_HXX // #define _SDR_NOTRANSFORM @@ -198,7 +198,7 @@ #include "drwtrans.hxx" #include "rangenam.hxx" #include "dbcolect.hxx" -#include "impex.hxx" // Sylk-ID fuer CB +#include "impex.hxx" // Sylk-ID fuer CB #include "chgtrack.hxx" #include "waitoff.hxx" #include "scmod.hxx" @@ -220,33 +220,33 @@ using namespace com::sun::star; //============================================================================ -// GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx +// GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx //---------------------------------------------------------------------------- -// C U T +// C U T void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) { UpdateInputLine(); ScEditableTester aTester( this ); - if (!aTester.IsEditable()) // selection editable? + if (!aTester.IsEditable()) // selection editable? { ErrorMessage( aTester.GetMessageId() ); return; } - ScRange aRange; // zu loeschender Bereich + ScRange aRange; // zu loeschender Bereich if ( GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE ) { ScDocument* pDoc = GetViewData()->GetDocument(); ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScMarkData& rMark = GetViewData()->GetMarkData(); - const BOOL bRecord(pDoc->IsUndoEnabled()); // Undo/Redo + const BOOL bRecord(pDoc->IsUndoEnabled()); // Undo/Redo ScDocShellModificator aModificator( *pDocSh ); - if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) // mark the range if not marked yet + if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) // mark the range if not marked yet { DoneBlockMode(); InitOwnBlockMode(); @@ -254,9 +254,9 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) MarkDataChanged(); } - CopyToClip( pClipDoc, TRUE, FALSE, bIncludeObjects ); // Ab ins Clipboard + CopyToClip( pClipDoc, TRUE, FALSE, bIncludeObjects ); // Ab ins Clipboard - ScAddress aOldEnd( aRange.aEnd ); // Zusammengefasste Zellen im Bereich? + ScAddress aOldEnd( aRange.aEnd ); // Zusammengefasste Zellen im Bereich? pDoc->ExtendMerge( aRange, TRUE ); ScDocument* pUndoDoc = NULL; @@ -275,7 +275,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) USHORT nExtFlags = 0; pDocSh->UpdatePaintExt( nExtFlags, aRange ); - HideCursor(); // Cursor aendert sich ! + HideCursor(); // Cursor aendert sich ! rMark.MarkToMulti(); pDoc->DeleteSelection( IDF_ALL, rMark ); @@ -286,12 +286,12 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) if ( !AdjustRowHeight( aRange.aStart.Row(), aRange.aEnd.Row() ) ) pDocSh->PostPaint( aRange, PAINT_GRID, nExtFlags ); - if ( bRecord ) // erst jetzt ist Draw-Undo verfuegbar + if ( bRecord ) // erst jetzt ist Draw-Undo verfuegbar pDocSh->GetUndoManager()->AddUndoAction( new ScUndoCut( pDocSh, aRange, aOldEnd, rMark, pUndoDoc ) ); aModificator.SetDocumentModified(); - ShowCursor(); // Cursor aendert sich ! + ShowCursor(); // Cursor aendert sich ! pDocSh->UpdateOle(GetViewData()); CellContentChanged(); @@ -302,7 +302,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) //---------------------------------------------------------------------------- -// C O P Y +// C O P Y BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bIncludeObjects, BOOL bStopEdit ) { @@ -322,17 +322,17 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI rMark ) ) { BOOL bSysClip = FALSE; - if ( !pClipDoc ) // no clip doc specified + if ( !pClipDoc ) // no clip doc specified { - pClipDoc = new ScDocument( SCDOCMODE_CLIP ); // create one (deleted by ScTransferObj) - bSysClip = TRUE; // and copy into system + pClipDoc = new ScDocument( SCDOCMODE_CLIP ); // create one (deleted by ScTransferObj) + bSysClip = TRUE; // and copy into system } if ( !bCut ) { ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack(); if ( pChangeTrack ) - pChangeTrack->ResetLastCut(); // kein CutMode mehr + pChangeTrack->ResetLastCut(); // kein CutMode mehr } if ( bSysClip && bIncludeObjects ) @@ -366,11 +366,11 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI if ( ScGlobal::pDrawClipDocShellRef ) { SfxObjectShellRef aPersistRef( &(*ScGlobal::pDrawClipDocShellRef) ); - pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive + pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive } - pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard - SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard + pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard + SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard } bDone = TRUE; @@ -468,7 +468,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack(); if ( pChangeTrack ) - pChangeTrack->ResetLastCut(); // kein CutMode mehr + pChangeTrack->ResetLastCut(); // kein CutMode mehr { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -483,11 +483,11 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI if ( ScGlobal::pDrawClipDocShellRef ) { SfxObjectShellRef aPersistRef( &(*ScGlobal::pDrawClipDocShellRef) ); - pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive + pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive } - pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard - SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard + pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard + SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard } bSuccess = true; @@ -614,7 +614,7 @@ ScTransferObj* ScViewFunc::CopyToTransferable() } //---------------------------------------------------------------------------- -// P A S T E +// P A S T E void ScViewFunc::PasteDraw() { @@ -644,7 +644,7 @@ void ScViewFunc::PasteFromSystem() uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip ); PasteFromClip( IDF_ALL, pOwnClip->GetDocument(), PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE, - TRUE ); // allow warning dialog + TRUE ); // allow warning dialog } else if (pDrawClip) PasteDraw(); @@ -652,15 +652,15 @@ void ScViewFunc::PasteFromSystem() { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); -// if (pClipObj.Is()) +// if (pClipObj.Is()) { ULONG nBiff8 = SotExchange::RegisterFormatName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff8"))); ULONG nBiff5 = SotExchange::RegisterFormatName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5"))); - // als erstes SvDraw-Model, dann Grafik - // (Grafik darf nur bei einzelner Grafik drinstehen) + // als erstes SvDraw-Model, dann Grafik + // (Grafik darf nur bei einzelner Grafik drinstehen) if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING )) { @@ -678,11 +678,11 @@ void ScViewFunc::PasteFromSystem() PasteFromSystem( SOT_FORMATSTR_ID_SVXB ); else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE )) { - // If it's a Writer object, insert RTF instead of OLE + // If it's a Writer object, insert RTF instead of OLE - // Else, if the class id is all-zero, and SYLK is available, - // it probably is spreadsheet cells that have been put - // on the clipboard by OOo, so use the SYLK. (fdo#31077) + // Else, if the class id is all-zero, and SYLK is available, + // it probably is spreadsheet cells that have been put + // on the clipboard by OOo, so use the SYLK. (fdo#31077) BOOL bDoRtf = FALSE; TransferableObjectDescriptor aObjDesc; @@ -729,15 +729,15 @@ void ScViewFunc::PasteFromSystem() PasteFromSystem( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ); else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE_OLE )) PasteFromSystem( SOT_FORMATSTR_ID_LINK_SOURCE_OLE ); -// else -// ErrorMessage(STR_PASTE_ERROR); +// else +// ErrorMessage(STR_PASTE_ERROR); } -// else -// ErrorMessage(STR_PASTE_ERROR); +// else +// ErrorMessage(STR_PASTE_ERROR); } - // keine Fehlermeldung, weil SID_PASTE in der idl das FastCall-Flag hat, - // also auch gerufen wird, wenn nichts im Clipboard steht (#42531#) + // keine Fehlermeldung, weil SID_PASTE in der idl das FastCall-Flag hat, + // also auch gerufen wird, wenn nichts im Clipboard steht (#42531#) } void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTransferable>& rxTransferable ) @@ -762,7 +762,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran { PasteFromClip( IDF_ALL, pOwnClip->GetDocument(), PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE, - TRUE ); // allow warning dialog + TRUE ); // allow warning dialog } else if (pDrawClip) { @@ -782,8 +782,8 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran ULONG nBiff5 = SotExchange::RegisterFormatName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5"))); ULONG nFormatId = 0; - // als erstes SvDraw-Model, dann Grafik - // (Grafik darf nur bei einzelner Grafik drinstehen) + // als erstes SvDraw-Model, dann Grafik + // (Grafik darf nur bei einzelner Grafik drinstehen) if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING )) nFormatId = SOT_FORMATSTR_ID_DRAWING; @@ -791,7 +791,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran nFormatId = SOT_FORMATSTR_ID_SVXB; else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE )) { - // If it's a Writer object, insert RTF instead of OLE + // If it's a Writer object, insert RTF instead of OLE BOOL bDoRtf = FALSE; TransferableObjectDescriptor aObjDesc; if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) ) @@ -857,7 +857,7 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi ) uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip ); PasteFromClip( IDF_ALL, pOwnClip->GetDocument(), PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE, - !bApi ); // allow warning dialog + !bApi ); // allow warning dialog } else { @@ -867,7 +867,7 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi ) bRet = PasteDataFormat( nFormatId, aDataHelper.GetTransferable(), GetViewData()->GetCurX(), GetViewData()->GetCurY(), - NULL, FALSE, !bApi ); // allow warning dialog + NULL, FALSE, !bApi ); // allow warning dialog if ( !bRet && !bApi ) ErrorMessage(STR_PASTE_ERROR); @@ -877,7 +877,7 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi ) //---------------------------------------------------------------------------- -// P A S T E +// P A S T E BOOL ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTransferable>& rxTransferable, SdrObject* pHitObj, BOOL bLink ) @@ -911,7 +911,7 @@ BOOL ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTransfer } else { - // ham' wa noch nich + // ham' wa noch nich } return bRet; } @@ -927,10 +927,10 @@ BOOL lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, } // -// Einfuegen auf Tabelle: +// Einfuegen auf Tabelle: // -// internes Paste +// internes Paste namespace { @@ -969,7 +969,7 @@ bool lcl_checkDestRangeForOverwrite(const ScRange& rDestRange, const ScDocument* ScReplaceWarnBox aBox(pParentWnd); if (aBox.Execute() != RET_YES) { - // changing the configuration is within the ScReplaceWarnBox + // changing the configuration is within the ScReplaceWarnBox return false; } } @@ -990,7 +990,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, return FALSE; } - // fuer Undo etc. immer alle oder keine Inhalte sichern + // fuer Undo etc. immer alle oder keine Inhalte sichern USHORT nContFlags = IDF_NONE; if (nFlags & IDF_CONTENTS) nContFlags |= IDF_CONTENTS; @@ -1009,13 +1009,13 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, nFlags, pClipDoc, nFunction, bSkipEmpty, bTranspose, bAsLink, bAllowDialogs, eMoveMode, nContFlags, nUndoFlags); - BOOL bCutMode = pClipDoc->IsCutMode(); // if transposing, take from original clipdoc + BOOL bCutMode = pClipDoc->IsCutMode(); // if transposing, take from original clipdoc BOOL bIncludeFiltered = bCutMode; // paste drawing: also if IDF_NOTE is set (to create drawing layer for note captions) BOOL bPasteDraw = ( pClipDoc->GetDrawLayer() && ( nFlags & (IDF_OBJECTS|IDF_NOTE) ) ); - ScDocShellRef aTransShellRef; // for objects in xTransClip - must remain valid as long as xTransClip + ScDocShellRef aTransShellRef; // for objects in xTransClip - must remain valid as long as xTransClip ScDocument* pOrigClipDoc = NULL; ::std::auto_ptr< ScDocument > xTransClip; if ( bTranspose ) @@ -1025,16 +1025,16 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, // include filtered rows until TransposeClip can skip them bIncludeFiltered = TRUE; pClipDoc->GetClipArea( nX, nY, TRUE ); - if ( nY > static_cast<sal_Int32>(MAXCOL) ) // zuviele Zeilen zum Transponieren + if ( nY > static_cast<sal_Int32>(MAXCOL) ) // zuviele Zeilen zum Transponieren { ErrorMessage(STR_PASTE_FULL); return FALSE; } - pOrigClipDoc = pClipDoc; // fuer Referenzen + pOrigClipDoc = pClipDoc; // fuer Referenzen if ( bPasteDraw ) { - aTransShellRef = new ScDocShell; // DocShell needs a Ref immediately + aTransShellRef = new ScDocShell; // DocShell needs a Ref immediately aTransShellRef->DoInitNew(NULL); } ScDrawLayer::SetGlobalDrawPersist(aTransShellRef); @@ -1054,9 +1054,9 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, SCTAB nEndTab; SCCOL nClipSizeX; SCROW nClipSizeY; - pClipDoc->GetClipArea( nClipSizeX, nClipSizeY, TRUE ); // size in clipboard doc + pClipDoc->GetClipArea( nClipSizeX, nClipSizeY, TRUE ); // size in clipboard doc - // size in target doc: include filtered rows only if CutMode is set + // size in target doc: include filtered rows only if CutMode is set SCCOL nDestSizeX; SCROW nDestSizeY; pClipDoc->GetClipArea( nDestSizeX, nDestSizeY, bIncludeFiltered ); @@ -1138,10 +1138,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, SCCOL nBlockAddX = nEndCol-nStartCol; SCROW nBlockAddY = nEndRow-nStartRow; - // #58422# Nachfrage, wenn die Selektion groesser als 1 Zeile/Spalte, aber kleiner - // als das Clipboard ist (dann wird ueber die Selektion hinaus eingefuegt) + // #58422# Nachfrage, wenn die Selektion groesser als 1 Zeile/Spalte, aber kleiner + // als das Clipboard ist (dann wird ueber die Selektion hinaus eingefuegt) - // ClipSize is not size, but difference + // ClipSize is not size, but difference if ( ( nBlockAddX != 0 && nBlockAddX < nDestSizeX ) || ( nBlockAddY != 0 && nBlockAddY < nDestSizeY ) || ( bMarkIsFiltered && nUnfilteredRows < nDestSizeY+1 ) ) @@ -1157,12 +1157,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, } if (nBlockAddX > nDestSizeX) - nMarkAddX = nBlockAddX - nDestSizeX; // fuer Merge-Test + nMarkAddX = nBlockAddX - nDestSizeX; // fuer Merge-Test else nEndCol = nStartCol + nDestSizeX; if (nBlockAddY > nDestSizeY) - nMarkAddY = nBlockAddY - nDestSizeY; // fuer Merge-Test + nMarkAddY = nBlockAddY - nDestSizeY; // fuer Merge-Test else { nEndRow = nStartRow + nDestSizeY; @@ -1205,26 +1205,26 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, bool bOffLimits = !ValidCol(nEndCol) || !ValidRow(nEndRow); - // Zielbereich, wie er angezeigt wird: + // Zielbereich, wie er angezeigt wird: ScRange aUserRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); - // Sollen Zellen eingefuegt werden? - // (zu grosse nEndCol/nEndRow werden weiter unten erkannt) + // Sollen Zellen eingefuegt werden? + // (zu grosse nEndCol/nEndRow werden weiter unten erkannt) BOOL bInsertCells = ( eMoveMode != INS_NONE && !bOffLimits ); if ( bInsertCells ) { - // #94115# Instead of EnterListAction, the paste undo action is merged into the - // insert action, so Repeat can insert the right cells + // #94115# Instead of EnterListAction, the paste undo action is merged into the + // insert action, so Repeat can insert the right cells - MarkRange( aUserRange ); // wird vor CopyFromClip sowieso gesetzt + MarkRange( aUserRange ); // wird vor CopyFromClip sowieso gesetzt // #72930# CutMode is reset on insertion of cols/rows but needed again on cell move BOOL bCut = pClipDoc->IsCutMode(); - if (!InsertCells( eMoveMode, bRecord, TRUE )) // is inserting possible? + if (!InsertCells( eMoveMode, bRecord, TRUE )) // is inserting possible? { return FALSE; - // #i21036# EnterListAction isn't used, and InsertCells doesn't insert - // its undo action on failure, so no undo handling is needed here + // #i21036# EnterListAction isn't used, and InsertCells doesn't insert + // its undo action on failure, so no undo handling is needed here } if ( bCut ) pClipDoc->SetCutMode( bCut ); @@ -1242,11 +1242,11 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, } } - SCCOL nClipStartX; // Clipboard-Bereich erweitern + SCCOL nClipStartX; // Clipboard-Bereich erweitern SCROW nClipStartY; pClipDoc->GetClipStart( nClipStartX, nClipStartY ); SCCOL nUndoEndCol = nClipStartX + nClipSizeX; - SCROW nUndoEndRow = nClipStartY + nClipSizeY; // end of source area in clipboard document + SCROW nUndoEndRow = nClipStartY + nClipSizeY; // end of source area in clipboard document BOOL bClipOver = FALSE; // #i68690# ExtendMerge for the clip doc must be called with the clipboard's sheet numbers. // The same end column/row can be used for all calls because the clip doc doesn't contain @@ -1256,15 +1256,15 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, if ( pClipDoc->ExtendMerge( nClipStartX,nClipStartY, nUndoEndCol,nUndoEndRow, nClipTab, FALSE ) ) bClipOver = TRUE; nUndoEndCol -= nClipStartX + nClipSizeX; - nUndoEndRow -= nClipStartY + nClipSizeY; // now contains only the difference added by ExtendMerge + nUndoEndRow -= nClipStartY + nClipSizeY; // now contains only the difference added by ExtendMerge nUndoEndCol = sal::static_int_cast<SCCOL>( nUndoEndCol + nEndCol ); nUndoEndRow = sal::static_int_cast<SCROW>( nUndoEndRow + nEndRow ); // destination area, expanded for merged cells -// if (nUndoEndCol < nEndCol) nUndoEndCol = nEndCol; -// if (nUndoEndRow < nEndRow) nUndoEndRow = nEndRow; +// if (nUndoEndCol < nEndCol) nUndoEndCol = nEndCol; +// if (nUndoEndRow < nEndRow) nUndoEndRow = nEndRow; -// nUndoEndCol += nMarkAddX; -// nUndoEndRow += nMarkAddY; +// nUndoEndCol += nMarkAddX; +// nUndoEndRow += nMarkAddY; if (nUndoEndCol>MAXCOL || nUndoEndRow>MAXROW) { @@ -1274,7 +1274,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, pDoc->ExtendMergeSel( nStartCol,nStartRow, nUndoEndCol,nUndoEndRow, aFilteredMark, FALSE ); - // Test auf Zellschutz + // Test auf Zellschutz ScEditableTester aTester( pDoc, nStartTab, nStartCol,nStartRow, nUndoEndCol,nUndoEndRow ); if (!aTester.IsEditable()) @@ -1286,8 +1286,8 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, //! Test auf Ueberlappung //! nur wirkliche Schnittmenge testen !!!!!!! - // pDoc->HasCommonAttr( StartCol,nStartRow, nUndoEndCol,nUndoEndRow, nStartTab, - // pClipDoc, nClipStartX, nClipStartY ); + // pDoc->HasCommonAttr( StartCol,nStartRow, nUndoEndCol,nUndoEndRow, nStartTab, + // pClipDoc, nClipStartX, nClipStartY ); ScDocFunc& rDocFunc = pDocSh->GetDocFunc(); if ( bRecord ) @@ -1324,15 +1324,15 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, { ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack(); if ( pChangeTrack ) - pChangeTrack->ResetLastCut(); // kein CutMode mehr + pChangeTrack->ResetLastCut(); // kein CutMode mehr } BOOL bColInfo = ( nStartRow==0 && nEndRow==MAXROW ); BOOL bRowInfo = ( nStartCol==0 && nEndCol==MAXCOL ); - ScDocument* pUndoDoc = NULL; + ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; - ScDocument* pRedoDoc = NULL; + ScDocument* pRedoDoc = NULL; ScRefUndoData* pUndoData = NULL; if ( bRecord ) @@ -1356,7 +1356,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, USHORT nExtFlags = 0; pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); // content before the change + nEndCol, nEndRow, nEndTab ); // content before the change if (GetViewData()->IsActive()) { @@ -1366,11 +1366,11 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, rMark.SetMarkArea( aUserRange ); MarkDataChanged(); - HideCursor(); // Cursor aendert sich ! + HideCursor(); // Cursor aendert sich ! // - // Aus Clipboard kopieren, - // wenn gerechnet werden soll, Originaldaten merken + // Aus Clipboard kopieren, + // wenn gerechnet werden soll, Originaldaten merken // ScDocument* pMixDoc = NULL; @@ -1397,7 +1397,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, USHORT nNoObjFlags = nFlags & ~IDF_OBJECTS; if (!bAsLink) { - // copy normally (original range) + // copy normally (original range) pDoc->CopyFromClip( aUserRange, aFilteredMark, nNoObjFlags, pRefUndoDoc, pClipDoc, TRUE, FALSE, bIncludeFiltered, bSkipEmpty, (bMarkIsFiltered ? &aRangeList : NULL) ); @@ -1408,13 +1408,13 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, } else if (!bTranspose) { - // copy with bAsLink=TRUE + // copy with bAsLink=TRUE pDoc->CopyFromClip( aUserRange, aFilteredMark, nNoObjFlags, pRefUndoDoc, pClipDoc, TRUE, TRUE, bIncludeFiltered, bSkipEmpty ); } else { - // alle Inhalte kopieren (im TransClipDoc stehen nur Formeln) + // alle Inhalte kopieren (im TransClipDoc stehen nur Formeln) pDoc->CopyFromClip( aUserRange, aFilteredMark, nContFlags, pRefUndoDoc, pClipDoc ); } @@ -1425,17 +1425,17 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, aFilteredMark, TRUE ); // Refresh // und Bereich neu - if ( pMixDoc ) // Rechenfunktionen mit Original-Daten auszufuehren ? + if ( pMixDoc ) // Rechenfunktionen mit Original-Daten auszufuehren ? { pDoc->MixDocument( aUserRange, nFunction, bSkipEmpty, pMixDoc ); } delete pMixDoc; - AdjustBlockHeight(); // update row heights before pasting objects + AdjustBlockHeight(); // update row heights before pasting objects if ( nFlags & IDF_OBJECTS ) { - // Paste the drawing objects after the row heights have been updated. + // Paste the drawing objects after the row heights have been updated. pDoc->CopyFromClip( aUserRange, aFilteredMark, IDF_OBJECTS, pRefUndoDoc, pClipDoc, TRUE, FALSE, bIncludeFiltered ); @@ -1446,10 +1446,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, // pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); // content after the change + nEndCol, nEndRow, nEndTab ); // content after the change - // ggf. Autofilter-Koepfe loeschen + // ggf. Autofilter-Koepfe loeschen if (bCutMode) if (pDoc->RefreshAutoFilter( nClipStartX,nClipStartY, nClipStartX+nClipSizeX, nClipStartY+nClipSizeY, nStartTab )) @@ -1457,9 +1457,9 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, nClipStartX+nClipSizeX,nClipStartY,nStartTab, PAINT_GRID ); - ShowCursor(); // Cursor aendert sich ! + ShowCursor(); // Cursor aendert sich ! - //! Block-Bereich bei RefUndoDoc weglassen !!! + //! Block-Bereich bei RefUndoDoc weglassen !!! if ( bRecord ) { @@ -1471,13 +1471,13 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); pRedoDoc->InitUndo( pDoc, nStartTab, nEndTab, bColInfo, bRowInfo ); - // angepasste Referenzen ins Redo-Doc + // angepasste Referenzen ins Redo-Doc SCTAB nTabCount = pDoc->GetTableCount(); pRedoDoc->AddUndoTab( 0, nTabCount-1 ); pDoc->CopyUpdated( pRefUndoDoc, pRedoDoc ); - // alte Referenzen ins Undo-Doc + // alte Referenzen ins Undo-Doc //! Tabellen selektieren ? pUndoDoc->AddUndoTab( 0, nTabCount-1 ); @@ -1487,10 +1487,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, delete pRefUndoDoc; } - // DeleteUnchanged for pUndoData is in ScUndoPaste ctor, - // UndoData for redo is made during first undo + // DeleteUnchanged for pUndoData is in ScUndoPaste ctor, + // UndoData for redo is made during first undo - ScUndoPasteOptions aOptions; // store options for repeat + ScUndoPasteOptions aOptions; // store options for repeat aOptions.nFunction = nFunction; aOptions.bSkipEmpty = bSkipEmpty; aOptions.bTranspose = bTranspose; @@ -1502,12 +1502,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, nUndoEndCol, nUndoEndRow, nEndTab, aFilteredMark, pUndoDoc, pRedoDoc, nFlags | nUndoFlags, pUndoData, NULL, NULL, NULL, - FALSE, &aOptions ); // FALSE = Redo data not yet copied + FALSE, &aOptions ); // FALSE = Redo data not yet copied if ( bInsertCells ) { - // Merge the paste undo action into the insert action. - // Use ScUndoWrapper so the ScUndoPaste pointer can be stored in the insert action. + // Merge the paste undo action into the insert action. + // Use ScUndoWrapper so the ScUndoPaste pointer can be stored in the insert action. pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), TRUE ); } @@ -1520,12 +1520,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, if (bColInfo) { nPaint |= PAINT_TOP; - nUndoEndCol = MAXCOL; // nur zum Zeichnen ! + nUndoEndCol = MAXCOL; // nur zum Zeichnen ! } if (bRowInfo) { nPaint |= PAINT_LEFT; - nUndoEndRow = MAXROW; // nur zum Zeichnen ! + nUndoEndRow = MAXROW; // nur zum Zeichnen ! } pDocSh->PostPaint( nStartCol, nStartRow, nStartTab, nUndoEndCol, nUndoEndRow, nEndTab, nPaint, nExtFlags ); @@ -1730,22 +1730,22 @@ void ScViewFunc::PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData& //---------------------------------------------------------------------------- -// D R A G A N D D R O P +// D R A G A N D D R O P // -// innerhalb des Dokuments +// innerhalb des Dokuments BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); - HideAllCursors(); // wegen zusammengefassten + HideAllCursors(); // wegen zusammengefassten BOOL bSuccess = TRUE; SCTAB nDestTab = rDestPos.Tab(); const ScMarkData& rMark = GetViewData()->GetMarkData(); if ( rSource.aStart.Tab() == nDestTab && rSource.aEnd.Tab() == nDestTab && rMark.GetSelectCount() > 1 ) { - // moving within one table and several tables selected -> apply to all selected tables + // moving within one table and several tables selected -> apply to all selected tables if ( bRecord ) { @@ -1753,7 +1753,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo ); } - // collect ranges of consecutive selected tables + // collect ranges of consecutive selected tables ScRange aLocalSource = rSource; ScAddress aLocalDest = rDestPos; @@ -1785,7 +1785,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, } else { - // move the block as specified + // move the block as specified bSuccess = pDocSh->GetDocFunc().MoveBlock( rSource, rDestPos, bCut, bRecord, bPaint, bApi ); } @@ -1793,7 +1793,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, ShowAllCursors(); if (bSuccess) { - // Zielbereich markieren + // Zielbereich markieren ScAddress aDestEnd( rDestPos.Col() + rSource.aEnd.Col() - rSource.aStart.Col(), rDestPos.Row() + rSource.aEnd.Row() - rSource.aStart.Row(), @@ -1811,7 +1811,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, aDestEnd.SetRow( rDestPos.Row() + nPastedCount - 1 ); } - MarkRange( ScRange( rDestPos, aDestEnd ), FALSE ); //! FALSE ??? + MarkRange( ScRange( rDestPos, aDestEnd ), FALSE ); //! FALSE ??? pDocSh->UpdateOle(GetViewData()); SelectionChanged(); @@ -1819,11 +1819,11 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, return bSuccess; } -// Link innerhalb des Dokuments +// Link innerhalb des Dokuments BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi ) { - // Test auf Ueberlappung + // Test auf Ueberlappung if ( rSource.aStart.Tab() == rDestPos.Tab() ) { @@ -1839,7 +1839,7 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B } } - // Ausfuehren per Paste + // Ausfuehren per Paste ScDocument* pDoc = GetViewData()->GetDocument(); ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); @@ -1847,16 +1847,16 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B rSource.aEnd.Col(), rSource.aEnd.Row(), rSource.aStart.Tab(), pClipDoc ); - // Zielbereich markieren (Cursor setzen, keine Markierung) + // Zielbereich markieren (Cursor setzen, keine Markierung) if ( GetViewData()->GetTabNo() != rDestPos.Tab() ) SetTabNo( rDestPos.Tab() ); MoveCursorAbs( rDestPos.Col(), rDestPos.Row(), SC_FOLLOW_NONE, FALSE, FALSE ); - // Paste + // Paste - PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, FALSE, FALSE, TRUE ); // als Link + PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, FALSE, FALSE, TRUE ); // als Link delete pClipDoc; diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 52fe04459ad8..58ca33611584 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.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 @@ -207,7 +207,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) aMarkRange = ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); } - ScEditableTester aTester( pDoc, aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), + ScEditableTester aTester( pDoc, aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(),rMark ); if (!aTester.IsEditable()) { @@ -226,7 +226,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) pUndoDoc->InitUndo( pDoc, nTab, nTab ); if ( rMark.GetSelectCount() > 1 ) - { + { for (SCTAB i=0; i<nTabCount; i++) if ( rMark.GetTableSelect(i) && i != nTab ) pUndoDoc->AddUndoTab( i, i ); @@ -264,8 +264,8 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) if (aFinder.GetFound()) { ScAddress aPos = ((ScFormulaCell*)pCell)->aPos; - String aNew = aFinder.GetText(); - ScCompiler aComp( pDoc, aPos); + String aNew = aFinder.GetText(); + ScCompiler aComp( pDoc, aPos); aComp.SetGrammar(pDoc->GetGrammar()); ScTokenArray* pArr = aComp.CompileString( aNew ); ScFormulaCell* pNewCell = new ScFormulaCell( pDoc, aPos, @@ -286,7 +286,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) pRedoDoc->InitUndo( pDoc, nTab, nTab ); if ( rMark.GetSelectCount() > 1 ) - { + { for (SCTAB i=0; i<nTabCount; i++) if ( rMark.GetTableSelect(i) && i != nTab ) pRedoDoc->AddUndoTab( i, i ); @@ -309,7 +309,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) if (!bOk) ErrorMessage(STR_ERR_NOREF); } -// Thesaurus - Undo ok +// Thesaurus - Undo ok void ScViewFunc::DoThesaurus( BOOL bRecord ) { SCCOL nCol; @@ -331,12 +331,12 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) BOOL bIsEditMode = GetViewData()->HasEditView(eWhich); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; - if (bIsEditMode) // Edit-Mode aktiv + if (bIsEditMode) // Edit-Mode aktiv { GetViewData()->GetEditView(eWhich, pEditView, nCol, nRow); pEditSel = new ESelection(pEditView->GetSelection()); SC_MOD()->InputEnterHandler(); - GetViewData()->GetBindings().Update(); // sonst kommt der Sfx durcheinander... + GetViewData()->GetBindings().Update(); // sonst kommt der Sfx durcheinander... } else { @@ -361,12 +361,12 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xSpeller = LinguMgr::GetSpellChecker(); - //! if (...) // thesaurus not available - //! { - //! ErrorMessage(STR_EXPORT_ASCII_WARNING); - //! delete pEditSel; - //! return; - //! } + //! if (...) // thesaurus not available + //! { + //! ErrorMessage(STR_EXPORT_ASCII_WARNING); + //! delete pEditSel; + //! return; + //! } pThesaurusEngine = new ScEditEngineDefaulter( pDoc->GetEnginePool() ); pThesaurusEngine->SetEditTextObjectPool( pDoc->GetEditPool() ); @@ -374,7 +374,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) pThesaurusEngine->SetSpeller(xSpeller); MakeEditView(pThesaurusEngine, nCol, nRow ); const ScPatternAttr* pPattern = NULL; - SfxItemSet* pEditDefaults = new SfxItemSet(pThesaurusEngine->GetEmptyItemSet()); + SfxItemSet* pEditDefaults = new SfxItemSet(pThesaurusEngine->GetEmptyItemSet()); pPattern = pDoc->GetPattern(nCol, nRow, nTab); if (pPattern ) { @@ -410,12 +410,12 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) pThesaurusEngine->ClearModifyFlag(); - // language is now in EditEngine attributes -> no longer passed to StartThesaurus + // language is now in EditEngine attributes -> no longer passed to StartThesaurus eState = pEditView->StartThesaurus(); DBG_ASSERT(eState != EE_SPELL_NOSPELLER, "No SpellChecker"); - if (eState == EE_SPELL_ERRORFOUND) // sollte spaeter durch Wrapper geschehen! + if (eState == EE_SPELL_ERRORFOUND) // sollte spaeter durch Wrapper geschehen! { LanguageType eLnge = ScViewUtil::GetEffLanguage( pDoc, ScAddress( nCol, nRow, nTab ) ); SvtLanguageTable aLangTab; @@ -440,7 +440,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) pDoc->SetString(nCol, nRow, nTab, sNewString); } // erack! it's broadcasted -// pDoc->SetDirty(); +// pDoc->SetDirty(); pDocSh->SetDocumentModified(); if (bRecord) { @@ -604,7 +604,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR } // Pasten von FORMAT_FILE-Items -// wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt +// wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) { @@ -621,7 +621,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) &aMediaURLItem, 0L ) ); } - if (!bLink) // bei bLink nur Grafik oder URL + if (!bLink) // bei bLink nur Grafik oder URL { // 1. Kann ich die Datei oeffnen? const SfxFilter* pFlt = NULL; @@ -657,7 +657,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) Graphic aGraphic; GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); -// GraphicProgress aGraphicProgress(&aGraphicFilter); +// GraphicProgress aGraphicProgress(&aGraphicFilter); if (!pGraphicFilter->ImportGraphic(aGraphic, aURL, GRFILTER_FORMAT_DONTKNOW, &nFilterFormat )) @@ -674,7 +674,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) } } - if (bLink) // bei bLink alles, was nicht Grafik ist, als URL + if (bLink) // bei bLink alles, was nicht Grafik ist, als URL { Rectangle aRect( rPos, Size(0,0) ); ScRange aRange = GetViewData()->GetDocument()-> @@ -733,7 +733,7 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL, nPosX >= pViewData->GetEditStartCol() && nPosX <= pViewData->GetEditEndCol() && nPosY >= pViewData->GetEditStartRow() && nPosY <= pViewData->GetEditEndRow() ) { - // in die gerade editierte Zelle einfuegen + // in die gerade editierte Zelle einfuegen String aTargetFrame; if (pTarget) @@ -742,7 +742,7 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL, return; } - // in nicht editierte Zelle einfuegen + // in nicht editierte Zelle einfuegen ScDocument* pDoc = GetViewData()->GetDocument(); SCTAB nTab = GetViewData()->GetTabNo(); @@ -774,10 +774,10 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL, if ( bTryReplace && HasBookmarkAtCursor( NULL ) ) { - // if called from hyperlink slot and cell contains only a URL, - // replace old URL with new one + // if called from hyperlink slot and cell contains only a URL, + // replace old URL with new one - aInsSel = ESelection( 0, 0, 0, 1 ); // replace first character (field) + aInsSel = ESelection( 0, 0, 0, 1 ); // replace first character (field) } SvxURLField aField( rURL, rDescription, SVXURLFORMAT_APPDEFAULT ); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 5ab159cf7dbc..818b602dad41 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.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 @@ -61,7 +61,7 @@ #include <comphelper/processfactory.hxx> #include <sot/formats.hxx> -#define SOT_FORMATSTR_ID_STARCALC_CURRENT SOT_FORMATSTR_ID_STARCALC_50 +#define SOT_FORMATSTR_ID_STARCALC_CURRENT SOT_FORMATSTR_ID_STARCALC_50 #include "viewfunc.hxx" #include "docsh.hxx" @@ -72,7 +72,7 @@ #include "sc.hrc" #include "filter.hxx" #include "scextopt.hxx" -#include "tabvwsh.hxx" // wegen GetViewFrame +#include "tabvwsh.hxx" // wegen GetViewFrame #include "compiler.hxx" #include "asciiopt.hxx" @@ -93,17 +93,17 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, ScDocument* pDoc = GetViewData()->GetDocument(); pDoc->SetPastingDrawFromOtherDoc( TRUE ); - Point aPos; // inserting position (1/100 mm) + Point aPos; // inserting position (1/100 mm) if (pLogicPos) aPos = *pLogicPos; else { - // inserting position isn't needed for text formats + // inserting position isn't needed for text formats BOOL bIsTextFormat = ( ScImportExport::IsFormatSupported( nFormatId ) || nFormatId == FORMAT_RTF ); if ( !bIsTextFormat ) { - // Window MapMode isn't drawing MapMode if DrawingLayer hasn't been created yet + // Window MapMode isn't drawing MapMode if DrawingLayer hasn't been created yet SCTAB nTab = GetViewData()->GetTabNo(); long nXT = 0; @@ -120,7 +120,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, BOOL bRet = FALSE; // - // handle individual formats + // handle individual formats // if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE || @@ -154,7 +154,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, nSrcTab = 0; ScMarkData aSrcMark; - aSrcMark.SelectOneTable( nSrcTab ); // for CopyToClip + aSrcMark.SelectOneTable( nSrcTab ); // for CopyToClip ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); SCCOL nFirstCol, nLastCol; @@ -300,7 +300,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, //TODO/LATER: if format is not available, create picture } } - else if ( nFormatId == SOT_FORMATSTR_ID_LINK ) // LINK is also in ScImportExport + else if ( nFormatId == SOT_FORMATSTR_ID_LINK ) // LINK is also in ScImportExport { bRet = PasteDDE( rxTransferable ); } @@ -308,7 +308,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, { if ( nFormatId == SOT_FORMAT_RTF && aDataHelper.HasFormat( SOT_FORMATSTR_ID_EDITENGINE ) ) { - // use EditView's PasteSpecial / Drop + // use EditView's PasteSpecial / Drop PasteRTF( nPosX, nPosY, rxTransferable ); bRet = TRUE; } @@ -367,7 +367,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else if (nFormatId == SOT_FORMATSTR_ID_SBA_DATAEXCHANGE) { - // import of database data into table + // import of database data into table String sDataDesc; if ( aDataHelper.GetString( nFormatId, sDataDesc ) ) @@ -377,10 +377,10 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, ScDocShell* pDocSh = GetViewData()->GetDocShell(); SCTAB nTab = GetViewData()->GetTabNo(); - ClickCursor(nPosX, nPosY, FALSE); // set cursor position + ClickCursor(nPosX, nPosY, FALSE); // set cursor position - // Creation of database area "Import1" isn't here, but in the DocShell - // slot execute, so it can be added to the undo action + // Creation of database area "Import1" isn't here, but in the DocShell + // slot execute, so it can be added to the undo action ScDBData* pDBData = pDocSh->GetDBData( ScRange(nPosX,nPosY,nTab), SC_DB_OLD, SC_DBSEL_KEEP ); String sTarget; @@ -406,7 +406,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, pCursorItem.reset(new SfxUsrAnyItem(FN_PARAM_3, aDesc[::svx::daCursor])); } - // asynchronous, to avoid doing the whole import in drop handler + // asynchronous, to avoid doing the whole import in drop handler SfxDispatcher& rDisp = GetViewData()->GetDispatcher(); rDisp.Execute(SID_SBA_IMPORT, SFX_CALLMODE_ASYNCHRON, &aDataDesc, &aTarget, &aAreaNew, pCursorItem.get(), (void*)0 ); @@ -416,7 +416,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else if (nFormatId == SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE) { - // insert database field control + // insert database field control if ( ::svx::OColumnTransferable::canExtractColumnDescriptor( aDataHelper.GetDataFlavorExVector(), CTF_COLUMN_DESCRIPTOR | CTF_CONTROL_EXCHANGE ) ) { @@ -486,7 +486,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, SotStorageStreamRef xStm; if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_DRAWING, xStm ) ) { - MakeDrawLayer(); // before loading model, so 3D factory has been created + MakeDrawLayer(); // before loading model, so 3D factory has been created SvtPathOptions aPathOpt; String aPath = aPathOpt.GetPalettePath(); @@ -518,10 +518,10 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, pObject = aIter.Next(); } - nObjCount += pPage->GetObjCount(); // #105888# count group object only once + nObjCount += pPage->GetObjCount(); // #105888# count group object only once } - PasteDraw( aPos, pModel, (nObjCount > 1) ); // grouped if more than 1 object + PasteDraw( aPos, pModel, (nObjCount > 1) ); // grouped if more than 1 object delete pModel; aDragShellRef->DoClose(); bRet = TRUE; @@ -529,13 +529,13 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else if ( (nFormatId == SOT_FORMATSTR_ID_BIFF_5) || (nFormatId == SOT_FORMATSTR_ID_BIFF_8) ) { - // do excel import into a clipboard document + // do excel import into a clipboard document //TODO/MBA: testing uno::Reference < io::XInputStream > xStm; if( aDataHelper.GetInputStream( nFormatId, xStm ) ) { ScDocument* pInsDoc = new ScDocument( SCDOCMODE_CLIP ); - SCTAB nSrcTab = 0; // Biff5 in clipboard: always sheet 0 + SCTAB nSrcTab = 0; // Biff5 in clipboard: always sheet 0 pInsDoc->ResetClip( pDoc, nSrcTab ); SfxMedium aMed; @@ -557,7 +557,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else { - DBG_ERROR("no dimension"); //! possible? + DBG_ERROR("no dimension"); //! possible? SCCOL nFirstCol, nLastCol; SCROW nFirstRow, nLastRow; if ( pInsDoc->GetDataStart( nSrcTab, nFirstCol, nFirstRow ) ) @@ -639,8 +639,8 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx { TransferableDataHelper aDataHelper( rxTransferable ); - // get link data from transferable before string data, - // so the source knows it will be used for a link + // get link data from transferable before string data, + // so the source knows it will be used for a link uno::Sequence<sal_Int8> aSequence; if ( !aDataHelper.GetSequence( SOT_FORMATSTR_ID_LINK, aSequence ) ) @@ -649,7 +649,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx return FALSE; } - // check size (only if string is available in transferable) + // check size (only if string is available in transferable) USHORT nCols = 1; USHORT nRows = 1; @@ -658,7 +658,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx String aDataStr; if ( aDataHelper.GetString( SOT_FORMAT_STRING, aDataStr ) ) { - // get size from string the same way as in ScDdeLink::DataChanged + // get size from string the same way as in ScDdeLink::DataChanged aDataStr.ConvertLineEnd(LINEEND_LF); xub_StrLen nLen = aDataStr.Len(); @@ -675,7 +675,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx } } - // create formula + // create formula long nSeqLen = aSequence.getLength(); sal_Char* pData = (sal_Char*)aSequence.getConstArray(); @@ -709,7 +709,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx aFormula += aQuote; aFormula += ScCompiler::GetNativeSymbol( ocClose); - // mark range + // mark range SCTAB nTab = GetViewData()->GetTabNo(); SCCOL nCurX = GetViewData()->GetCurX(); @@ -720,7 +720,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx MarkCursor( nCurX+static_cast<SCCOL>(nCols)-1, nCurY+static_cast<SCROW>(nRows)-1, nTab ); ShowAllCursors(); - // enter formula + // enter formula EnterMatrix( aFormula ); CursorPosChanged(); diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 3aaae4e10f0d..13e3da52dc21 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.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 @@ -71,7 +71,7 @@ void ScViewFunc::DetectiveAddPred() if (!bDone) Sound::Beep(); - RecalcPPT(); //! use broadcast in DocFunc instead? + RecalcPPT(); //! use broadcast in DocFunc instead? } void ScViewFunc::DetectiveDelPred() @@ -315,7 +315,7 @@ void ScViewFunc::ShowNote( bool bShow ) void ScViewFunc::EditNote() { - // zum Editieren einblenden und aktivieren + // zum Editieren einblenden und aktivieren ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); @@ -351,7 +351,7 @@ void ScViewFunc::EditNote() GetViewData()->GetDispatcher().Execute( SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD ); // jetzt den erzeugten FuText holen und in den EditModus setzen FuPoor* pPoor = GetDrawFuncPtr(); - if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) ) // hat keine RTTI + if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) ) // hat keine RTTI { ScrollToObject( pCaption ); // Objekt komplett sichtbar machen static_cast< FuText* >( pPoor )->SetInEditMode( pCaption ); diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index b01c7c53da35..a081ef3558f0 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.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 @@ #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/embed/Aspects.hpp> -#include "document.hxx" // fuer MapMode Initialisierung in PasteDraw +#include "document.hxx" // fuer MapMode Initialisierung in PasteDraw #include "viewfunc.hxx" #include "tabvwsh.hxx" #include "drawview.hxx" @@ -70,7 +70,7 @@ using namespace com::sun::star; void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize ) { -// SdrPage* pPage = pData->GetDocument()->GetDrawLayer()->GetPage( pData->GetTabNo() ); +// SdrPage* pPage = pData->GetDocument()->GetDrawLayer()->GetPage( pData->GetTabNo() ); SdrPage* pPage = pData->GetScDrawView()->GetModel()->GetPage( static_cast<sal_uInt16>(pData->GetTabNo()) ); DBG_ASSERT(pPage,"pPage ???"); Size aPgSize( pPage->GetSize() ); @@ -83,7 +83,7 @@ void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize ) rPos.X() += x + 80; if( y < 0 ) rPos.Y() += y + 200; - rPos.X() += rSize.Width() / 2; // Position bei Paste gibt Mittelpunkt an + rPos.X() += rSize.Width() / 2; // Position bei Paste gibt Mittelpunkt an rPos.Y() += rSize.Height() / 2; } @@ -93,8 +93,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, MakeDrawLayer(); Point aPos( rLogicPos ); - // #64184# MapMode am Outliner-RefDevice muss stimmen (wie in FuText::MakeOutliner) - //! mit FuText::MakeOutliner zusammenfassen? + // #64184# MapMode am Outliner-RefDevice muss stimmen (wie in FuText::MakeOutliner) + //! mit FuText::MakeOutliner zusammenfassen? MapMode aOldMapMode; OutputDevice* pRef = GetViewData()->GetDocument()->GetDrawLayer()->GetRefDevice(); if (pRef) @@ -169,7 +169,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, pNeuObj->SetModel(pDrawModel); pNeuObj->SetPage(pDestPage); - // #68787# copy graphics within the same model - always needs new name + // #68787# copy graphics within the same model - always needs new name if ( pNeuObj->ISA(SdrGrafObj) && !bPasteIsMove ) pNeuObj->SetName(((ScDrawLayer*)pDrawModel)->GetNewGraphicName()); @@ -178,8 +178,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, pDestPage->InsertObject( pNeuObj ); pScDrawView->AddUndo(new SdrUndoInsertObj( *pNeuObj )); - // Chart braucht nicht mehr getrennt behandelt zu werden, - // weil es seine Daten jetzt selber hat + // Chart braucht nicht mehr getrennt behandelt zu werden, + // weil es seine Daten jetzt selber hat } } @@ -189,7 +189,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, } else { - bPasteIsMove = FALSE; // kein internes Verschieben passiert + bPasteIsMove = FALSE; // kein internes Verschieben passiert SdrView aView(pModel); // #i71529# never create a base class of SdrView directly! SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0)); @@ -197,8 +197,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, Size aSize = aView.GetAllMarkedRect().GetSize(); lcl_AdjustInsertPos( GetViewData(), aPos, aSize ); - // #41333# Markierung nicht aendern, wenn Ole-Objekt aktiv - // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!) + // #41333# Markierung nicht aendern, wenn Ole-Objekt aktiv + // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!) ULONG nOptions = 0; SfxInPlaceClient* pClient = GetViewData()->GetViewShell()->GetIPClient(); @@ -294,7 +294,7 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X aSz.Height = aSize.Height(); xObj->setVisualAreaSize( nAspect, aSz ); } - + awt::Size aSz; try { @@ -304,9 +304,9 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X { // the default size will be set later } - + aSize = Size( aSz.Width, aSz.Height ); - aSize = OutputDevice::LogicToLogic( aSize, aMapObj, aMap100 ); // fuer SdrOle2Obj + aSize = OutputDevice::LogicToLogic( aSize, aMapObj, aMap100 ); // fuer SdrOle2Obj if( aSize.Height() == 0 || aSize.Width() == 0 ) { @@ -330,7 +330,7 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X SdrOle2Obj* pSdrObj = new SdrOle2Obj( aObjRef, aName, aRect ); SdrPageView* pPV = pDrView->GetSdrPageView(); - pDrView->InsertObjectSafe( pSdrObj, *pPV ); // nicht markieren wenn Ole + pDrView->InsertObjectSafe( pSdrObj, *pPV ); // nicht markieren wenn Ole GetViewData()->GetViewShell()->SetDrawShell( TRUE ); return TRUE; } @@ -365,7 +365,7 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic, if (aSourceMap.GetMapUnit() == MAP_PIXEL) { - // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt + // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt Fraction aScaleX, aScaleY; pScDrawView->CalcNormScale( aScaleX, aScaleY ); @@ -374,7 +374,7 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic, } Size aSize = pWin->LogicToLogic( rGraphic.GetPrefSize(), &aSourceMap, &aDestMap ); -// lcl_AdjustInsertPos( GetViewData(), aPos, aSize ); +// lcl_AdjustInsertPos( GetViewData(), aPos, aSize ); if ( GetViewData()->GetDocument()->IsNegativePage( GetViewData()->GetTabNo() ) ) aPos.X() -= aSize.Width(); @@ -385,10 +385,10 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic, // #118522# calling SetGraphicLink here doesn't work - // #49961# Pfad wird nicht mehr als Name der Grafik gesetzt + // #49961# Pfad wird nicht mehr als Name der Grafik gesetzt ScDrawLayer* pLayer = (ScDrawLayer*) pScDrawView->GetModel(); - String aName = pLayer->GetNewGraphicName(); // "Grafik x" + String aName = pLayer->GetNewGraphicName(); // "Grafik x" pGrafObj->SetName(aName); // nicht markieren wenn Ole diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 2997b71822e5..e928f68aa49a 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.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 @@ -54,7 +54,7 @@ #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> #include <vcl/wrkwin.hxx> -#include <stdlib.h> // qsort +#include <stdlib.h> // qsort #include "viewfunc.hxx" #include "tabvwsh.hxx" @@ -107,11 +107,11 @@ ScViewFunc::~ScViewFunc() void ScViewFunc::StartFormatArea() { - // ueberhaupt aktiviert? + // ueberhaupt aktiviert? if ( !SC_MOD()->GetInputOptions().GetExtendFormat() ) return; - // start only with single cell (marked or cursor position) + // start only with single cell (marked or cursor position) ScRange aMarkRange; BOOL bOk = (GetViewData()->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE); if ( bOk && aMarkRange.aStart != aMarkRange.aEnd ) @@ -124,24 +124,24 @@ void ScViewFunc::StartFormatArea() aFormatArea = ScRange( aFormatSource ); } else - bFormatValid = FALSE; // keinen alten Bereich behalten + bFormatValid = FALSE; // keinen alten Bereich behalten } BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged ) { - // ueberhaupt aktiviert? + // ueberhaupt aktiviert? if ( !SC_MOD()->GetInputOptions().GetExtendFormat() ) return FALSE; - // Test: Eingabe mit Zahlformat (bAttrChanged) immer als neue Attributierung behandeln - // (alte Area verwerfen). Wenn das nicht gewollt ist, den if-Teil weglassen: + // Test: Eingabe mit Zahlformat (bAttrChanged) immer als neue Attributierung behandeln + // (alte Area verwerfen). Wenn das nicht gewollt ist, den if-Teil weglassen: if ( bAttrChanged ) { StartFormatArea(); return FALSE; } - //! Abfrage, ob Zelle leer war ??? + //! Abfrage, ob Zelle leer war ??? BOOL bFound = FALSE; ScRange aNewRange = aFormatArea; @@ -149,18 +149,18 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC { if ( nRow >= aFormatArea.aStart.Row() && nRow <= aFormatArea.aEnd.Row() ) { - // innerhalb ? + // innerhalb ? if ( nCol >= aFormatArea.aStart.Col() && nCol <= aFormatArea.aEnd.Col() ) { - bFound = TRUE; // Bereich nicht aendern + bFound = TRUE; // Bereich nicht aendern } - // links ? + // links ? if ( nCol+1 == aFormatArea.aStart.Col() ) { bFound = TRUE; aNewRange.aStart.SetCol( nCol ); } - // rechts ? + // rechts ? if ( nCol == aFormatArea.aEnd.Col()+1 ) { bFound = TRUE; @@ -169,13 +169,13 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC } if ( nCol >= aFormatArea.aStart.Col() && nCol <= aFormatArea.aEnd.Col() ) { - // oben ? + // oben ? if ( nRow+1 == aFormatArea.aStart.Row() ) { bFound = TRUE; aNewRange.aStart.SetRow( nRow ); } - // unten ? + // unten ? if ( nRow == aFormatArea.aEnd.Row()+1 ) { bFound = TRUE; @@ -185,12 +185,12 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC } if (bFound) - aFormatArea = aNewRange; // erweitern + aFormatArea = aNewRange; // erweitern else { - bFormatValid = FALSE; // ausserhalb -> abbrechen - if ( bAttrChanged ) // Wert mit Zahlformat eingegeben? - StartFormatArea(); // dann ggf. neu starten + bFormatValid = FALSE; // ausserhalb -> abbrechen + if ( bAttrChanged ) // Wert mit Zahlformat eingegeben? + StartFormatArea(); // dann ggf. neu starten } return bFound; @@ -209,7 +209,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( !((const ScMergeAttr&)pSource->GetItem(ATTR_MERGE)).IsMerged() ) { const ScPatternAttr* pDocOld = pDoc->GetPattern( nCol, nRow, nTab ); - // pDocOld ist nur bis zum Apply... gueltig! + // pDocOld ist nur bis zum Apply... gueltig! ScPatternAttr* pOldPattern = NULL; if ( bAddUndo ) @@ -219,7 +219,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( pSrcStyle && pSrcStyle != pDocOld->GetStyleSheet() ) pDoc->ApplyStyle( nCol, nRow, nTab, *pSrcStyle ); pDoc->ApplyPattern( nCol, nRow, nTab, *pSource ); - AdjustRowHeight( nRow, nRow, TRUE ); //! nicht doppelt ? + AdjustRowHeight( nRow, nRow, TRUE ); //! nicht doppelt ? if ( bAddUndo ) { @@ -230,17 +230,17 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, pOldPattern, pNewPattern, pSource, TRUE ) ); - delete pOldPattern; // wird im Undo kopiert (Pool) + delete pOldPattern; // wird im Undo kopiert (Pool) } } - if ( bAttrChanged ) // Wert mit Zahlformat eingegeben? - aFormatSource.Set( nCol, nRow, nTab ); // dann als neue Quelle + if ( bAttrChanged ) // Wert mit Zahlformat eingegeben? + aFormatSource.Set( nCol, nRow, nTab ); // dann als neue Quelle } //------------------------------------------------------------------------------------ -// Hilfsroutinen +// Hilfsroutinen USHORT ScViewFunc::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula ) { @@ -284,7 +284,7 @@ BOOL ScViewFunc::SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) return bRet; } -#ifndef LRU_MAX +#ifndef LRU_MAX #define LRU_MAX 10 #endif @@ -307,22 +307,22 @@ BOOL lcl_AddFunction( ScAppOptions& rAppOpt, USHORT nOpCode ) USHORT* pOldList = rAppOpt.GetLRUFuncList(); USHORT nPos; for (nPos=0; nPos<nOldCount; nPos++) - if (pOldList[nPos] == nOpCode) // is the function already in the list? + if (pOldList[nPos] == nOpCode) // is the function already in the list? { if ( nPos == 0 ) - return FALSE; // already at the top -> no change + return FALSE; // already at the top -> no change - // count doesn't change, so the original array is modified + // count doesn't change, so the original array is modified for (USHORT nCopy=nPos; nCopy>0; nCopy--) pOldList[nCopy] = pOldList[nCopy-1]; pOldList[0] = nOpCode; - return TRUE; // list has changed + return TRUE; // list has changed } if ( !lcl_FunctionKnown( nOpCode ) ) - return FALSE; // not in function list -> no change + return FALSE; // not in function list -> no change USHORT nNewCount = Min( (USHORT)(nOldCount + 1), (USHORT)LRU_MAX ); USHORT nNewList[LRU_MAX]; @@ -331,12 +331,12 @@ BOOL lcl_AddFunction( ScAppOptions& rAppOpt, USHORT nOpCode ) nNewList[nPos] = pOldList[nPos-1]; rAppOpt.SetLRUFuncList( nNewList, nNewCount ); - return TRUE; // list has changed + return TRUE; // list has changed } -// eigentliche Funktionen +// eigentliche Funktionen -// Eingabe - Undo OK +// Eingabe - Undo OK void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, BOOL bRecord, const EditTextObject* pData ) @@ -358,18 +358,18 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS BOOL bEditDeleted = FALSE; BYTE nOldScript = 0; - ScBaseCell** ppOldCells = NULL; - BOOL* pHasFormat = NULL; - ULONG* pOldFormats = NULL; - SCTAB* pTabs = NULL; + ScBaseCell** ppOldCells = NULL; + BOOL* pHasFormat = NULL; + ULONG* pOldFormats = NULL; + SCTAB* pTabs = NULL; SCTAB nUndoPos = 0; EditTextObject* pUndoData = NULL; if ( bRecord ) { - ppOldCells = new ScBaseCell*[nSelCount]; - pHasFormat = new BOOL[nSelCount]; - pOldFormats = new ULONG[nSelCount]; - pTabs = new SCTAB[nSelCount]; + ppOldCells = new ScBaseCell*[nSelCount]; + pHasFormat = new BOOL[nSelCount]; + pOldFormats = new ULONG[nSelCount]; + pTabs = new SCTAB[nSelCount]; nUndoPos = 0; for (i=0; i<nTabCount; i++) @@ -454,7 +454,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS BOOL bNumFmtChanged = FALSE; if ( bFormula ) - { // Formel, compile mit AutoCorrection + { // Formel, compile mit AutoCorrection for (i=0; i<nTabCount; i++) if (rMark.GetTableSelect(i)) break; @@ -477,7 +477,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS ScTokenArray* pArrFirst = pArr = aComp.CompileString( aFormula ); BOOL bCorrected = aComp.IsCorrected(); if ( bCorrected ) - { // probieren, mit erster Parser-Korrektur neu zu parsen + { // probieren, mit erster Parser-Korrektur neu zu parsen pArr = aComp.CompileString( aComp.GetCorrectedFormula() ); } if ( !pArr->GetCodeError() ) @@ -498,7 +498,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS aCorrectedFormula = aComp.GetCorrectedFormula(); short nResult; if ( aCorrectedFormula.Len() == 1 ) - nResult = RET_NO; // leere Formel, nur '=' + nResult = RET_NO; // leere Formel, nur '=' else { String aMessage( ScResId( SCSTR_FORMULA_AUTOCORRECTION ) ); @@ -534,8 +534,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS USHORT nError = pArr->GetCodeError(); if ( !nError ) { - // #68693# update list of recent functions with all functions that - // are not within parentheses + // #68693# update list of recent functions with all functions that + // are not within parentheses ScModule* pScMod = SC_MOD(); ScAppOptions aAppOpt = pScMod->GetAppOptions(); @@ -602,7 +602,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS } pDoc->PutCell( aPos, pCell ); if ( !bAutoCalc ) - { // einmal nur die Zelle berechnen und wieder dirty setzen + { // einmal nur die Zelle berechnen und wieder dirty setzen pCell->Interpret(); pCell->SetDirtyVar(); pDoc->PutInFormulaTree( pCell ); @@ -620,7 +620,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS bNumFmtChanged = TRUE; } - // row height must be changed if new text has a different script type + // row height must be changed if new text has a different script type for (i=0; i<nTabCount && !bEditDeleted; i++) if (rMark.GetTableSelect(i)) if ( pDoc->GetScriptType( nCol, nRow, i ) != nOldScript ) @@ -636,7 +636,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS DoAutoAttributes(nCol, nRow, nTab, bNumFmtChanged, bRecord); if ( bRecord ) - { // wg. ChangeTrack erst jetzt + { // wg. ChangeTrack erst jetzt pDocSh->GetUndoManager()->AddUndoAction( new ScUndoEnterData( pDocSh, nCol, nRow, nTab, nUndoPos, pTabs, ppOldCells, pHasFormat, pOldFormats, @@ -671,11 +671,11 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS else { ErrorMessage(aTester.GetMessageId()); - PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine + PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine } } -// Wert in einzele Zelle eintragen (nur auf nTab) +// Wert in einzele Zelle eintragen (nur auf nTab) void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue ) { @@ -696,7 +696,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r || pDoc->HasAttrib( nCol,nRow,nTab, nCol,nRow,nTab, HASATTR_NEEDHEIGHT ); - // Undo + // Undo ScBaseCell* pUndoCell = (bUndo && pOldCell) ? pOldCell->CloneWithoutNote( *pDoc ) : 0; pDoc->SetValue( nCol, nRow, nTab, rValue ); @@ -708,7 +708,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r new ScUndoEnterValue( pDocSh, aPos, pUndoCell, rValue, bNeedHeight ) ); } -/*! Zeilenhoehe anpassen? Dann auch bei Undo... +/*! Zeilenhoehe anpassen? Dann auch bei Undo... if (bNeedHeight) AdjustRowHeight(nRow,nRow); */ @@ -737,7 +737,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb if (aTester.IsEditable()) { // - // Test auf Attribute + // Test auf Attribute // BOOL bSimple = FALSE; BOOL bCommon = FALSE; @@ -749,7 +749,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb ScTabEditEngine aEngine( *pOldPattern, pDoc->GetEnginePool() ); aEngine.SetText(*pData); - if (bTestSimple) // Testen, ob einfacher String ohne Attribute + if (bTestSimple) // Testen, ob einfacher String ohne Attribute { ScEditAttrTester aAttrTester( &aEngine ); bSimple = !aAttrTester.NeedsObject(); @@ -765,11 +765,11 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb bSimple = TRUE; } - if (bCommon) // Attribute fuer Tabelle + if (bCommon) // Attribute fuer Tabelle { pCellAttrs = new ScPatternAttr( *pOldPattern ); pCellAttrs->GetFromEditItemSet( &aAttrTester.GetAttribs() ); - //! remove common attributes from EditEngine? + //! remove common attributes from EditEngine? } } @@ -777,20 +777,20 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb aString = ScEditUtil::GetSpaceDelimitedString(aEngine); // - // Undo + // Undo // SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nSelCount = rMark.GetSelectCount(); SCTAB i; - ScBaseCell** ppOldCells = NULL; - SCTAB* pTabs = NULL; + ScBaseCell** ppOldCells = NULL; + SCTAB* pTabs = NULL; SCTAB nPos = 0; EditTextObject* pUndoData = NULL; if (bRecord && !bSimple) { - ppOldCells = new ScBaseCell*[nSelCount]; - pTabs = new SCTAB[nSelCount]; + ppOldCells = new ScBaseCell*[nSelCount]; + pTabs = new SCTAB[nSelCount]; nPos = 0; for (i=0; i<nTabCount; i++) @@ -809,11 +809,11 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb } // - // Daten eintragen + // Daten eintragen // if (bCommon) - pDoc->ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! Undo + pDoc->ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! Undo if (bSimple) { @@ -829,7 +829,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb pDoc->PutCell( nCol, nRow, i, new ScEditCell( pData, pDoc, NULL ) ); if ( bRecord ) - { // wg. ChangeTrack erst jetzt + { // wg. ChangeTrack erst jetzt pDocSh->GetUndoManager()->AddUndoAction( new ScUndoEnterData( pDocSh, nCol, nRow, nTab, nPos, pTabs, ppOldCells, NULL, NULL, aString, @@ -872,7 +872,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb else { ErrorMessage(aTester.GetMessageId()); - PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine + PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine } } @@ -891,8 +891,8 @@ void ScViewFunc::EnterMatrix( const String& rString ) const ScMarkData& rMark = pData->GetMarkData(); if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) { - // nichts markiert -> automatisch Block mit Groesse des Ergebnisses - // Formel temporaer berechnen, um an die Groesse heranzukommen + // nichts markiert -> automatisch Block mit Groesse des Ergebnisses + // Formel temporaer berechnen, um an die Groesse heranzukommen ScDocument* pDoc = pData->GetDocument(); SCCOL nCol = pData->GetCurX(); @@ -972,7 +972,7 @@ const ScPatternAttr* ScViewFunc::GetSelectionPattern() ScDocument* pDoc = GetViewData()->GetDocument(); if ( rMark.IsMarked() || rMark.IsMultiMarked() ) { - // MarkToMulti is no longer necessary for pDoc->GetSelectionPattern + // MarkToMulti is no longer necessary for pDoc->GetSelectionPattern const ScPatternAttr* pAttr = pDoc->GetSelectionPattern( rMark ); return pAttr; } @@ -982,15 +982,15 @@ const ScPatternAttr* ScViewFunc::GetSelectionPattern() SCROW nRow = GetViewData()->GetCurY(); SCTAB nTab = GetViewData()->GetTabNo(); - ScMarkData aTempMark( rMark ); // copy sheet selection + ScMarkData aTempMark( rMark ); // copy sheet selection aTempMark.SetMarkArea( ScRange( nCol, nRow, nTab ) ); const ScPatternAttr* pAttr = pDoc->GetSelectionPattern( aTempMark ); return pAttr; } } -void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, - SvxBoxInfoItem& rLineInner ) +void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, + SvxBoxInfoItem& rLineInner ) { ScDocument* pDoc = GetViewData()->GetDocument(); const ScMarkData& rMark = GetViewData()->GetMarkData(); @@ -999,8 +999,8 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, { if ( rMark.IsMultiMarked() ) { - ScMarkData aNewMark( rMark ); // use local copy for MarkToSimple - aNewMark.MarkToSimple(); // simple block is needed for GetSelectionFrame + ScMarkData aNewMark( rMark ); // use local copy for MarkToSimple + aNewMark.MarkToSimple(); // simple block is needed for GetSelectionFrame pDoc->GetSelectionFrame( aNewMark, rLineOuter, rLineInner ); } else @@ -1013,7 +1013,7 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); - rLineOuter = (const SvxBoxItem&) (pAttrs->GetItem( ATTR_BORDER )); + rLineOuter = (const SvxBoxItem&) (pAttrs->GetItem( ATTR_BORDER )); rLineInner = (const SvxBoxInfoItem&)(pAttrs->GetItem( ATTR_BORDER_INNER )); rLineInner.SetTable(FALSE); rLineInner.SetDist(TRUE); @@ -1022,14 +1022,14 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, } // -// Attribute anwenden - Undo OK +// Attribute anwenden - Undo OK // -// kompletter Set ( ATTR_STARTINDEX, ATTR_ENDINDEX ) +// kompletter Set ( ATTR_STARTINDEX, ATTR_ENDINDEX ) // void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, - BOOL bRecord ) + BOOL bRecord ) { // nur wegen Matrix nicht editierbar? Attribute trotzdem ok BOOL bOnlyNotBecauseOfMatrix; @@ -1044,7 +1044,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, aNewAttrs.DeleteUnchanged( &aOldAttrs ); if ( pDialogSet->GetItemState( ATTR_VALUE_FORMAT ) == SFX_ITEM_SET ) - { // #82521# don't reset to default SYSTEM GENERAL if not intended + { // #82521# don't reset to default SYSTEM GENERAL if not intended sal_uInt32 nOldFormat = ((const SfxUInt32Item&)pOldSet->Get( ATTR_VALUE_FORMAT )).GetValue(); sal_uInt32 nNewFormat = @@ -1064,7 +1064,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, aNewAttrs.GetItemSet().Put( SvxLanguageItem( eNewLang, ATTR_LANGUAGE_FORMAT ) ); - // #40606# nur die Sprache geaendert -> Zahlformat-Attribut nicht anfassen + // #40606# nur die Sprache geaendert -> Zahlformat-Attribut nicht anfassen sal_uInt32 nNewMod = nNewFormat % SV_COUNTRY_LANGUAGE_OFFSET; if ( nNewMod == ( nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET ) && nNewMod <= SV_MAX_ANZ_STANDARD_FORMATE ) @@ -1073,14 +1073,14 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, } } - const SvxBoxItem* pOldOuter = (const SvxBoxItem*) &pOldSet->Get( ATTR_BORDER ); - const SvxBoxItem* pNewOuter = (const SvxBoxItem*) &pDialogSet->Get( ATTR_BORDER ); + const SvxBoxItem* pOldOuter = (const SvxBoxItem*) &pOldSet->Get( ATTR_BORDER ); + const SvxBoxItem* pNewOuter = (const SvxBoxItem*) &pDialogSet->Get( ATTR_BORDER ); const SvxBoxInfoItem* pOldInner = (const SvxBoxInfoItem*) &pOldSet->Get( ATTR_BORDER_INNER ); const SvxBoxInfoItem* pNewInner = (const SvxBoxInfoItem*) &pDialogSet->Get( ATTR_BORDER_INNER ); - SfxItemSet& rNewSet = aNewAttrs.GetItemSet(); - SfxItemPool* pNewPool = rNewSet.GetPool(); + SfxItemSet& rNewSet = aNewAttrs.GetItemSet(); + SfxItemPool* pNewPool = rNewSet.GetPool(); - pNewPool->Put( *pNewOuter ); // noch nicht loeschen + pNewPool->Put( *pNewOuter ); // noch nicht loeschen pNewPool->Put( *pNewInner ); rNewSet.ClearItem( ATTR_BORDER ); rNewSet.ClearItem( ATTR_BORDER_INNER ); @@ -1098,7 +1098,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, if ( pNewOuter==pOldOuter && pNewInner==pOldInner ) bFrame = FALSE; - // das sollte doch der Pool abfangen: ?!??!?? + // das sollte doch der Pool abfangen: ?!??!?? if ( bFrame && pNewOuter && pNewInner ) if ( *pNewOuter == *pOldOuter && *pNewInner == *pOldInner ) @@ -1118,7 +1118,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, bFrame = FALSE; if (!bFrame) - ApplySelectionPattern( aNewAttrs, bRecord ); // nur normale + ApplySelectionPattern( aNewAttrs, bRecord ); // nur normale else { // wenn neue Items Default-Items sind, so muessen die @@ -1133,10 +1133,10 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, bRecord ); } - pNewPool->Remove( *pNewOuter ); // freigeben + pNewPool->Remove( *pNewOuter ); // freigeben pNewPool->Remove( *pNewInner ); - // Hoehen anpassen + // Hoehen anpassen AdjustBlockHeight(); // CellContentChanged wird von ApplySelectionPattern / ApplyPatternLines gerufen @@ -1156,7 +1156,7 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem ) ATTR_PATTERN_START, ATTR_PATTERN_END ) ); aNewAttrs.GetItemSet().Put( rAttrItem ); - // Wenn Ausrichtung eingestellt wird (ueber Buttons), immer Einzug 0 + // Wenn Ausrichtung eingestellt wird (ueber Buttons), immer Einzug 0 if ( rAttrItem.Which() == ATTR_HOR_JUSTIFY ) aNewAttrs.GetItemSet().Put( SfxUInt16Item( ATTR_INDENT, 0 ) ); ApplySelectionPattern( aNewAttrs ); @@ -1167,7 +1167,7 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem ) } -// Pattern und Rahmen +// Pattern und Rahmen void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner, BOOL bRecord ) @@ -1188,7 +1188,7 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem else { aMarkRange = ScRange( GetViewData()->GetCurX(), - GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); + GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); DoneBlockMode(); InitOwnBlockMode(); aFuncMark.SetMarkArea(aMarkRange); @@ -1240,24 +1240,24 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem StartFormatArea(); } -// nur Pattern +// nur Pattern void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, BOOL bRecord, BOOL bCursorOnly ) { - ScViewData* pViewData = GetViewData(); - ScDocShell* pDocSh = pViewData->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocShell* pDocSh = pViewData->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); ScMarkData aFuncMark( pViewData->GetMarkData() ); // local copy for UnmarkFiltered ScViewUtil::UnmarkFiltered( aFuncMark, pDoc ); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; - // State from old ItemSet doesn't matter for paint flags, as any change will be - // from SFX_ITEM_SET in the new ItemSet (default is ignored in ApplyPattern). - // New alignment is checked (check in PostPaint isn't enough) in case a right - // alignment is changed to left. + // State from old ItemSet doesn't matter for paint flags, as any change will be + // from SFX_ITEM_SET in the new ItemSet (default is ignored in ApplyPattern). + // New alignment is checked (check in PostPaint isn't enough) in case a right + // alignment is changed to left. const SfxItemSet& rNewSet = rAttr.GetItemSet(); BOOL bSetLines = rNewSet.GetItemState( ATTR_BORDER, TRUE ) == SFX_ITEM_SET || rNewSet.GetItemState( ATTR_SHADOW, TRUE ) == SFX_ITEM_SET; @@ -1341,7 +1341,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, aModificator.SetDocumentModified(); CellContentChanged(); } - else // einzelne Zelle - Undo einfacher + else // einzelne Zelle - Undo einfacher { SCCOL nCol = pViewData->GetCurX(); SCROW nRow = pViewData->GetCurY(); @@ -1373,7 +1373,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, pUndo->SetEditData(pOldEditData, pNewEditData); pDocSh->GetUndoManager()->AddUndoAction(pUndo); } - delete pOldPat; // wird im Undo kopiert (Pool) + delete pOldPat; // wird im Undo kopiert (Pool) pDocSh->PostPaint( nCol,nRow,nTab, nCol,nRow,nTab, PAINT_GRID, nExtFlags | SC_PF_TESTMERGE ); pDocSh->UpdateOle(GetViewData()); @@ -1418,7 +1418,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, void ScViewFunc::ApplyUserItemSet( const SfxItemSet& rItemSet ) { - // ItemSet from UI, may have different pool + // ItemSet from UI, may have different pool BOOL bOnlyNotBecauseOfMatrix; if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix ) @@ -1440,13 +1440,13 @@ const SfxStyleSheet* ScViewFunc::GetStyleSheetFromMarked() // Don't use UnmarkFiltered in slot state functions, for performance reasons. // The displayed state is always that of the whole selection including filtered rows. - const ScStyleSheet* pSheet = NULL; - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - ScMarkData& rMark = pViewData->GetMarkData(); + const ScStyleSheet* pSheet = NULL; + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + ScMarkData& rMark = pViewData->GetMarkData(); if ( rMark.IsMarked() || rMark.IsMultiMarked() ) - pSheet = pDoc->GetSelectionStyle( rMark ); // MarkToMulti isn't necessary + pSheet = pDoc->GetSelectionStyle( rMark ); // MarkToMulti isn't necessary else pSheet = pDoc->GetStyle( pViewData->GetCurX(), pViewData->GetCurY(), @@ -1468,12 +1468,12 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, BOOL bRecord if ( !pStyleSheet) return; // ------------------------------------------------------------------- - ScViewData* pViewData = GetViewData(); - ScDocShell* pDocSh = pViewData->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocShell* pDocSh = pViewData->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); ScMarkData aFuncMark( pViewData->GetMarkData() ); // local copy for UnmarkFiltered ScViewUtil::UnmarkFiltered( aFuncMark, pDoc ); - SCTAB nTabCount = pDoc->GetTableCount(); + SCTAB nTabCount = pDoc->GetTableCount(); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; @@ -1558,9 +1558,9 @@ void ScViewFunc::RemoveStyleSheetInUse( SfxStyleSheet* pStyleSheet ) if ( !pStyleSheet) return; // ------------------------------------------------------------------- - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - ScDocShell* pDocSh = pViewData->GetDocShell(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + ScDocShell* pDocSh = pViewData->GetDocShell(); ScDocShellModificator aModificator( *pDocSh ); @@ -1585,9 +1585,9 @@ void ScViewFunc::UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet ) if ( !pStyleSheet) return; // ------------------------------------------------------------------- - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - ScDocShell* pDocSh = pViewData->GetDocShell(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + ScDocShell* pDocSh = pViewData->GetDocShell(); ScDocShellModificator aModificator( *pDocSh ); @@ -1607,7 +1607,7 @@ void ScViewFunc::UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet ) pHdl->ForgetLastPattern(); } -// Zellen einfuegen - Undo OK +// Zellen einfuegen - Undo OK BOOL ScViewFunc::InsertCells( InsCellCmd eCmd, BOOL bRecord, BOOL bPartOfPaste ) { @@ -1646,7 +1646,7 @@ BOOL ScViewFunc::InsertCells( InsCellCmd eCmd, BOOL bRecord, BOOL bPartOfPaste ) } } -// Zellen loeschen - Undo OK +// Zellen loeschen - Undo OK void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord ) { @@ -1698,7 +1698,7 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord ) } } - // #58106# Cursor direkt hinter den geloeschten Bereich setzen + // #58106# Cursor direkt hinter den geloeschten Bereich setzen SCCOL nCurX = GetViewData()->GetCurX(); SCROW nCurY = GetViewData()->GetCurY(); if ( eCmd==DEL_CELLSLEFT || eCmd==DEL_DELCOLS ) @@ -1740,7 +1740,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) nRangeCnt = 1; } - // Test ob erlaubt + // Test ob erlaubt SCCOLROW* pOneRange = pRanges; USHORT nErrorId = 0; @@ -1807,16 +1807,16 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) return; } - // ausfuehren + // ausfuehren - WaitObject aWait( GetFrameWin() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( GetFrameWin() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pUndoDoc = NULL; ScRefUndoData* pUndoData = NULL; if (bRecord) { pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pUndoDoc->InitUndo( pDoc, nTab, nTab, !bRows, bRows ); // Zeilenhoehen + pUndoDoc->InitUndo( pDoc, nTab, nTab, !bRows, bRows ); // Zeilenhoehen pOneRange = pRanges; for (nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++) @@ -1831,7 +1831,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) IDF_ALL,FALSE,pUndoDoc ); } - // alle Formeln wegen Referenzen + // alle Formeln wegen Referenzen SCTAB nTabCount = pDoc->GetTableCount(); pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE ); pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA,FALSE,pUndoDoc ); @@ -1841,7 +1841,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) pDoc->BeginDrawUndo(); } - pOneRange = &pRanges[2*nRangeCnt]; // rueckwaerts + pOneRange = &pRanges[2*nRangeCnt]; // rueckwaerts for (nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++) { SCCOLROW nEnd = *(--pOneRange); @@ -1884,7 +1884,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) CellContentChanged(); - // #58106# Cursor direkt hinter den ersten geloeschten Bereich setzen + // #58106# Cursor direkt hinter den ersten geloeschten Bereich setzen SCCOL nCurX = GetViewData()->GetCurX(); SCROW nCurY = GetViewData()->GetCurY(); if ( bRows ) @@ -1898,7 +1898,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); } -// Inhalte loeschen +// Inhalte loeschen void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) { @@ -1940,15 +1940,15 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) aMarkRange.aEnd = aMarkRange.aStart; if ( pDoc->HasAttrib( aMarkRange, HASATTR_MERGED ) ) { -// InitOwnBlockMode(); +// InitOwnBlockMode(); aFuncMark.SetMarkArea( aMarkRange ); } else bSimple = TRUE; } - aFuncMark.SetMarking(FALSE); // for MarkToMulti - aFuncMark.MarkToSimple(); // before bMulti test below + aFuncMark.SetMarking(FALSE); // for MarkToMulti + aFuncMark.MarkToSimple(); // before bMulti test below DBG_ASSERT( aFuncMark.IsMarked() || aFuncMark.IsMultiMarked() || bSimple, "delete what?" ); @@ -1977,16 +1977,16 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) bObjects = FALSE; } - USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted + USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted if ( nFlags & IDF_ATTRIB ) pDocSh->UpdatePaintExt( nExtFlags, aMarkRange ); - // Reihenfolge: - // 1) BeginDrawUndo - // 2) Objekte loeschen (DrawUndo wird gefuellt) - // 3) Inhalte fuer Undo kopieren - // 4) Inhalte loeschen - // 5) Undo-Aktion anlegen + // Reihenfolge: + // 1) BeginDrawUndo + // 2) Objekte loeschen (DrawUndo wird gefuellt) + // 3) Inhalte fuer Undo kopieren + // 4) Inhalte loeschen + // 5) Undo-Aktion anlegen BOOL bDrawUndo = bObjects || ( nFlags & IDF_NOTE ); // needed for shown notes if ( bDrawUndo && bRecord ) @@ -1998,7 +1998,7 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) pDoc->DeleteObjectsInSelection( aFuncMark ); else pDoc->DeleteObjectsInArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), -/*!*/ aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), +/*!*/ aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), aFuncMark ); } @@ -2015,21 +2015,21 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) aCopyRange.aStart.SetTab(0); aCopyRange.aEnd.SetTab(nTabCount-1); - // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument - // nur mit IDF_HARDATTR zu langsam ist: + // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument + // nur mit IDF_HARDATTR zu langsam ist: USHORT nUndoDocFlags = nFlags; if (nFlags & IDF_ATTRIB) nUndoDocFlags |= IDF_ATTRIB; - if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute - nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert + if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute + nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert if (nFlags & IDF_NOTE) - nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes + nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes // do not copy note captions to undo document nUndoDocFlags |= IDF_NOCAPTIONS; pDoc->CopyToDocument( aCopyRange, nUndoDocFlags, bMulti, pUndoDoc, &aFuncMark ); } - HideAllCursors(); // falls Zusammenfassung aufgehoben wird + HideAllCursors(); // falls Zusammenfassung aufgehoben wird if (bSimple) pDoc->DeleteArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), @@ -2077,11 +2077,11 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) if ( nFlags & IDF_CONTENTS ) ForgetFormatArea(); else - StartFormatArea(); // Attribute loeschen ist auch Attributierung + StartFormatArea(); // Attribute loeschen ist auch Attributierung } } -// Spaltenbreiten/Zeilenhoehen (ueber Header) - Undo OK +// Spaltenbreiten/Zeilenhoehen (ueber Header) - Undo OK void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, ScSizeMode eMode, USHORT nSizeTwips, @@ -2142,13 +2142,13 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR bFormula = rOpts.GetOption( VOPT_FORMULAS ); } - ScDocument* pUndoDoc = NULL; + ScDocument* pUndoDoc = NULL; ScOutlineTable* pUndoTab = NULL; SCCOLROW* pUndoRanges = NULL; if ( bRecord ) { - pDoc->BeginDrawUndo(); // Drawing Updates + pDoc->BeginDrawUndo(); // Drawing Updates pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); for (nTab=0; nTab<nTabCount; nTab++) @@ -2177,7 +2177,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR pUndoRanges = new SCCOLROW[ 2*nRangeCnt ]; memmove( pUndoRanges, pRanges, 2*nRangeCnt*sizeof(SCCOLROW) ); - //! outlines from all tables? + //! outlines from all tables? ScOutlineTable* pTable = pDoc->GetOutlineTable( nCurTab ); if (pTable) pUndoTab = new ScOutlineTable( *pTable ); @@ -2194,22 +2194,22 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR { const SCCOLROW* pTabRanges = pRanges; - pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln + pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln pDoc->InitializeNoteCaptions( nTab ); for (SCCOLROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++) { SCCOLROW nStartNo = *(pTabRanges++); SCCOLROW nEndNo = *(pTabRanges++); - if ( !bWidth ) // Hoehen immer blockweise + if ( !bWidth ) // Hoehen immer blockweise { if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT ) { BOOL bAll = ( eMode==SC_SIZE_OPTIMAL ); if (!bAll) { - // fuer alle eingeblendeten CR_MANUALSIZE loeschen, - // dann SetOptimalHeight mit bShrink = FALSE + // fuer alle eingeblendeten CR_MANUALSIZE loeschen, + // dann SetOptimalHeight mit bShrink = FALSE for (SCROW nRow = nStartNo; nRow <= nEndNo; ++nRow) { SCROW nLastRow = nRow; @@ -2243,15 +2243,15 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR if (bAll) pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE ); - // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt - // (an bei Extra-Height, sonst aus). + // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt + // (an bei Extra-Height, sonst aus). } else if ( eMode==SC_SIZE_DIRECT ) { if (nSizeTwips) { pDoc->SetRowHeightRange( nStartNo, nEndNo, nTab, nSizeTwips ); - pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually + pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually } pDoc->ShowRows( nStartNo, nEndNo, nTab, nSizeTwips != 0 ); } @@ -2260,7 +2260,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE ); } } - else // Spaltenbreiten + else // Spaltenbreiten { for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++) { @@ -2278,7 +2278,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR } } - // Outline anpassen + // Outline anpassen if (bWidth) { @@ -2292,7 +2292,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR bOutline = TRUE; } } - pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln + pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln } @@ -2327,7 +2327,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR static_cast<SCCOL>(nEnd),MAXROW,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED )) nStart = 0; - if (nStart > 0) // weiter oben anfangen wegen Linien und Cursor + if (nStart > 0) // weiter oben anfangen wegen Linien und Cursor --nStart; pDocSh->PostPaint( static_cast<SCCOL>(nStart), 0, nTab, MAXCOL, MAXROW, nTab, PAINT_GRID | PAINT_TOP ); @@ -2377,7 +2377,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR } } -// Spaltenbreiten/Zeilenhoehen (ueber Blockmarken) +// Spaltenbreiten/Zeilenhoehen (ueber Blockmarken) void ScViewFunc::SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips, BOOL bRecord, BOOL bPaint ) @@ -2412,8 +2412,8 @@ void ScViewFunc::SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT n void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) { - //! Schrittweiten einstellbar - // Schrittweite ist auch Minimum + //! Schrittweiten einstellbar + // Schrittweite ist auch Minimum USHORT nStepX = STD_COL_WIDTH / 5; USHORT nStepY = ScGlobal::nStdRowHeight; @@ -2443,15 +2443,15 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) SCCOLROW nRange[2]; if ( eDir == DIR_LEFT || eDir == DIR_RIGHT ) { - if (bOptimal) // Breite dieser einen Zelle + if (bOptimal) // Breite dieser einen Zelle { if ( bAnyEdit ) { - // beim Editieren die aktuelle Breite der Eingabe + // beim Editieren die aktuelle Breite der Eingabe ScInputHandler* pHdl = pScMod->GetInputHdl( GetViewData()->GetViewShell() ); if (pHdl) { - long nEdit = pHdl->GetTextSize().Width(); // in 1/100mm + long nEdit = pHdl->GetTextSize().Width(); // in 1/100mm const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab ); const SvxMarginItem& rMItem = @@ -2490,7 +2490,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) nWidth = STD_COL_WIDTH; } } - else // vergroessern / verkleinern + else // vergroessern / verkleinern { if ( eDir == DIR_RIGHT ) nWidth = sal::static_int_cast<USHORT>( nWidth + nStepX ); @@ -2502,7 +2502,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) nRange[0] = nRange[1] = nCol; SetWidthOrHeight( TRUE, 1, nRange, SC_SIZE_DIRECT, nWidth ); - // hier bei Breite auch Hoehe anpassen (nur die eine Zeile) + // hier bei Breite auch Hoehe anpassen (nur die eine Zeile) if (!bAnyEdit) { @@ -2532,7 +2532,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) nHeight = sal::static_int_cast<USHORT>( nHeight - nStepY ); if ( nHeight < nStepY ) nHeight = nStepY; if ( nHeight > MAX_COL_HEIGHT ) nHeight = MAX_COL_HEIGHT; - //! MAX_COL_HEIGHT umbenennen in MAX_ROW_HEIGHT in global.hxx !!!!!! + //! MAX_COL_HEIGHT umbenennen in MAX_ROW_HEIGHT in global.hxx !!!!!! } nRange[0] = nRange[1] = nRow; SetWidthOrHeight( FALSE, 1, nRange, eMode, nHeight ); @@ -2545,7 +2545,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) { ScInputHandler* pHdl = pScMod->GetInputHdl( GetViewData()->GetViewShell() ); if (pHdl) - pHdl->SetModified(); // damit bei Enter die Hoehe angepasst wird + pHdl->SetModified(); // damit bei Enter die Hoehe angepasst wird } } @@ -2563,7 +2563,7 @@ void ScViewFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ) ScDocFunc aFunc(*pDocSh); bool bUndo(pDoc->IsUndoEnabled()); - // modifying several tables is handled here + // modifying several tables is handled here if (bUndo) { @@ -2579,7 +2579,7 @@ void ScViewFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ) if (bUndo) pDocSh->GetUndoManager()->LeaveListAction(); - UpdateLayerLocks(); //! broadcast to all views + UpdateLayerLocks(); //! broadcast to all views } void ScViewFunc::Protect( SCTAB nTab, const String& rPassword ) @@ -2594,7 +2594,7 @@ void ScViewFunc::Protect( SCTAB nTab, const String& rPassword ) aFunc.Protect( nTab, rPassword, FALSE ); else { - // modifying several tables is handled here + // modifying several tables is handled here if (bUndo) { @@ -2611,7 +2611,7 @@ void ScViewFunc::Protect( SCTAB nTab, const String& rPassword ) pDocSh->GetUndoManager()->LeaveListAction(); } - UpdateLayerLocks(); //! broadcast to all views + UpdateLayerLocks(); //! broadcast to all views } BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword ) @@ -2627,7 +2627,7 @@ BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword ) bChanged = aFunc.Unprotect( nTab, rPassword, FALSE ); else { - // modifying several tables is handled here + // modifying several tables is handled here if (bUndo) { @@ -2646,7 +2646,7 @@ BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword ) } if (bChanged) - UpdateLayerLocks(); //! broadcast to all views + UpdateLayerLocks(); //! broadcast to all views return bChanged; } @@ -2671,14 +2671,14 @@ void ScViewFunc::SetNumberFormat( short nFormatType, ULONG nAdd ) return; } - sal_uInt32 nNumberFormat = 0; - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); - LanguageType eLanguage = ScGlobal::eLnge; - ScPatternAttr aNewAttrs( pDoc->GetPool() ); + sal_uInt32 nNumberFormat = 0; + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); + LanguageType eLanguage = ScGlobal::eLnge; + ScPatternAttr aNewAttrs( pDoc->GetPool() ); - // #67936# always take language from cursor position, even if there is a selection + // #67936# always take language from cursor position, even if there is a selection sal_uInt32 nCurrentNumberFormat; pDoc->GetNumberFormat( pViewData->GetCurX(), @@ -2687,13 +2687,13 @@ void ScViewFunc::SetNumberFormat( short nFormatType, ULONG nAdd ) nCurrentNumberFormat ); const SvNumberformat* pEntry = pNumberFormatter->GetEntry( nCurrentNumberFormat ); if (pEntry) - eLanguage = pEntry->GetLanguage(); // sonst ScGlobal::eLnge behalten + eLanguage = pEntry->GetLanguage(); // sonst ScGlobal::eLnge behalten - nNumberFormat = pNumberFormatter->GetStandardFormat( nFormatType, eLanguage ) + nAdd; + nNumberFormat = pNumberFormatter->GetStandardFormat( nFormatType, eLanguage ) + nAdd; SfxItemSet& rSet = aNewAttrs.GetItemSet(); rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumberFormat ) ); - // ATTR_LANGUAGE_FORMAT nicht + // ATTR_LANGUAGE_FORMAT nicht ApplySelectionPattern( aNewAttrs, TRUE ); } @@ -2707,11 +2707,11 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode ) return; } - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); - // Sprache immer von Cursorposition + // Sprache immer von Cursorposition sal_uInt32 nCurrentNumberFormat; pDoc->GetNumberFormat( pViewData->GetCurX(), pViewData->GetCurY(), @@ -2719,21 +2719,21 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode ) const SvNumberformat* pEntry = pFormatter->GetEntry( nCurrentNumberFormat ); LanguageType eLanguage = pEntry ? pEntry->GetLanguage() : ScGlobal::eLnge; - // Index fuer String bestimmen + // Index fuer String bestimmen BOOL bOk = TRUE; sal_uInt32 nNumberFormat = pFormatter->GetEntryKey( rCode, eLanguage ); if ( nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) { - // neu eintragen + // neu eintragen - String aFormat = rCode; // wird veraendert - xub_StrLen nErrPos = 0; - short nType = 0; //! ??? + String aFormat = rCode; // wird veraendert + xub_StrLen nErrPos = 0; + short nType = 0; //! ??? bOk = pFormatter->PutEntry( aFormat, nErrPos, nType, nNumberFormat, eLanguage ); } - if ( bOk ) // gueltiges Format? + if ( bOk ) // gueltiges Format? { ScPatternAttr aNewAttrs( pDoc->GetPool() ); SfxItemSet& rSet = aNewAttrs.GetItemSet(); @@ -2742,7 +2742,7 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode ) ApplySelectionPattern( aNewAttrs, TRUE ); } - //! sonst Fehler zuerueckgeben / Meldung ausgeben ??? + //! sonst Fehler zuerueckgeben / Meldung ausgeben ??? } void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) @@ -2755,8 +2755,8 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) return; } - ScDocument* pDoc = GetViewData()->GetDocument(); - SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); + ScDocument* pDoc = GetViewData()->GetDocument(); + SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); SCCOL nCol = GetViewData()->GetCurX(); SCROW nRow = GetViewData()->GetCurY(); @@ -2771,7 +2771,7 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) return; } - // was haben wir denn da? + // was haben wir denn da? sal_uInt32 nNewFormat = nOldFormat; BOOL bError = FALSE; @@ -2785,20 +2785,20 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) if ( 0 == ( nOldType & ( NUMBERFORMAT_NUMBER | NUMBERFORMAT_CURRENCY | NUMBERFORMAT_PERCENT ) ) ) { - // Datum, Zeit, Bruch, logisch, Text kann nicht angepasst werden - //! bei Wisssenschaftlich kann es der Numberformatter auch nicht + // Datum, Zeit, Bruch, logisch, Text kann nicht angepasst werden + //! bei Wisssenschaftlich kann es der Numberformatter auch nicht bError = TRUE; } - //! Das SvNumberformat hat einen Member bStandard, verraet ihn aber nicht + //! Das SvNumberformat hat einen Member bStandard, verraet ihn aber nicht BOOL bWasStandard = ( nOldFormat == pFormatter->GetStandardIndex( eLanguage ) ); if (bWasStandard) { - // bei "Standard" die Nachkommastellen abhaengig vom Zellinhalt - // 0 bei leer oder Text -> keine Nachkommastellen + // bei "Standard" die Nachkommastellen abhaengig vom Zellinhalt + // 0 bei leer oder Text -> keine Nachkommastellen double nVal = pDoc->GetValue( ScAddress( nCol, nRow, nTab ) ); - // Die Wege des Numberformatters sind unergruendlich, darum ausprobieren: + // Die Wege des Numberformatters sind unergruendlich, darum ausprobieren: String aOut; Color* pCol; ((SvNumberformat*)pOldEntry)->GetOutputString( nVal, aOut, &pCol ); @@ -2806,7 +2806,7 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) nPrecision = 0; // 'E' fuer Exponential ist fest im Numberformatter if ( aOut.Search('E') != STRING_NOTFOUND ) - bError = TRUE; // Exponential nicht veraendern + bError = TRUE; // Exponential nicht veraendern else { String aDecSep( pFormatter->GetFormatDecimalSep( nOldFormat ) ); @@ -2822,16 +2822,16 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) if (bIncrement) { if (nPrecision<20) - ++nPrecision; // erhoehen + ++nPrecision; // erhoehen else - bError = TRUE; // 20 ist Maximum + bError = TRUE; // 20 ist Maximum } else { if (nPrecision) - --nPrecision; // vermindern + --nPrecision; // vermindern else - bError = TRUE; // weniger als 0 geht nicht + bError = TRUE; // weniger als 0 geht nicht } } @@ -2859,18 +2859,18 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) ScPatternAttr aNewAttrs( pDoc->GetPool() ); SfxItemSet& rSet = aNewAttrs.GetItemSet(); rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) ); - // ATTR_LANGUAGE_FORMAT nicht + // ATTR_LANGUAGE_FORMAT nicht ApplySelectionPattern( aNewAttrs, TRUE ); } else - Sound::Beep(); // war nix + Sound::Beep(); // war nix } void ScViewFunc::ChangeIndent( BOOL bIncrement ) { ScViewData* pViewData = GetViewData(); - ScDocShell* pDocSh = pViewData->GetDocShell(); - ScMarkData& rMark = pViewData->GetMarkData(); + ScDocShell* pDocSh = pViewData->GetDocShell(); + ScMarkData& rMark = pViewData->GetMarkData(); ScMarkData aWorkMark = rMark; ScViewUtil::UnmarkFiltered( aWorkMark, pDocSh->GetDocument() ); @@ -2894,8 +2894,8 @@ void ScViewFunc::ChangeIndent( BOOL bIncrement ) BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol, const String& rType ) { - // Type = P,R,C,F (und Kombinationen) - //! Undo... + // Type = P,R,C,F (und Kombinationen) + //! Undo... BOOL bOk = FALSE; ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2919,32 +2919,32 @@ BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol, nType |= RT_CRITERIA; pNewEntry->AddType(nType); - if ( !pNewEntry->GetErrCode() ) // Text gueltig? + if ( !pNewEntry->GetErrCode() ) // Text gueltig? { ScDocShellModificator aModificator( *pDocSh ); - pDoc->CompileNameFormula( TRUE ); // CreateFormulaString + pDoc->CompileNameFormula( TRUE ); // CreateFormulaString // Eintrag bereits vorhanden? Dann vorher entfernen (=Aendern) USHORT nFoundAt; if ( pList->SearchName( rName, nFoundAt ) ) - { // alten Index uebernehmen + { // alten Index uebernehmen pNewEntry->SetIndex( ((ScRangeData*)pList->At(nFoundAt))->GetIndex() ); pList->AtFree( nFoundAt ); } if ( pList->Insert( pNewEntry ) ) { - pNewEntry = NULL; // nicht loeschen + pNewEntry = NULL; // nicht loeschen bOk = TRUE; } - pDoc->CompileNameFormula( FALSE ); // CompileFormulaString + pDoc->CompileNameFormula( FALSE ); // CompileFormulaString aModificator.SetDocumentModified(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) ); } - delete pNewEntry; // wenn er nicht eingefuegt wurde + delete pNewEntry; // wenn er nicht eingefuegt wurde return bOk; } @@ -2983,7 +2983,7 @@ USHORT ScViewFunc::GetCreateNameFlags() bOk = FALSE; if (bOk) nFlags |= NAME_TOP; - else // Bottom nur wenn nicht Top + else // Bottom nur wenn nicht Top { bOk = TRUE; for (i=nFirstCol; i<=nLastCol && bOk; i++) @@ -3002,7 +3002,7 @@ USHORT ScViewFunc::GetCreateNameFlags() bOk = FALSE; if (bOk) nFlags |= NAME_LEFT; - else // Right nur wenn nicht Left + else // Right nur wenn nicht Left { bOk = TRUE; for (j=nFirstRow; j<=nLastRow && bOk; j++) diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index 050fb131bfae..68a6f14389a0 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.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 @@ -68,17 +68,17 @@ //================================================================== -// static +// static void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet, USHORT nWhichId, USHORT nScript ) { - // take the effective item from rCoreSet according to nScript - // and put in rShellSet under the (base) nWhichId + // take the effective item from rCoreSet according to nScript + // and put in rShellSet under the (base) nWhichId SfxItemPool& rPool = *rShellSet.GetPool(); SvxScriptSetItem aSetItem( rPool.GetSlotId(nWhichId), rPool ); - // use PutExtended with eDefaultAs = SFX_ITEM_SET, so defaults from rCoreSet - // (document pool) are read and put into rShellSet (MessagePool) + // use PutExtended with eDefaultAs = SFX_ITEM_SET, so defaults from rCoreSet + // (document pool) are read and put into rShellSet (MessagePool) aSetItem.GetItemSet().PutExtended( rCoreSet, SFX_ITEM_DONTCARE, SFX_ITEM_SET ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if (pI) @@ -87,10 +87,10 @@ void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSe rShellSet.InvalidateItem( nWhichId ); } -// static +// static USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos ) { - // used for thesaurus + // used for thesaurus BYTE nScript = pDoc->GetScriptType( rPos.Col(), rPos.Row(), rPos.Tab() ); USHORT nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE : @@ -101,7 +101,7 @@ USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos ) if (pLangIt) { eLnge = (LanguageType) pLangIt->GetValue(); - if (eLnge == LANGUAGE_DONTKNOW) //! can this happen? + if (eLnge == LANGUAGE_DONTKNOW) //! can this happen? { LanguageType eLatin, eCjk, eCtl; pDoc->GetLanguage( eLatin, eCjk, eCtl ); @@ -117,7 +117,7 @@ USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos ) return eLnge; } -// static +// static sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID ) { sal_Int32 nType = 0; @@ -154,7 +154,7 @@ sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID ) return nType; } -// static +// static BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction, const ScChangeViewSettings& rSettings, ScDocument& rDocument ) @@ -172,7 +172,7 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction, { if ( rSettings.IsEveryoneButMe() ) { - // GetUser() am ChangeTrack ist der aktuelle Benutzer + // GetUser() am ChangeTrack ist der aktuelle Benutzer ScChangeTrack* pTrack = rDocument.GetChangeTrack(); if ( !pTrack || rAction.GetUser() == pTrack->GetUser() ) return FALSE; @@ -202,7 +202,7 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction, const DateTime& rFirst = rSettings.GetTheFirstDateTime(); const DateTime& rLast = rSettings.GetTheLastDateTime(); switch ( rSettings.GetTheDateMode() ) - { // korrespondiert mit ScHighlightChgDlg::OKBtnHdl + { // korrespondiert mit ScHighlightChgDlg::OKBtnHdl case SCDM_DATE_BEFORE: if ( aDateTime > rFirst ) return FALSE; @@ -366,8 +366,8 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USH BOOL ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, SfxViewFrame& rFrame, - SvxFontItem& rNewFont, - String& rString ) + SvxFontItem& rNewFont, + String& rString ) { BOOL bRet = FALSE; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index a3c768e85418..6d887a5ec8fa 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.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 |